Hello community, here is the log from the commit of package mkinitrd checked in at Sat Aug 2 04:53:29 CEST 2008. -------- --- mkinitrd/mkinitrd.changes 2008-07-24 14:01:51.000000000 +0200 +++ mkinitrd/mkinitrd.changes 2008-07-31 12:20:23.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 31 12:19:00 CEST 2008 - hare@suse.de + +- Do not activate network by default (bnc#412649) +- Reset LVM prior to multipath activation (bnc#407512) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.W30961/_old 2008-08-02 04:48:34.000000000 +0200 +++ /var/tmp/diff_new_pack.W30961/_new 2008-08-02 04:48:34.000000000 +0200 @@ -18,7 +18,7 @@ Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl AutoReqProv: on Version: 2.4 -Release: 1 +Release: 5 Conflicts: udev < 118 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -101,6 +101,9 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Thu Jul 31 2008 hare@suse.de +- Do not activate network by default (bnc#412649) +- Reset LVM prior to multipath activation (bnc#407512) * Thu Jul 24 2008 hare@suse.de - Don't overwrite interface settings (bnc#410013) - Remove calls to 'vol_id' ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/mkinitrd.changes new/mkinitrd-2.4/mkinitrd.changes --- old/mkinitrd-2.4/mkinitrd.changes 2008-07-24 14:01:13.000000000 +0200 +++ new/mkinitrd-2.4/mkinitrd.changes 2008-07-31 12:20:01.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 31 12:19:00 CEST 2008 - hare@suse.de + +- Do not activate network by default (bnc#412649) +- Reset LVM prior to multipath activation (bnc#407512) + +------------------------------------------------------------------- Thu Jul 24 13:54:08 CEST 2008 - hare@suse.de - Don't overwrite interface settings (bnc#410013) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/boot-devfunctions.sh new/mkinitrd-2.4/scripts/boot-devfunctions.sh --- old/mkinitrd-2.4/scripts/boot-devfunctions.sh 2008-07-24 14:01:13.000000000 +0200 +++ new/mkinitrd-2.4/scripts/boot-devfunctions.sh 2008-07-31 12:20:01.000000000 +0200 @@ -74,6 +74,9 @@ retval=0 break; elif [ -x /sbin/multipath ] ; then + if [ -n "$vg_root" -a -n "$vg_roots" ] ; then + vgchange -a n + fi echo -n "!" multipath -v0 wait_for_events @@ -93,12 +96,25 @@ # Recheck for LVM volumes if [ -n "$vg_root" -a -n "$vg_roots" ] ; then vgscan + + for vgr in $vg_root $vg_roots; do + vgchange -a y $vgr + done + wait_for_events fi - for vgr in $vg_root $vg_roots; do - vgchange -a y $vgr - done done fi + if [ -x /sbin/multipath ] && [ -n "vg_root" -a -n "$vg_roots" ] ; then + echo "Resetting LVM for multipath" + vgchange -a n + multipath -v 0 + wait_for_events + vgscan + for vgr in $vg_root $vg_roots; do + vgchange -a y $vgr + done + wait_for_events + fi return $retval; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/setup-network.sh new/mkinitrd-2.4/scripts/setup-network.sh --- old/mkinitrd-2.4/scripts/setup-network.sh 2008-07-24 14:01:13.000000000 +0200 +++ new/mkinitrd-2.4/scripts/setup-network.sh 2008-07-31 12:20:01.000000000 +0200 @@ -114,12 +114,20 @@ echo $ifname/$BOOTPROTO } +if [ -z "$interface" ] ; then + for addfeature in $ADDITIONAL_FEATURES; do + if [ "$addfeature" = "network" ]; then + interface=default + fi + done +fi + interface=${interface#/dev/} [ "$param_D" ] && nettype=dhcp [ "$param_I" ] && nettype=static # get the default interface if requested -if [ -z "$interface" -o "$interface" = "default" ]; then +if [ "$interface" = "default" ]; then ifspec=$(get_default_interface) interface=${ifspec%%/*} if [ "${ifspec##*/}" = "dhcp" ] ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org