Hello community, here is the log from the commit of package mkinitrd checked in at Fri Aug 3 23:09:45 CEST 2007. -------- --- mkinitrd/mkinitrd.changes 2007-07-31 16:06:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-08-02 17:01:30.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Aug 2 14:02:36 CEST 2007 - hare@suse.de + +- Detect Xen modules correctly (#290073) +- Fix booting on dmraid devices + +------------------------------------------------------------------- +Wed Aug 1 18:40:22 CEST 2007 - agraf@suse.de + +- Fix fast boot +- Use the fstab device name if stat shows the same major and minor + as the fstab device (fixes vmware boot) +- Fix case with empty no / entry in /etc/fstab +- Fix printing of "Root"-line twice +- Have the fallback root device not get resolved +- Have the nfs module only take nfs into account +- Enable fast boot by default (disable using slow_boot=1) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.V23992/_old 2007-08-03 23:08:37.000000000 +0200 +++ /var/tmp/diff_new_pack.V23992/_new 2007-08-03 23:08:37.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: 11 +Release: 13 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz @@ -101,6 +101,18 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Thu Aug 02 2007 - hare@suse.de +- Detect Xen modules correctly (#290073) +- Fix booting on dmraid devices +* Wed Aug 01 2007 - agraf@suse.de +- Fix fast boot +- Use the fstab device name if stat shows the same major and minor + as the fstab device (fixes vmware boot) +- Fix case with empty no / entry in /etc/fstab +- Fix printing of "Root"-line twice +- Have the fallback root device not get resolved +- Have the nfs module only take nfs into account +- Enable fast boot by default (disable using slow_boot=1) * Tue Jul 31 2007 - agraf@suse.de - Fix dm resolviung to only be recursive in dm module (#295997) - Include fast boot option (for less overhead with preping) ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/lib/mkinitrd/bin/linuxrc new/mkinitrd-2.1/lib/mkinitrd/bin/linuxrc --- old/mkinitrd-2.1/lib/mkinitrd/bin/linuxrc 2007-07-31 16:06:25.000000000 +0200 +++ new/mkinitrd-2.1/lib/mkinitrd/bin/linuxrc 2007-08-02 15:47:23.000000000 +0200 @@ -46,7 +46,7 @@ echo $(eval echo \${cmd_${1/-/_}}) 2>/dev/null } -if [ "$fast_boot" ]; then +if [ ! "$slow_boot" ]; then echo "doing fast boot" source run_all.sh else 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-31 16:06:25.000000000 +0200 +++ new/mkinitrd-2.1/mkinitrd.changes 2007-08-02 15:47:23.000000000 +0200 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Thu Aug 2 14:02:36 CEST 2007 - hare@suse.de + +- Detect Xen modules correctly (#290073) +- Fix booting on dmraid devices + +------------------------------------------------------------------- +Wed Aug 1 18:40:22 CEST 2007 - agraf@suse.de + +- Fix fast boot +- Use the fstab device name if stat shows the same major and minor + as the fstab device (fixes vmware boot) +- Fix case with empty no / entry in /etc/fstab +- Fix printing of "Root"-line twice +- Have the fallback root device not get resolved +- Have the nfs module only take nfs into account +- Enable fast boot by default (disable using slow_boot=1) + +------------------------------------------------------------------- Tue Jul 31 15:43:53 CEST 2007 - agraf@suse.de - Fix dm resolviung to only be recursive in dm module (#295997) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/boot-kpartx.sh new/mkinitrd-2.1/scripts/boot-kpartx.sh --- old/mkinitrd-2.1/scripts/boot-kpartx.sh 2007-07-31 16:06:25.000000000 +0200 +++ new/mkinitrd-2.1/scripts/boot-kpartx.sh 2007-08-02 15:47:23.000000000 +0200 @@ -2,4 +2,4 @@ #%stage: block #%depends: dmroot #%if: "$root_kpartx" -#%programs: /sbin/kpartx /sbin/kpartx_id +#%programs: /sbin/kpartx /lib/udev/kpartx_id 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-31 16:06:25.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-block.sh 2007-08-02 15:47:23.000000000 +0200 @@ -41,6 +41,9 @@ i2o*) echo i2o_block i2o_config ;; + xvd*) + echo xenblk + ;; *) 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-nfs.sh new/mkinitrd-2.1/scripts/setup-nfs.sh --- old/mkinitrd-2.1/scripts/setup-nfs.sh 2007-07-31 16:06:25.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-nfs.sh 2007-08-02 15:47:23.000000000 +0200 @@ -3,7 +3,19 @@ #%stage: device # case "$rootdev" in - *:*) + /dev/nfs) + rootfstype=nfs + rootdev= + use_dhcp=1 + ;; + /dev/*) + ;; + *://*) + rootfstype=${rootdev%%://*} + interface=default + save_var rootfstype + ;; + *:/*) rootfstype=nfs ;; esac 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-07-31 16:06:25.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-prepare.sh 2007-08-02 15:47:23.000000000 +0200 @@ -30,19 +30,22 @@ fi } -# check if we should use the script $1 +# check if we should use script or feature $1 use_script() { - local condition feature + local condition feature script file # always use when creating monster initrd [ "$create_monster_initrd" ] && return 0 - # when using additional features defined in the sysconfig script / command line, always use them + # Normalize to feature name + feature="${1##*/}" + feature="${feature#*-}" + feature="${feature%.sh}" + + # when using additional features defined in the sysconfig + # script / command line, always use them if [ "$ADDITIONAL_FEATURES" ]; then for addfeature in $ADDITIONAL_FEATURES; do - feature="${1##*/}" - feature="${feature#*-}" - feature="${feature%.sh}" if [ "$addfeature" = "$feature" ]; then return 0 fi @@ -50,9 +53,14 @@ fi # return false if file does not exist - [ -e "$1" ] || return 1 + for file in $INITRD_PATH/boot/*-$feature.sh ; do + if [ -e $file ] ; then + script=$file + fi + done + [ -e "$script" ] || return 1 - condition="$(cat "$1" | grep '%if: ')" + condition="$(cat "$script" | grep '%if: ')" condition="${condition#*if: }" if [ "$condition" ]; then if ! eval test $condition; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-progs.sh new/mkinitrd-2.1/scripts/setup-progs.sh --- old/mkinitrd-2.1/scripts/setup-progs.sh 2007-07-31 16:06:25.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-progs.sh 2007-08-02 15:47:23.000000000 +0200 @@ -17,11 +17,17 @@ cp -pL "$script" boot/ # add an entry to the boot wrapping script echo "echo preping $file" >> run_all.sh + # -- load config for the current module + [ -e "config/${file#*-}" ] && cat "config/${file#*-}" >> run_all.sh + # echo "[ -e "config/${file#*-}" ] && . \"config/${file#*-}\"" >> run_all.sh + # -- check if we should run the module condition="$(sed -n 's/^#%if:\(.*\)$/if [ \1 ]; then/p' "$script")" - echo "$condition" >> run_all.sh - sed -n 's/^#%modules:\(.*\)$/modules="\1"/p' $script >> run_all.sh - echo "echo running $file -source boot/$file" >> run_all.sh + echo "$condition" >> run_all.sh + # -- remember dependent modules + sed -n 's/^#%modules:\(.*\)$/modules="\1"/p' $script >> run_all.sh + echo "echo running $file +source boot/$file +[ \"\$modules\" ] && load_modules" >> run_all.sh [ "$condition" ] && echo "fi" >> run_all.sh # and all programs it needs for files in $(cat $script | grep '%programs: ' | sed 's/^#%programs: \(.*\)$/\1/'); do 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-31 16:06:25.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-storage.sh 2007-08-02 15:47:23.000000000 +0200 @@ -146,6 +146,8 @@ local curblockdev=$1 [ -z "$curblockdev" ] && curblockdev=$blockdev + blockmajor=0 + blockminor=0 if [ -e "$root_dir/${curblockdev#/}" ]; then blockdevn="$(devnumber $root_dir/${curblockdev#/})" blockmajor="$(devmajor $blockdevn)" @@ -229,7 +231,7 @@ rootcpio=`echo / | /bin/cpio --quiet -o -H newc` rootmajor="$(echo $(( 0x${rootcpio:62:8} )) )" rootminor="$(echo $(( 0x${rootcpio:70:8} )) )" - if [ $((rootmajor)) -ne 0 ] ; then + if [ $((rootmajor)) -ne 0 ] ; then # don't check for dynamic devices rootdev="$(beautify_blockdev $(majorminor2blockdev $rootmajor $rootminor))" fi @@ -237,6 +239,14 @@ while read fstab_device fstab_mountpoint fstab_type fstab_options dummy ; do if [ "$fstab_mountpoint" = "/" ]; then [ "$rootdev" ] || rootdev="$fstab_device" + update_blockdev "$fstab_device" # get major and minor + if [ ! "$blockmajor" = 0 ]; then # we don't check dynamic devices + # let's see if the stat device is the same as the fstab device + if [ "$blockmajor" -eq "$rootmajor" -a "$blockminor" -eq "$rootminor" ]; then # if both match + rootdev="$fstab_device" # use the fstab device so the user can decide + # how to access the root device + fi + fi rootfstype="$fstab_type" rootfsopts="$fstab_options" break @@ -245,7 +255,7 @@ # no fstype found, so we will try to get it via vol_id if [ ! "$rootfstype" ]; then - eval $(/lib/udev/vol_id | grep ID_FS_TYPE) + eval $(/lib/udev/vol_id "$rootdev" | grep ID_FS_TYPE) rootfstype=$ID_FS_TYPE fi fi @@ -316,7 +326,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)" +fallback_rootdev="$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
participants (1)
-
root@Hilbert.suse.de