Hello community, here is the log from the commit of package mkinitrd checked in at Tue Sep 9 22:14:50 CEST 2008. -------- --- mkinitrd/mkinitrd.changes 2008-08-08 16:10:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2008-09-09 16:03:16.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 9 16:00:28 CEST 2008 - hare@suse.de + +- Fix dhcp network detection (bnc#415438) +- parse 'ip route' lines correctly (bnc#414191) +- Always include all ATA and SCSI drivers + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.C20339/_old 2008-09-09 22:14:19.000000000 +0200 +++ /var/tmp/diff_new_pack.C20339/_new 2008-09-09 22:14:19.000000000 +0200 @@ -25,7 +25,7 @@ Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl AutoReqProv: on Version: 2.4 -Release: 9 +Release: 21 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules @@ -109,6 +109,10 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Tue Sep 09 2008 hare@suse.de +- Fix dhcp network detection (bnc#415438) +- parse 'ip route' lines correctly (bnc#414191) +- Always include all ATA and SCSI drivers * Fri Aug 08 2008 hare@suse.de - Fix booting with no 'root=' commandline parameter - Implement 'forcefsck' parameter (bnc#379597) ++++++ 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-08-08 16:10:19.000000000 +0200 +++ new/mkinitrd-2.4/mkinitrd.changes 2008-09-09 16:02:59.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 9 16:00:28 CEST 2008 - hare@suse.de + +- Fix dhcp network detection (bnc#415438) +- parse 'ip route' lines correctly (bnc#414191) +- Always include all ATA and SCSI drivers + +------------------------------------------------------------------- Fri Aug 8 16:06:49 CEST 2008 - hare@suse.de - Fix booting with no 'root=' commandline parameter diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/setup-block.sh new/mkinitrd-2.4/scripts/setup-block.sh --- old/mkinitrd-2.4/scripts/setup-block.sh 2008-08-08 16:10:19.000000000 +0200 +++ new/mkinitrd-2.4/scripts/setup-block.sh 2008-09-09 16:02:59.000000000 +0200 @@ -2,6 +2,7 @@ # #%stage: block #%depends: partition +#%param_S: "Don't include all IDE and SCSI drivers." # handle_scsi() { local dev=$1 @@ -95,7 +96,7 @@ echo -n "$newmodule " } -if [ "$create_monster_initrd" ]; then +if [ "$create_monster_initrd" -o ! "$param_S" ]; then for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/{ata,ide,scsi} -name "*.ko"); do i=${i%*.ko} block_modules="$block_modules ${i##*/}" 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-08-08 16:10:19.000000000 +0200 +++ new/mkinitrd-2.4/scripts/setup-network.sh 2008-09-09 16:02:59.000000000 +0200 @@ -104,8 +104,8 @@ fi # No nfsroot interface description if [ -z "$ifname" ]; then - ifname=$(/sbin/ip route | sed -n 's/default .* dev \([[:alnum:]]*\) */\1/p') - if [ $(ps -A -o cmd= | sed -n '/.*dhcp.*$ifname.*/p' | wc --lines) -eq 2 ] ; then + ifname=$(/sbin/ip route | sed -n 's/default .* dev \([[:alnum:]]*\) *.*/\1/p') + if [ $(ps -A -o cmd= | sed -n "/.*dhcp.*$ifname.*/p" | wc --lines) -eq 2 ] ; then BOOTPROTO=dhcp else BOOTPROTO=static ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de