Don't enforce that keys are space separated

diff --git a/dhcpcd-hooks/20-resolv.conf b/dhcpcd-hooks/20-resolv.conf
index 8a3deab83f23543bc04ea30e04b2c9fefd028e2b..e757ddff79a7c5acf2371ed73185f83f0e0a8146 100644 (file)
--- a/dhcpcd-hooks/20-resolv.conf
+++ b/dhcpcd-hooks/20-resolv.conf
@@ -25,12 +25,12 @@ build_resolv_conf()
 
                # Build the search list
                search=$(cd "${resolv_conf_dir}"; \
-                       key_get_value "search" ${interfaces})
+                       key_get_value "search " ${interfaces})
                [ -n "${search}" ] && search="search $(uniqify ${search})\n"
 
                # Build the nameserver list
                srvs=$(cd "${resolv_conf_dir}"; \
-                       key_get_value "nameserver" ${interfaces})
+                       key_get_value "nameserver " ${interfaces})
                for x in $(uniqify ${srvs}); do
                        servers="${servers}nameserver ${x}\n"
                done

diff --git a/dhcpcd-hooks/50-ntp.conf b/dhcpcd-hooks/50-ntp.conf
index 6cf6a2ddee71a336471e4ae4cce3c6eb8458bc86..536f14e97890cc648b4b0dd28bd3c12b6763b104 100644 (file)
--- a/dhcpcd-hooks/50-ntp.conf
+++ b/dhcpcd-hooks/50-ntp.conf
@@ -30,7 +30,7 @@ build_ntp_conf()
 
                # Build a server list
                srvs=$(cd "${ntp_conf_dir}";
-                       key_get_value "server" ${interfaces})
+                       key_get_value "server " ${interfaces})
                if [ -n "${srvs}" ]; then
                        for x in $(uniqify ${srvs}); do
                                servers="${servers}server ${x}\n"

diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
index 2bb84bab872c847c711ea0debd3b3aefa8fe06bc..6619294299c27d0a35b4ac43f031562bb9c1c040 100644 (file)
--- a/dhcpcd-run-hooks.in
+++ b/dhcpcd-run-hooks.in
@@ -44,12 +44,12 @@ key_get_value()
 
        shift
        if type sed >/dev/null 2>&1; then
-               sed -n "s/^${key} //p" $@
+               sed -n "s/^${key}//p" $@
        else
                for x; do
                        while read line; do
                                case "${line}" in
-                               "${key} "*) echo "${line##${key} }";;
+                               "${key}"*) echo "${line##${key}}";;
                                esac
                        done < "${x}"
                done