Mailinglist Archive: opensuse-commit (1945 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package sysconfig
checked in at Sat Nov 29 23:22:37 CET 2008.


--------
--- sysconfig/sysconfig.changes 2008-11-27 16:29:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes    2008-11-28 
15:45:34.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 28 14:39:40 CET 2008 - lnussel@xxxxxxx
+
+- Fixed ppp/ip-up script to fallback to DNS servers defined in
+  the provider description file (bnc#449518).
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  sysconfig-ip-up-dns-from-provider-file.bnc449518.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.W13635/_old  2008-11-29 23:21:54.000000000 +0100
+++ /var/tmp/diff_new_pack.W13635/_new  2008-11-29 23:21:54.000000000 +0100
@@ -20,7 +20,7 @@
 
 Name:           sysconfig
 Version:        0.71.11
-Release:        3
+Release:        4
 Summary:        The sysconfig scheme
 Group:          System/Base
 License:        GPL v2 or later
@@ -37,6 +37,7 @@
 Patch4:         %{name}-netconfig-8-man-page.bnc446545.diff
 Patch5:         %{name}-network-remotefs-virtual-order.bnc447098.diff
 Patch6:         %{name}-ifup-dhcp-dhcpcd-lastlease.bnc447237.diff
+Patch7:         %{name}-ip-up-dns-from-provider-file.bnc449518.diff
 
 %description
 This package provides the SuSE system configuration scheme.
@@ -64,6 +65,7 @@
 %patch4 -p0
 %patch5 -p0
 %patch6 -p0
+%patch7 -p0
 
 %build
 autoreconf --force --install
@@ -257,6 +259,9 @@
 %{stop_on_removal network}
 
 %changelog
+* Fri Nov 28 2008 lnussel@xxxxxxx
+- Fixed ppp/ip-up script to fallback to DNS servers defined in
+  the provider description file (bnc#449518).
 * Thu Nov 27 2008 mt@xxxxxxx
 - Added DHCLIENT_USE_LAST_LEASE (-E/--lastlease) dhcpcd option to
   dhcp config and ifup-dhcp script, addopted new DHCLIENT_TIMEOUT

++++++ sysconfig-ip-up-dns-from-provider-file.bnc449518.diff ++++++
--- scripts/ip-up
+++ scripts/ip-up       2008/11/28 13:31:33
@@ -52,8 +52,6 @@ parse_ipparam()
 # pppd when the link goes down.
 add_nameservers()
 {
-       # TODO: do we have to consider MODIFYDNS and USEPEERDNS? test it!
-       NETCONFIG_VERBOSE="-v"
        {
                echo "INTERFACE='$INTERFACE'"
                echo "IPADDR='$LOCALIP'"
@@ -64,6 +62,8 @@ add_nameservers()
                                dnsservers=($DNS1 $DNS2)
                        elif [ "x$MS_DNS1" != x -o "x$MS_DNS2" != x ] ; then
                                dnsservers=($MS_DNS1 $MS_DNS2)
+                       elif [ -f /etc/sysconfig/network/providers/"$provider" 
]; then
+                               dnsservers=(`. 
/etc/sysconfig/network/providers/"$provider"; test \$MODIFYDNS = yes && echo 
\$DNS1 \$DNS2`)
                        fi
                        echo "DNSSERVERS='${dnsservers[@]}'"
                #fi
@@ -78,7 +78,16 @@ add_nameservers()
 }
 restore_nameservers()
 {
-       NETCONFIG_VERBOSE="-v"
+       # DoD. Keep assigned DNS servers
+       if [ -f /etc/sysconfig/network/providers/"$provider" ]; then
+               noremove=(`
+                       . /etc/sysconfig/network/providers/"$provider"
+                       if [ \$MODIFYDNS = yes -a \$DEMAND = yes ]; then
+                               echo 1
+                       fi
+                       `)
+               test -z "$noremove" || return
+       fi
        /sbin/netconfig remove -s pppd -i "$INTERFACE" $NETCONFIG_VERBOSE
 }
 
@@ -197,7 +206,7 @@ case "$BASENAME" in
        
        start_firewall
 
-       if [ ${BASENAME%*-} = "ip" ]; then
+       if [ ${BASENAME%-*} = "ip" ]; then
                # ip_resend hook
                test "$IP_RESEND" = "yes" -a -x /usr/sbin/ip_resend_wakeup && \
                    /usr/sbin/ip_resend_wakeup -m $LOCALIP -o $INTERFACE
@@ -219,7 +228,7 @@ case "$BASENAME" in
        
        start_firewall
 
-       if [ ${BASENAME%*-} = "ip" ]; then
+       if [ ${BASENAME%-*} = "ip" ]; then
                # ip_resend hook
                test "$IP_RESEND" = "yes" -a -x /usr/sbin/ip_resend && \
                    /usr/sbin/ip_resend -o $INTERFACE $IP_RESEND_PARAMETER

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx