Hello community, here is the log from the commit of package mkinitrd checked in at Fri Jul 27 15:42:32 CEST 2007. -------- --- mkinitrd/mkinitrd.changes 2007-07-24 12:11:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-07-27 15:23:13.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Jul 27 15:20:16 CEST 2007 - hare@suse.de + +- Fix detection of I2O devices + +------------------------------------------------------------------- +Fri Jul 27 13:25:19 CEST 2007 - agraf@suse.de + +- fix md booting (md_dev should be autodetected by the boot + script) + +------------------------------------------------------------------- +Thu Jul 26 16:06:38 CEST 2007 - agraf@suse.de + +- Include fallback boot device (#287047) +- Fixed resolve_device, so it works with devices other than + $rootdev + +------------------------------------------------------------------- +Wed Jul 25 11:44:59 CEST 2007 - hare@suse.de + +- Do not emit warnings for built-in modules + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.s30555/_old 2007-07-27 15:41:51.000000000 +0200 +++ /var/tmp/diff_new_pack.s30555/_new 2007-07-27 15:41:51.000000000 +0200 @@ -18,7 +18,7 @@ Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file perl Autoreqprov: on Version: 2.1 -Release: 4 +Release: 6 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz @@ -101,6 +101,17 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Fri Jul 27 2007 - hare@suse.de +- Fix detection of I2O devices +* Fri Jul 27 2007 - agraf@suse.de +- fix md booting (md_dev should be autodetected by the boot + script) +* Thu Jul 26 2007 - agraf@suse.de +- Include fallback boot device (#287047) +- Fixed resolve_device, so it works with devices other than + $rootdev +* Wed Jul 25 2007 - hare@suse.de +- Do not emit warnings for built-in modules * Tue Jul 24 2007 - hare@suse.de - Only enable kpartx feature if root is on device-mapper - Add vg_root to the list of vgs to activate ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/mkinitrd.changes new/mkinitrd-2.1/mkinitrd.changes --- old/mkinitrd-2.1/mkinitrd.changes 2007-07-24 12:06:57.000000000 +0200 +++ new/mkinitrd-2.1/mkinitrd.changes 2007-07-27 15:20:56.000000000 +0200 @@ -1,8 +1,32 @@ ------------------------------------------------------------------- +Fri Jul 27 15:20:16 CEST 2007 - hare@suse.de + +- Fix detection of I2O devices + +------------------------------------------------------------------- +Fri Jul 27 13:25:19 CEST 2007 - agraf@suse.de + +- fix md booting (md_dev should be autodetected by the boot + script) + +------------------------------------------------------------------- +Thu Jul 26 16:06:38 CEST 2007 - agraf@suse.de + +- Include fallback boot device (#287047) +- Fixed resolve_device, so it works with devices other than + $rootdev + +------------------------------------------------------------------- +Wed Jul 25 11:44:59 CEST 2007 - hare@suse.de + +- Do not emit warnings for built-in modules + +------------------------------------------------------------------- Tue Jul 24 12:05:32 CEST 2007 - hare@suse.de - Only enable kpartx feature if root is on device-mapper - Add vg_root to the list of vgs to activate +- Add sd_mod correctly (#293045) ------------------------------------------------------------------- Sat Jul 21 11:41:23 CEST 2007 - coolo@suse.de diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/boot-udev.sh new/mkinitrd-2.1/scripts/boot-udev.sh --- old/mkinitrd-2.1/scripts/boot-udev.sh 2007-07-24 12:06:57.000000000 +0200 +++ new/mkinitrd-2.1/scripts/boot-udev.sh 2007-07-27 15:20:56.000000000 +0200 @@ -105,11 +105,25 @@ # Get major:minor number of the device node devn=$(devnumber $rootdev) fi - if [ -n "$devn" ]; then - return 0 - else - return 1 + if [ ! "$devn" ]; then + if [ ! "$1" ]; then + # try the stored fallback device + echo \ +"Could not find $rootdev. +Want me to fall back to $fallback_rootdev? (Y/n) " + read y + if [ "$y" = n ]; then + return 1 + fi + rootdev="$fallback_rootdev" + if ! udev_discover_root x ; then + return 1 + fi + else + return 1 + fi fi + return 0 } # Check for debugging diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-block.sh new/mkinitrd-2.1/scripts/setup-block.sh --- old/mkinitrd-2.1/scripts/setup-block.sh 2007-07-24 12:06:57.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-block.sh 2007-07-27 15:20:56.000000000 +0200 @@ -38,6 +38,9 @@ cat $devpath/modalias echo ide-disk ;; + i2o*) + echo i2o_block i2o_config + ;; *) if [ ! -d /sys/block/$blkdev/device ] ; then echo "Device $blkdev not handled" >&2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-md.sh new/mkinitrd-2.1/scripts/setup-md.sh --- old/mkinitrd-2.1/scripts/setup-md.sh 2007-07-24 12:06:57.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-md.sh 2007-07-27 15:20:56.000000000 +0200 @@ -31,5 +31,4 @@ fi save_var need_mdadm -save_var md_dev save_var root_md diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-modules.sh new/mkinitrd-2.1/scripts/setup-modules.sh --- old/mkinitrd-2.1/scripts/setup-modules.sh 2007-07-24 12:06:57.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-modules.sh 2007-07-27 15:20:56.000000000 +0200 @@ -47,9 +47,13 @@ --show-depends $module 2> /dev/null \ | sed -ne 's:.*insmod /\?::p' | sed -ne 's:\ .*\?::p' ) if [ ! "$module_list" ]; then - echo \ + # Check for build-in modules + modname=$(echo $module | sed 's/-/_/g') + if [ ! -d /sys/module/$modname ] ; then + echo \ "WARNING Cannot determine dependencies of kernel module '$module'. Does it exist? If it does, try depmod -a. Continuing without $module." >&2 + fi fi for mod in $module_list ; do if ! $(echo $resolved_modules | grep -q $mod) ; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-storage.sh new/mkinitrd-2.1/scripts/setup-storage.sh --- old/mkinitrd-2.1/scripts/setup-storage.sh 2007-07-24 12:06:57.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-storage.sh 2007-07-27 15:20:56.000000000 +0200 @@ -149,20 +149,20 @@ [ "$2" ] || exit 0 - case "$rootdev" in + case "$realrootdev" in LABEL=*|UUID=*) # get real root via fsck hack realrootdev=$(fsck -N "$rootdev" \ | sed -ne '2s/.* \/dev/\/dev/p' \ | sed -e 's/ *//g') if [ -z "$realrootdev" ] ; then - echo "Could not expand $rootdev to real device" >&2 + echo "Could not expand $x to real device" >&2 exit 1 fi realrootdev=$(/usr/bin/readlink -m $realrootdev) ;; /dev/disk/*) - realrootdev=$(/usr/bin/readlink -m $rootdev) + realrootdev=$(/usr/bin/readlink -m $realrootdev) ;; *:*) if [ "$type" = "Root" ]; then @@ -172,7 +172,7 @@ ;; esac - [ "$2" != "$realrootdev" ] && x="$x ($realrootdev)" + [ "$x" != "$realrootdev" ] && x="$x ($realrootdev)" echo -en "$type device:\t$x" >&2 if [ "$type" = "Root" ]; then @@ -261,5 +261,7 @@ # It will get replaced through its way of abstraction, starting at the information mount tell us # and ending at the block device +fallback_rootdev="$(resolve_device Root $rootdev)" +save_var fallback_rootdev blockdev="$(resolve_device Root $rootdev) $(resolve_device Resume $resumedev) $(resolve_device Journal $journaldev) $(resolve_device Dump $dumpdev)" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org