Move uniqify to dhcpcd-run-hooks

diff --git a/dhcpcd-hooks/20-resolv.conf b/dhcpcd-hooks/20-resolv.conf
index 5b02f62bf7ed4b7c989f013be0f4b3cbcc768611..351430c01f04f87efc9cc3be511a27de34bfe866 100644 (file)
--- a/dhcpcd-hooks/20-resolv.conf
+++ b/dhcpcd-hooks/20-resolv.conf
@@ -9,20 +9,6 @@
 # We store our resolvconfs in /var/run so they are cleaned at boot.
 resolvconf_dir=/var/run/dhcpcd/resolv.conf
 
-uniqify()
-{
-       local result=
-
-       while [ -n "$1" ]; do
-               case " ${result} " in
-               *" $1 "*);;
-               *) result="${result}${result:+ }$1";;
-               esac
-               shift
-       done
-       echo "${result}"
-}
-
 build_resolv_conf()
 {
        local cf="/etc/resolv.conf.${interface}"

diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
index 2672c852a8f4bdaf19ba749841eed22cadcb702b..aed2d2db0b9af9b72ee6a71347adf7627dc104b5 100644 (file)
--- a/dhcpcd-run-hooks.in
+++ b/dhcpcd-run-hooks.in
@@ -7,6 +7,21 @@ signature="${signature_base}${interface}"
 signature_base_end="# End of dhcpcd from "
 signature_end="${signature_base_end}${interface}"
 
+# Ensure that all arguments are unique
+uniqify()
+{
+       local result=
+
+       while [ -n "$1" ]; do
+               case " ${result} " in
+               *" $1 "*);;
+               *) result="${result}${result:+ }$1";;
+               esac
+               shift
+       done
+       echo "${result}"
+}
+
 # Clean a configuration file of our current signature and stale ones
 clean_conf()
 {