Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Fri Dec 19 15:18:53 CET 2008. -------- --- sysconfig/sysconfig.changes 2008-12-11 18:20:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2008-12-19 13:55:18.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 19 13:51:41 CET 2008 - mt@suse.de + +- Fixed ifup-dhcp status to match BOOTPROTO settings (bnc#460093). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- sysconfig-ifup-dhcp-status-codes.bnc460093.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.DM7759/_old 2008-12-19 15:15:44.000000000 +0100 +++ /var/tmp/diff_new_pack.DM7759/_new 2008-12-19 15:15:44.000000000 +0100 @@ -20,7 +20,7 @@ Name: sysconfig Version: 0.71.12 -Release: 1 +Release: 2 Summary: The sysconfig scheme Group: System/Base License: GPL v2 or later @@ -30,6 +30,7 @@ BuildRequires: sysfsutils BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 +Patch0: sysconfig-ifup-dhcp-status-codes.bnc460093.diff %description This package provides the SuSE system configuration scheme. @@ -50,6 +51,7 @@ %prep %setup -n sysconfig-%{version} +%patch0 -p0 %build autoreconf --force --install @@ -249,6 +251,8 @@ %{stop_on_removal network} %changelog +* Fri Dec 19 2008 mt@suse.de +- Fixed ifup-dhcp status to match BOOTPROTO settings (bnc#460093). * Thu Dec 11 2008 mt@suse.de - version 0.71.12 - Fixed ifup-dhcp to disable dhcp6 client when ipv6 support is ++++++ sysconfig-ifup-dhcp-status-codes.bnc460093.diff ++++++ Index: scripts/ifup-dhcp =================================================================== --- scripts/ifup-dhcp (Revision 1815) +++ scripts/ifup-dhcp (Arbeitskopie) @@ -744,21 +744,42 @@ message "`printf " %-9s DHCP6 continues in background" $INTERFACE`" fi fi - debug "DHCP4: STARTED=$DHCP4_STARTED STATUS=$DHCP4_STATUS" - debug "DHCP6: STARTED=$DHCP6_STARTED STATUS=$DHCP6_STATUS" + debug "DHCP4(required=$explicit_dhcp4) STARTED=$DHCP4_STARTED STATUS=$DHCP4_STATUS" + debug "DHCP6(required=$explicit_dhcp6) STARTED=$DHCP6_STARTED STATUS=$DHCP6_STATUS" + [ -z "$DHCP4_STATUS" ] && DHCP4_STATUS=$R_ERROR + [ -z "$DHCP6_STATUS" ] && DHCP6_STATUS=$R_ERROR - if [ "$DHCP4_STATUS" = $R_SUCCESS -a $DHCP6_STATUS = $R_SUCCESS ] ; then - exit $R_SUCCESS - elif [ "$DHCP4_STATUS" = $R_NOTRUNNING -o $DHCP6_STATUS = $R_NOTRUNNING ] ; then - exit $R_NOTRUNNING - elif [ "$DHCP4_STATUS" = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then - exit $R_DHCP_BG - elif [ "$DHCP4_STATUS" != $R_NOTCONFIGURED ] ; then + case "${explicit_dhcp4}_${explicit_dhcp6}" in + (yes_yes) # BOOTPROTO=dhcp4+dhcp6 (need both to report success) + if [ $DHCP4_STATUS = $R_SUCCESS -a $DHCP6_STATUS = $R_SUCCESS ] ; then + exit $R_SUCCESS + elif [ $DHCP4_STATUS = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then + exit $R_DHCP_BG + elif [ $DHCP4_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP4_STATUS + elif [ $DHCP6_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP6_STATUS + fi + ;; + (no_no) # BOOTPROTO=dhcp (one is sufficient) + if [ $DHCP4_STATUS = $R_SUCCESS -o $DHCP6_STATUS = $R_SUCCESS ] ; then + exit $R_SUCCESS + elif [ $DHCP4_STATUS = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then + exit $R_DHCP_BG + elif [ $DHCP4_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP4_STATUS + elif [ $DHCP6_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP6_STATUS + fi + ;; + (yes_no) # BOOTPROTO=dhcp4 exit $DHCP4_STATUS - elif [ "$DHCP6_STATUS" != $R_NOTCONFIGURED ] ; then + ;; + (no_yes) # BOOTPROTO=dhcp6 exit $DHCP6_STATUS - fi - exit 0 + ;; + esac + exit $R_ERROR ;; stop) @@ -1040,17 +1061,40 @@ ;; esac done - if [ "$DHCP4_STATUS" = $R_SUCCESS -a $DHCP6_STATUS = $R_SUCCESS ] ; then - exit $R_SUCCESS - elif [ "$DHCP4_STATUS" = $R_NOTRUNNING -o $DHCP6_STATUS = $R_NOTRUNNING ] ; then - exit $R_NOTRUNNING - elif [ "$DHCP4_STATUS" = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then - exit $R_DHCP_BG - elif [ "$DHCP4_STATUS" != $R_NOTCONFIGURED ] ; then + + debug "DHCP4(required=$explicit_dhcp4) STATUS=$DHCP4_STATUS" + debug "DHCP6(required=$explicit_dhcp6) STATUS=$DHCP6_STATUS" + + case "${explicit_dhcp4}_${explicit_dhcp6}" in + (yes_yes) # BOOTPROTO=dhcp4+dhcp6 (need both to report success) + if [ $DHCP4_STATUS = $R_SUCCESS -a $DHCP6_STATUS = $R_SUCCESS ] ; then + exit $R_SUCCESS + elif [ $DHCP4_STATUS = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then + exit $R_DHCP_BG + elif [ $DHCP4_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP4_STATUS + elif [ $DHCP6_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP6_STATUS + fi + ;; + (no_no) # BOOTPROTO=dhcp (one is sufficient) + if [ $DHCP4_STATUS = $R_SUCCESS -o $DHCP6_STATUS = $R_SUCCESS ] ; then + exit $R_SUCCESS + elif [ $DHCP4_STATUS = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then + exit $R_DHCP_BG + elif [ $DHCP4_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP4_STATUS + elif [ $DHCP6_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP6_STATUS + fi + ;; + (yes_no) # BOOTPROTO=dhcp4 exit $DHCP4_STATUS - elif [ "$DHCP6_STATUS" != $R_NOTCONFIGURED ] ; then + ;; + (no_yes) # BOOTPROTO=dhcp6 exit $DHCP6_STATUS - fi - exit $R_NOTCONFIGURED + ;; + esac + exit $R_ERROR ;; esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org