Hello community, here is the log from the commit of package mkinitrd checked in at Fri Sep 19 14:41:41 CEST 2008. -------- --- mkinitrd/mkinitrd.changes 2008-09-09 16:03:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2008-09-19 10:19:37.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 19 10:17:52 CEST 2008 - hare@suse.de + +- Detect LVM2 devices during boot correctly (bnc#421379) +- Include all S/390 block modules, too (bnc#427615) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.J32379/_old 2008-09-19 14:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.J32379/_new 2008-09-19 14:41:22.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: 21 +Release: 25 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules @@ -109,6 +109,9 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Fri Sep 19 2008 hare@suse.de +- Detect LVM2 devices during boot correctly (bnc#421379) +- Include all S/390 block modules, too (bnc#427615) * Tue Sep 09 2008 hare@suse.de - Fix dhcp network detection (bnc#415438) - parse 'ip route' lines correctly (bnc#414191) ++++++ 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-09-09 16:02:59.000000000 +0200 +++ new/mkinitrd-2.4/mkinitrd.changes 2008-09-19 10:18:55.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 19 10:17:52 CEST 2008 - hare@suse.de + +- Detect LVM2 devices during boot correctly (bnc#421379) +- Include all S/390 block modules, too (bnc#427615) + +------------------------------------------------------------------- Tue Sep 9 16:00:28 CEST 2008 - hare@suse.de - Fix dhcp network detection (bnc#415438) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/boot-mount.sh new/mkinitrd-2.4/scripts/boot-mount.sh --- old/mkinitrd-2.4/scripts/boot-mount.sh 2008-09-09 16:02:59.000000000 +0200 +++ new/mkinitrd-2.4/scripts/boot-mount.sh 2008-09-19 10:18:55.000000000 +0200 @@ -64,10 +64,24 @@ PATH=$PATH PS1='$ ' /bin/sh -i fi -if [ -z "$rootfstype" -a -x /sbin/udevadm ]; then - eval $(/sbin/udevadm info -q env -n $rootdev | sed -n '/ID_FS_TYPE/p') +sysdev=$(/sbin/udevadm info -q path -n $rootdev) +# Fallback if rootdev is not controlled by udev +if [ $? -ne 0 ] && [ -b $rootdev ] ; then + local devn maj min sysdev + + devn=$(devnumber $rootdev) + maj=$(devmajor $devn) + min=$(devminor $devn) + if [ -e /sys/dev/block/$maj:$min ] ; then + sysdev=$(cd -P /sys/dev/block/$maj:$min ; echo $PWD) + fi + unset devn + unset maj + unset min +fi +if [ -z "$rootfstype" -a -x /sbin/udevadm -a -n "$sysdev" ]; then + eval $(/sbin/udevadm info -q env -p $sysdev | sed -n '/ID_FS_TYPE/p') rootfstype=$ID_FS_TYPE - [ $? -ne 0 ] && rootfstype= [ -n "$rootfstype" ] && [ "$rootfstype" = "unknown" ] && $rootfstype= ID_FS_TYPE= fi 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-09-09 16:02:59.000000000 +0200 +++ new/mkinitrd-2.4/scripts/setup-block.sh 2008-09-19 10:18:55.000000000 +0200 @@ -97,7 +97,7 @@ } 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 + for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/{ata,ide,scsi,s390/block,s390/scsi} -name "*.ko"); do i=${i%*.ko} block_modules="$block_modules ${i##*/}" done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/setup-udev.sh new/mkinitrd-2.4/scripts/setup-udev.sh --- old/mkinitrd-2.4/scripts/setup-udev.sh 2008-09-09 16:02:59.000000000 +0200 +++ new/mkinitrd-2.4/scripts/setup-udev.sh 2008-09-19 10:18:55.000000000 +0200 @@ -21,7 +21,7 @@ 64-md-raid.rules \ 80-drivers.rules; do if [ -f /lib/udev/rules.d/$rule ]; then - cp /lib/udev/rules.d/$rule $tmp_mnt/etc/udev/rules.d + cp /lib/udev/rules.d/$rule $tmp_mnt/lib/udev/rules.d elif [ -f /etc/udev/rules.d/$rule ]; then cp /etc/udev/rules.d/$rule $tmp_mnt/etc/udev/rules.d fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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