Hello community, here is the log from the commit of package sysconfig checked in at Mon Dec 1 18:10:44 CET 2008. -------- --- sysconfig/sysconfig.changes 2008-11-28 15:45:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2008-12-01 16:03:52.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Dec 1 15:57:28 CET 2008 - mt@suse.de + +- Fixed to enable resolv.conf for netconfig when it contains a + NetworkManager comment and avoid resetting netcofig dns policy + when the NETWORKMANAGER variable is set to yes (bnc#450332). +- Fixed exit codes in netcontrol_global_hooks NM hook (bnc#450155). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- sysconfig-netcontrol_global_hooks-exit-code.bnc450155.diff sysconfig-networkmanager-resolv-conf.bnc450332.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.ys8279/_old 2008-12-01 18:08:19.000000000 +0100 +++ /var/tmp/diff_new_pack.ys8279/_new 2008-12-01 18:08:19.000000000 +0100 @@ -20,7 +20,7 @@ Name: sysconfig Version: 0.71.11 -Release: 4 +Release: 5 Summary: The sysconfig scheme Group: System/Base License: GPL v2 or later @@ -38,6 +38,8 @@ 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 +Patch8: %{name}-netcontrol_global_hooks-exit-code.bnc450155.diff +Patch9: %{name}-networkmanager-resolv-conf.bnc450332.diff %description This package provides the SuSE system configuration scheme. @@ -66,6 +68,8 @@ %patch5 -p0 %patch6 -p0 %patch7 -p0 +%patch8 -p0 +%patch9 -p0 %build autoreconf --force --install @@ -259,6 +263,11 @@ %{stop_on_removal network} %changelog +* Mon Dec 01 2008 mt@suse.de +- Fixed to enable resolv.conf for netconfig when it contains a + NetworkManager comment and avoid resetting netcofig dns policy + when the NETWORKMANAGER variable is set to yes (bnc#450332). +- Fixed exit codes in netcontrol_global_hooks NM hook (bnc#450155). * Fri Nov 28 2008 lnussel@suse.de - Fixed ppp/ip-up script to fallback to DNS servers defined in the provider description file (bnc#449518). ++++++ sysconfig-netcontrol_global_hooks-exit-code.bnc450155.diff ++++++ --- scripts/netcontrol_global_hooks +++ scripts/netcontrol_global_hooks 2008/12/01 13:25:30 @@ -27,15 +27,15 @@ # Note that hooked scripts are called always _after_ the interface is up/down. # Calling them earlier would require a change in NetworkManager itself. -cd /etc/sysconfig/network/ || exit +cd /etc/sysconfig/network/ || exit 0 test -r ./config && . ./config test -r scripts/functions && . scripts/functions INTERFACE=$1 ACTION=$2 -test "$ACTION" == down -a "$GLOBAL_PRE_DOWN_EXEC" != yes && exit -test "$ACTION" == up -a "$GLOBAL_POST_UP_EXEC" != yes && exit +test "$ACTION" == down -a "$GLOBAL_PRE_DOWN_EXEC" != yes && exit 0 +test "$ACTION" == up -a "$GLOBAL_POST_UP_EXEC" != yes && exit 0 shopt -s nullglob for a in if-${ACTION}.d/*; do @@ -43,4 +43,5 @@ info_mesg "calling '`pwd`/$a '${INTERFACE}' ${INTERFACE} -o nm'" $a "${INTERFACE}" ${INTERFACE} -o nm done +exit 0 ++++++ sysconfig-networkmanager-resolv-conf.bnc450332.diff ++++++ --- scripts/convert_to_netconfig_dns +++ scripts/convert_to_netconfig_dns 2008/12/01 15:09:16 @@ -70,6 +70,11 @@ test -n "$original" } +has_networkmanager_info() +{ + test -n "$1" -a -f "$1" && grep -qs '#.*NetworkManager' "$1" 2>/dev/null +} + has_netconfig_info() { test -n "$1" -a -f "$1" && grep -qs '^### .* netconfig' "$1" 2>/dev/null @@ -220,6 +225,7 @@ # OK, read current settings # eval `grep "^[[:space:]]*(\ +NETWORKMANAGER|\ NETCONFIG_DNS_POLICY|\ NETCONFIG_DNS_FORWARDER|\ NETCONFIG_DNS_STATIC_SERVERS|\ @@ -251,7 +257,8 @@ # disable netconfig dns updates when modify was disabled if test "$_MODIFY_NAMED_CONF_DYNAMICALLY" != yes -a \ - "$_MODIFY_RESOLV_CONF_DYNAMICALLY" != yes ; + "$_MODIFY_RESOLV_CONF_DYNAMICALLY" != yes -a \ + "$NETWORKMANAGER" != yes ; then # disable netconfig dns updates NETCONFIG_DNS_POLICY='' @@ -277,8 +284,17 @@ # don't remove the file, because it may be in a running system... if test -n "$original" -a -r "${r}$original" ; then - if ! has_netconfig_info "${r}${resolver_conf}" && \ - test "$update_netconfig_settings" = yes ; then + if has_networkmanager_info "${r}${resolver_conf}" ; then + + # just enable for netconfig when created by NM + create_backup_once "$resolver_conf" "$backup_suffix" "$r" && \ + fake_netconfig_md5 "$resolver_conf" "$netconfig_md5" "$r" && { + message "Enabled $resolver_conf for use with netconfig" + } + + elif ! has_netconfig_info "${r}${resolver_conf}" && \ + test "$update_netconfig_settings" = yes ; + then remove_modify_resolvconf_info "${r}${resolver_conf}" @@ -346,7 +362,9 @@ remove_modify_resolvconf_info "${r}${forwarder_conf}" - if test "$_MODIFY_NAMED_CONF_DYNAMICALLY" = yes ; then + if test "$NETWORKMANAGER" != yes -a \ + "$_MODIFY_NAMED_CONF_DYNAMICALLY" = yes ; + then # first, read the forwarders dns_servers=(` test -f "${r}${original}" && \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org