Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Mon May 31 18:16:58 CEST 2010. -------- --- mkinitrd/mkinitrd.changes 2010-05-05 15:06:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2010-05-31 13:37:00.000000000 +0200 @@ -1,0 +2,10 @@ +Mon May 31 13:33:02 CEST 2010 - eich@novell.com + +- setup-kmp.sh: Fix for nouveau (bnc#595570). + +------------------------------------------------------------------- +Mon May 10 13:20:45 CEST 2010 - mmarek@suse.cz + +- setup-storage.sh: Fix beautify_blockdev() (bnc#604150). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.fr2RLO/_old 2010-05-31 18:15:53.000000000 +0200 +++ /var/tmp/diff_new_pack.fr2RLO/_new 2010-05-31 18:15:53.000000000 +0200 @@ -31,7 +31,7 @@ %endif AutoReqProv: on Version: 2.5.10 -Release: 17 +Release: 18 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/mkinitrd.changes new/mkinitrd-2.5.10/mkinitrd.changes --- old/mkinitrd-2.5.10/mkinitrd.changes 2010-05-05 14:05:28.000000000 +0200 +++ new/mkinitrd-2.5.10/mkinitrd.changes 2010-05-31 13:34:35.000000000 +0200 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon May 31 13:33:02 CEST 2010 - eich@novell.com + +- setup-kmp.sh: Fix for nouveau (bnc#595570). + +------------------------------------------------------------------- +Mon May 10 13:20:45 CEST 2010 - mmarek@suse.cz + +- setup-storage.sh: Fix beautify_blockdev() (bnc#604150). + +------------------------------------------------------------------- Wed May 5 14:04:52 CEST 2010 - mmarek@suse.cz - boot-start.sh: Parse /proc/cmdline more robustly (bnc#598063#c3). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-kms.sh new/mkinitrd-2.5.10/scripts/setup-kms.sh --- old/mkinitrd-2.5.10/scripts/setup-kms.sh 2010-05-05 14:05:28.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/setup-kms.sh 2010-05-31 13:34:35.000000000 +0200 @@ -80,7 +80,7 @@ [ -d /sys/bus/pci ] && [ -x /sbin/lspci ] || return 1 - for line in $(/sbin/lspci -mn 2>/dev/null) + for line in $(/sbin/lspci -mn 2>/dev/null | tr "[:lower:]" "[:upper:]") do unset entries ret=0 @@ -90,7 +90,7 @@ for i in $line do case $i in - -p) + -P) m_if[$ct]=${p#-p} continue; ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-storage.sh new/mkinitrd-2.5.10/scripts/setup-storage.sh --- old/mkinitrd-2.5.10/scripts/setup-storage.sh 2010-05-05 14:05:28.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/setup-storage.sh 2010-05-31 13:34:35.000000000 +0200 @@ -65,6 +65,12 @@ beautify_blockdev() { local olddev="$1" udevdevs dev + case "$olddev" in + /dev/md*) + # setup-md.sh doesn't understand the md-uuid-* symlinks + echo "$olddev" + return + esac # search for udev information udevdevs=$(/sbin/udevadm info -q symlink --name=$olddev) # look up ata device links @@ -83,8 +89,14 @@ done # take the first guess for dev in $udevdevs; do - echo "/dev/$dev" - return + case "$dev" in + block/* | root) + continue + ;; + *) + echo "/dev/$dev" + return + esac done # get pretty name from device-mapper ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org