rpm/vpnc
SHA256
1
0
Fork 0
forked from pool/vpnc
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=75

Browse Source
This commit is contained in:
Raymond Wooninck 2012-11-25 18:50:14 +00:00 committed by Git OBS Bridge
parent a21553259f
commit 448a0e4275
2 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vpnc.changes
View File

@ -3,6 +3,8 @@ Sun Nov 25 18:40:46 UTC 2012 - tittiatcoke@gmail.com
- Ensure that on every boot the directory /var/run/vpnc is - Ensure that on every boot the directory /var/run/vpnc is
created (bnc#773379) created (bnc#773379)
- Removed patch work-with-netconfig.patch as this is now included
upstream
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 9 08:56:14 UTC 2012 - tittiatcoke@gmail.com Tue Oct 9 08:56:14 UTC 2012 - tittiatcoke@gmail.com

41
work-with-netconfig.patch
View File

@ -1,41 +0,0 @@
--- vpnc-script.in 2009-09-05 19:10:59.000000000 +0200
+++ vpnc-script.in 2011-08-26 16:11:57.217160278 +0200
@@ -76,9 +76,9 @@
if [ -x /sbin/resolvconf ]; then # Optional tool on Debian, Ubuntu, Gentoo
MODIFYRESOLVCONF=modify_resolvconf_manager
RESTORERESOLVCONF=restore_resolvconf_manager
-elif [ -x /sbin/modify_resolvconf ]; then # Mandatory tool on Suse earlier than 11.1
- MODIFYRESOLVCONF=modify_resolvconf_suse
- RESTORERESOLVCONF=restore_resolvconf_suse
+elif [ -x /sbin/netconfig ]; then # Mandatory tool on Suse later than 11.2
+ MODIFYRESOLVCONF=modify_resolvconf_suse_netconfig
+ RESTORERESOLVCONF=restore_resolvconf_suse_netconfig
else # Generic for any OS
MODIFYRESOLVCONF=modify_resolvconf_generic
RESTORERESOLVCONF=restore_resolvconf_generic
@@ -344,6 +344,25 @@
esac
fi
}
+# === resolv.conf handling via /sbin/netconfig (Suse 11.1) =====================
+
+# Suse provides a script that modifies resolv.conf. Use it because it will
+# restart/reload all other services that care about it (e.g. lwresd). [unclear if this is still true, but probably --mlk]
+
+modify_resolvconf_suse_netconfig()
+{
+ /sbin/netconfig modify -s vpnc -i "$TUNDEV" <<-EOF
+ INTERFACE='$TUNDEV'
+ DNSSERVERS='$INTERNAL_IP4_DNS'
+ DNSDOMAIN='$CISCO_DEF_DOMAIN'
+ EOF
+}
+# Restore resolv.conf to old contents on Suse
+restore_resolvconf_suse_netconfig()
+{
+ /sbin/netconfig remove -s vpnc -i "$TUNDEV"
+}
+
# === resolv.conf handling via /sbin/modify_resolvconf (Suse) =====================
# Suse provides a script that modifies resolv.conf. Use it because it will