Attachment 631221 Details for Bug 865092 – Corrected patch

[patch] Corrected patch

vpnc-script.patch (text/plain), 1.28 KB, created by Erinn Looney-Triggs on 2012-10-22 03:40:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Erinn Looney-Triggs

Created: 2012-10-22 03:40:11 UTC

Size: 1.28 KB

patch

obsolete

>--- vpnc-script.orig	2012-10-01 14:14:52.736704348 -0600
>+++ vpnc-script	2012-10-02 13:33:14.290804820 -0600
>@@ -86,6 +86,9 @@
> elif [ -x /sbin/modify_resolvconf ]; then # Mandatory tool on Suse earlier than 11.1
> 	MODIFYRESOLVCONF=modify_resolvconf_suse
> 	RESTORERESOLVCONF=restore_resolvconf_suse
>+elif command -v unbound-control > /dev/null && unbound-control status &> /dev/null; then 
>+        MODIFYRESOLVCONF=modify_resolvconf_unbound
>+        RESTORERESOLVCONF=restore_resolvconf_unbound
> else # Generic for any OS
> 	MODIFYRESOLVCONF=modify_resolvconf_generic
> 	RESTORERESOLVCONF=restore_resolvconf_generic
>@@ -470,6 +473,22 @@
> 	/sbin/resolvconf -d $TUNDEV
> }
> 
>+# === resolv.conf handling via unbound =========
>+
>+modify_resolvconf_unbound() {
>+        if [ -n "$CISCO_DEF_DOMAIN" ]; then
>+                unbound-control forward_add +i ${CISCO_DEF_DOMAIN} ${INTERNAL_IP4_DNS[@]}
>+                unbound-control flush_zone ${CISCO_DEF_DOMAIN}
>+        fi
>+}
>+
>+restore_resolvconf_unbound() {
>+        if [ -n "$CISCO_DEF_DOMAIN" ]; then
>+                unbound-control forward_remove +i ${CISCO_DEF_DOMAIN}
>+                unbound-control flush_zone ${CISCO_DEF_DOMAIN}
>+        fi
>+}
>+
> # ========= Toplevel state handling  =======================================
> 
> kernel_is_2_6_or_above() {

Actions: View | Diff

Attachments on bug 865092: 625124 | 631221 | 632555