Hello community, here is the log from the commit of package mkinitrd checked in at Mon Mar 10 02:59:19 CET 2008. -------- --- mkinitrd/mkinitrd.changes 2007-11-09 08:47:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2008-03-10 02:46:24.750661000 +0100 @@ -1,0 +2,19 @@ +Wed Mar 5 15:30:38 CET 2008 - hare@suse.de + +- Work on non-modular systems, too (bnc#367269) + +------------------------------------------------------------------- +Wed Feb 6 09:15:02 CET 2008 - agraf@suse.de + +- don't resolve non-existing devices, so a wrong resume device + option does not result in a broken initrd (#357725) + +------------------------------------------------------------------- +Thu Jan 10 13:13:48 CET 2008 - hare@suse.de + +- Rescan for LVM2 when waiting for the root device (#343891) +- Allow for commandline variables without a value (#347175) +- Parse 'ro' variable correctly +- Include the real bash binary (#337386) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.p29555/_old 2008-03-10 02:59:07.000000000 +0100 +++ /var/tmp/diff_new_pack.p29555/_new 2008-03-10 02:59:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mkinitrd (Version 2.1) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,6 +10,7 @@ # norootforbuild + Name: mkinitrd License: GPL v2 or later Group: System/Base @@ -18,7 +19,7 @@ Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file perl AutoReqProv: on Version: 2.1 -Release: 44 +Release: 64 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz @@ -100,3 +101,4 @@ /sbin/installkernel %doc %{_mandir}/man5/mkinitrd.5.gz %doc %{_mandir}/man8/mkinitrd.8.gz + ++++++ 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-11-09 08:47:06.000000000 +0100 +++ new/mkinitrd-2.1/mkinitrd.changes 2008-03-05 15:32:16.000000000 +0100 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Wed Mar 5 15:30:38 CET 2008 - hare@suse.de + +- Work on non-modular systems, too (#367269) + +------------------------------------------------------------------- +Wed Feb 6 09:15:02 CET 2008 - agraf@suse.de + +- don't resolve non-existing devices, so a wrong resume device + option does not result in a broken initrd (#357725) + +------------------------------------------------------------------- +Thu Jan 10 13:13:48 CET 2008 - hare@suse.de + +- Rescan for LVM2 when waiting for the root device (#343891) +- Allow for commandline variables without a value (#347175) +- Parse 'ro' variable correctly +- Include the real bash binary (#337386) + +------------------------------------------------------------------- Fri Nov 9 08:46:21 CET 2007 - hare@suse.de - Add new udevadm tool to boot-udev.sh diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/boot-mount.sh new/mkinitrd-2.1/scripts/boot-mount.sh --- old/mkinitrd-2.1/scripts/boot-mount.sh 2007-11-09 08:47:06.000000000 +0100 +++ new/mkinitrd-2.1/scripts/boot-mount.sh 2008-03-05 15:32:16.000000000 +0100 @@ -20,7 +20,7 @@ ## ro mount the root device read-only ## -[ "$( ( set -u; echo $ro >/dev/null; echo 1 ) 2>/dev/null )" = "1" ] && read_only=1 +( set +u; test -n "$ro") && read_only=1 [ -x /lib/udev/vol_id ] && VOL_ID=/lib/udev/vol_id [ -x /sbin/vol_id ] && VOL_ID=/sbin/vol_id diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/boot-start.sh new/mkinitrd-2.1/scripts/boot-start.sh --- old/mkinitrd-2.1/scripts/boot-start.sh 2007-11-09 08:47:06.000000000 +0100 +++ new/mkinitrd-2.1/scripts/boot-start.sh 2008-03-05 15:32:16.000000000 +0100 @@ -2,7 +2,7 @@ # #%stage: boot #%depends: devfunctions -#%programs: bash umount test mount mknod mkdir ln /sbin/blogd date sleep echo cat /bin/sed /sbin/insmod /sbin/modprobe expr kill /sbin/killall5 /sbin/halt /sbin/reboot /sbin/showconsole cp /sbin/pidof mv chmod rm true ls /lib/mkinitrd/bin/* +#%programs: /bin/bash umount test mount mknod mkdir ln /sbin/blogd date sleep echo cat /bin/sed /sbin/insmod /sbin/modprobe expr kill /sbin/killall5 /sbin/halt /sbin/reboot /sbin/showconsole cp /sbin/pidof mv chmod rm true ls /lib/mkinitrd/bin/* #%modules: $RESOLVED_INITRD_MODULES #%dontshow # @@ -62,7 +62,8 @@ key="${o%%=*}" if [ "${key%.*}" != "${key}" ]; then # module parameter add_module_param "${key%.*}" "${o#*.}" - else # environment variable + elif [ "${key}" != "${o}" ] ; then + # environment variable # set local variables too, in case somehow the kernel does not do this correctly value="${o#*=}" eval cmd_$key="$value" 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-11-09 08:47:06.000000000 +0100 +++ new/mkinitrd-2.1/scripts/boot-udev.sh 2008-03-05 15:32:16.000000000 +0100 @@ -31,6 +31,13 @@ sleep 1 echo -n "." timeout=$(( $timeout - 1 )) + # Recheck for LVM volumes + if [ -n "$lvm" -a -n "$vg_root" -a -n "$vg_roots" ] ; then + vgscan + fi + for vgr in $lvm $vg_root $vg_roots; do + vgchange -a y $vgr + done done fi return $retval; 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-11-09 08:47:06.000000000 +0100 +++ new/mkinitrd-2.1/scripts/setup-modules.sh 2008-03-05 15:32:16.000000000 +0100 @@ -104,12 +104,14 @@ done ) -echo -ne "Kernel Modules:\t" -for mod in $resolved_modules ; do - modname=${mod##*/} - echo -n "${modname%%.ko} " -done -echo +if [ "$resolved_modules" ] ; then + echo -ne "Kernel Modules:\t" + for mod in $resolved_modules ; do + modname=${mod##*/} + echo -n "${modname%%.ko} " + done + echo +fi # Copy all modules into the initrd for module in $resolved_modules; do diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-prepare.sh new/mkinitrd-2.1/scripts/setup-prepare.sh --- old/mkinitrd-2.1/scripts/setup-prepare.sh 2007-11-09 08:47:06.000000000 +0100 +++ new/mkinitrd-2.1/scripts/setup-prepare.sh 2008-03-05 15:32:16.000000000 +0100 @@ -96,16 +96,15 @@ fi kernel_version=$(/sbin/get_kernel_version $kernel_image) - modules_dep=$root_dir/lib/modules/$kernel_version/modules.dep + modules_dir=$root_dir/lib/modules/$kernel_version #echo -e "Kernel version:\t$kernel_version" echo -e "Kernel image: $kernel_image" echo -e "Initrd image: $initrd_image" - if [ ! -d "/lib/modules/$kernel_version/misc" -a \ - ! -d "/lib/modules/$kernel_version/kernel" ]; then - oops 2 "No modules found for kernel $kernel_version" - return + if [ ! -d "$modules_dir/misc" -a \ + ! -d "$modules_dir/kernel" ]; then + echo -e "Kernel Modules: <not available>" fi # And run depmod to ensure proper loading 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-11-09 08:47:06.000000000 +0100 +++ new/mkinitrd-2.1/scripts/setup-storage.sh 2008-03-05 15:32:16.000000000 +0100 @@ -194,7 +194,10 @@ local x="$2" local realrootdev="$2" - [ "$2" ] || exit 0 + # root device was already checked and non-existing + # non-root device is not fatal, but may not be + # shown to the following block resolver modules + [ -b "$realrootdev" ] || exit 0 case "$realrootdev" in LABEL=*|UUID=*) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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