Hello community, here is the log from the commit of package mkinitrd checked in at Tue Oct 17 00:13:59 CEST 2006. -------- --- mkinitrd/mkinitrd.changes 2006-09-29 22:00:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2006-10-17 00:12:45.000000000 +0200 @@ -1,0 +2,33 @@ +Mon Oct 16 16:25:37 CEST 2006 - hare@suse.de + +- Escape 'mdadm' to avoid error messages +- Only use '-C' for fsck if we're on the console (#121946) + +------------------------------------------------------------------- +Mon Oct 16 12:29:27 CEST 2006 - agruen@suse.de + +- Make sure to always include the module for the root filesystem + if the root filesystem is modularized. + +------------------------------------------------------------------- +Sun Oct 15 14:40:16 CEST 2006 - olh@suse.de + +- handle LABEL=/UUID= from fstab correctly with empty /proc/cmdline + +------------------------------------------------------------------- +Tue Oct 10 08:08:33 CEST 2006 - olh@suse.de + +- /sys/power/resume is optional + +------------------------------------------------------------------- +Tue Oct 10 07:53:38 CEST 2006 - olh@suse.de + +- -M needs an argument, broken by IDE scan changes + +------------------------------------------------------------------- +Thu Oct 5 13:19:41 CEST 2006 - hare@suse.de + +- Include all executables from /lib/mkinitrd/bin + (FATE 300884) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.MRzNuf/_old 2006-10-17 00:12:58.000000000 +0200 +++ /var/tmp/diff_new_pack.MRzNuf/_new 2006-10-17 00:12:58.000000000 +0200 @@ -18,7 +18,7 @@ # bootsplash required only if creating splash initrd's. Autoreqprov: on Version: 1.2 -Release: 127 +Release: 131 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd @@ -87,6 +87,21 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog -n mkinitrd +* Mon Oct 16 2006 - hare@suse.de +- Escape 'mdadm' to avoid error messages +- Only use '-C' for fsck if we're on the console (#121946) +* Mon Oct 16 2006 - agruen@suse.de +- Make sure to always include the module for the root filesystem + if the root filesystem is modularized. +* Sun Oct 15 2006 - olh@suse.de +- handle LABEL=/UUID= from fstab correctly with empty /proc/cmdline +* Tue Oct 10 2006 - olh@suse.de +- /sys/power/resume is optional +* Tue Oct 10 2006 - olh@suse.de +- -M needs an argument, broken by IDE scan changes +* Thu Oct 05 2006 - hare@suse.de +- Include all executables from /lib/mkinitrd/bin + (FATE 300884) * Fri Sep 29 2006 - aj@suse.de - Copy libgcc_s into the lib directory and not to / * Thu Sep 28 2006 - hare@suse.de ++++++ mkinitrd ++++++ --- mkinitrd/mkinitrd 2006-09-29 21:59:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd 2006-10-17 00:12:08.000000000 +0200 @@ -23,7 +23,7 @@ # This file is kept in the following CVS repository: # # $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $ -# $Revision: 1.338 $ +# $Revision: 1.344 $ usage() { cat<<EOF @@ -143,7 +143,7 @@ ;; esac -while getopts :ef:hk:i:m:u:b:d:s:St:D:I:V:a:MP:j: a ; do +while getopts :ef:hk:i:m:u:b:d:s:St:D:I:V:a:M:P:j: a ; do case $a in :|?) case $OPTARG in k) echo "-k requires kernel list parameter" @@ -1219,6 +1219,14 @@ return fi + # Make sure to always include the module for the root filesystem + # if the root filesystem is modularized. + if ! has_module "$rootfstype" && \ + grep -qe "$rootfstype.ko:" $modules_dep; then + echo "Adding the root filesystem module ($rootfstype)" + add_module $rootfstype + fi + # create an empty initrd if ! mkdir $tmp_mnt ; then error 1 "could not create temporary directory" @@ -1360,7 +1368,11 @@ cp_bin /bin/$bin $tmp_mnt/bin done - cp_bin /lib/mkinitrd/bin/run-init $tmp_mnt/bin/run-init + for file in /lib/mkinitrd/bin/* ; do + if [ -x $file ] ; then + cp_bin $file $tmp_mnt/bin + fi + done # all dev nodes belong to root, but some may be # owned by a group other than root @@ -1759,9 +1771,9 @@ | |if [ -z "$rootdev" ]; then | rootdev=$rootdev - |else - | # lilo strips off the /dev/prefix from device names! - | case $rootdev in + |fi + |# lilo strips off the /dev/prefix from device names! + |case $rootdev in | /dev/disk/by-name/*) | rootdevid=${rootdev#/dev/disk/by-name/} | rootdevid=${rootdevid%-part*} @@ -1803,8 +1815,7 @@ | *) | rootdev=/dev/$rootdev | ;; - | esac - |fi + |esac | |# Verify manual resume mode |if [ "$resume_mode" != "off" -a -n "$resumedev" ]; then @@ -2410,6 +2421,9 @@ | |udev_discover_resume() { | local resume + | if [ ! -f /sys/power/resume ] ; then + | return + | fi | # Waits for the resume device to appear | if [ "$resume_mode" != "off" ]; then | if [ -e $resumedev ] ; then @@ -2540,7 +2554,8 @@ cat_linuxrc <<-EOF | |if [ -f /etc/mdadm.conf ] ; then - | mdarg="-Ac /etc/mdadm.conf --scan" + | mdarg="-Ac /etc/mdadm.conf" + | [ -z "$md_dev" ] && md_dev="--scan" |else | mdarg="-Ac partitions" |fi @@ -2566,8 +2581,9 @@ | ;; |esac | - |/sbin/mdadm $mdarg --auto=md $md_dev - | + |if [ "$md_dev" ] ; then + | /sbin/mdadm $mdarg --auto=md $md_dev + |fi EOF fi @@ -2756,7 +2772,9 @@ |elif [ -x /bin/fsck.${rootfstype} ]; then | # fsck is unhappy without it | echo "$rootdev / $rootfstype defaults 1 1" > /etc/fstab - | fsckopts="-C -a" + | # Display progress bar if possible + | fsckopts="-V -a" + | [ "`/sbin/showconsole`" = "/dev/tty1" ] && fsckopts="$fsckopts -C" | # Check external journal for reiserfs | [ "$rootfstype" = "reiserfs" -a -n "$journaldev" ] && fsckopts="-j $journaldev $fsckopts" | fsck -t $rootfstype $fsckopts $rootdev @@ -3107,9 +3125,11 @@ minor=$(devminor $rootdevn) # get md configuration mdconf=$(mdadm -Db $rootdev 2> /dev/null | sed -n "s@/dev/md[0-9]*@/dev/md$minor@p") - md_dev=${rootdev##/dev/} - md_list="$md_dev" - eval md_conf_${md_dev}="$mdconf" + if [ -n "$mdconf" ] ; then + md_dev=${rootdev##/dev/} + md_list="$md_dev" + eval md_conf_${md_dev}="$mdconf" + fi unset minor unset md_dev unset mdconf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org