[patch] Slight adjustment to resolvconf patch for "proper" updates

vpnc-resolvconf-patch-v2.diff (text/plain), 1.21 KB, created by Mike Javorski on 2007-08-17 23:16:50 UTC

--- vpnc-script	(revision 196)
+++ vpnc-script	(working copy)
@@ -221,7 +221,7 @@
 	}
 fi
 
-write_resolvconf() {
+write_resolvconf_file() {
 	grep '^#@VPNC_GENERATED@' /etc/resolv.conf > /dev/null 2>&1 || cp -- /etc/resolv.conf "$RESOLV_CONF_BACKUP"
 	NEW_RESOLVCONF="#@VPNC_GENERATED@ -- this file is generated by vpnc
 # and will be overwritten by vpnc
@@ -319,7 +319,28 @@
 	fi
 }
 
-reset_resolvconf() {
+write_resolvconf_manager() {
+	NEW_RESOLVCONF=""
+	for i in $INTERNAL_IP4_DNS; do
+		NEW_RESOLVCONF="$NEW_RESOLVCONF
+nameserver $i"
+	done
+	if [ -n "$CISCO_DEF_DOMAIN" ]; then
+		NEW_RESOLVCONF="$NEW_RESOLVCONF
+domain $CISCO_DEF_DOMAIN"
+	fi
+	echo "$NEW_RESOLVCONF" | /sbin/resolvconf -a $TUNDEV
+}
+
+write_resolvconf() {
+	if [ -x /sbin/resolvconf ]; then
+		write_resolvconf_manager $@
+	else
+		write_resolvconf_file $@
+	fi
+}
+
+reset_resolvconf_file() {
 	if [ ! -e "$RESOLV_CONF_BACKUP" ]; then
 		return
 	fi
@@ -344,6 +365,18 @@
 	fi
 }
 
+reset_resolvconf_manager() {
+	/sbin/resolvconf -d $TUNDEV
+}
+
+reset_resolvconf() {
+	if [ -x /sbin/resolvconf ]; then
+		reset_resolvconf_manager $@
+	else
+		reset_resolvconf_file $@
+	fi
+}
+
 do_connect() {
 	if [ -n "$CISCO_BANNER" ]; then
 		echo "Connect Banner:"