diff options
| author | Bernhard Schmidt <berni@debian.org> | 2019-03-07 21:38:56 +0100 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2019-03-07 21:38:56 +0100 |
| commit | cfcec33bd88faeb354a33bd5f8052486ac848f9a (patch) | |
| tree | 8e1ace9a34f5ee12b34416b02d514da67d54c907 /debian/update-resolv-conf | |
| parent | 7486cf05cdeb6996fdf249e5a2f15d93a47dbac1 (diff) | |
| parent | a351f71e82badcc71a2ce881bbb97eccfcebc06b (diff) | |
Merge tag 'debian/2.4.7-1' into stretch-backports
openvpn Debian release 2.4.7-1
Diffstat (limited to 'debian/update-resolv-conf')
| -rw-r--r-- | debian/update-resolv-conf | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/debian/update-resolv-conf b/debian/update-resolv-conf index fc2f031..61b15d9 100644 --- a/debian/update-resolv-conf +++ b/debian/update-resolv-conf @@ -15,7 +15,11 @@ # foreign_option_3='dhcp-option DOMAIN be.bnc.ch' # -[ -x /sbin/resolvconf ] || exit 0 +if [ ! -x /sbin/resolvconf ] ; then + logger "[OpenVPN:update-resolve-conf] missing binary /sbin/resolvconf"; + exit 0; +fi + [ "$script_type" ] || exit 0 [ "$dev" ] || exit 0 @@ -30,7 +34,8 @@ case "$script_type" in up) NMSRVRS="" SRCHS="" - for optionvarname in ${!foreign_option_*} ; do + foreign_options=$(printf '%s\n' ${!foreign_option_*} | sort -t _ -k 3 -g) + for optionvarname in ${foreign_options} ; do option="${!optionvarname}" echo "$option" split_into_parts $option |