Hello community, here is the log from the commit of package mkinitrd checked in at Wed Jul 25 01:59:28 CEST 2007. -------- --- mkinitrd/mkinitrd.changes 2007-07-21 11:41:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-07-24 12:11:11.530528000 +0200 @@ -1,0 +2,7 @@ +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) + +------------------------------------------------------------------- Old: ---- mkinitrd.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.xD6631/_old 2007-07-25 01:59:09.000000000 +0200 +++ /var/tmp/diff_new_pack.xD6631/_new 2007-07-25 01:59:09.000000000 +0200 @@ -18,11 +18,10 @@ Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file perl Autoreqprov: on Version: 2.1 -Release: 2 +Release: 4 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz -Patch0: mkinitrd.diff %description Mkinitrd creates file system images for use as initial RAM disk @@ -52,7 +51,6 @@ %prep %setup -%patch -p1 %build gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c @@ -103,6 +101,10 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* 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 +- Add sd_mod correctly (#293045) * Sat Jul 21 2007 - coolo@suse.de - Hotfix for one-CD installations without dmraid setup installed * Tue Jul 17 2007 - hare@suse.de ++++++ 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-17 16:11:20.000000000 +0200 +++ new/mkinitrd-2.1/mkinitrd.changes 2007-07-24 12:06:57.000000000 +0200 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +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 + +------------------------------------------------------------------- +Sat Jul 21 11:41:23 CEST 2007 - coolo@suse.de + +- Hotfix for one-CD installations without dmraid setup installed + +------------------------------------------------------------------- Tue Jul 17 16:10:43 CEST 2007 - hare@suse.de - Implemented dynamic script enumeration 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-17 16:11:20.000000000 +0200 +++ new/mkinitrd-2.1/scripts/boot-kpartx.sh 2007-07-24 12:06:57.000000000 +0200 @@ -1,4 +1,5 @@ #!/bin/bash #%stage: block #%depends: dmroot +#%if: "$root_kpartx" #%programs: /sbin/kpartx /sbin/kpartx_id diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/boot-lvm2.sh new/mkinitrd-2.1/scripts/boot-lvm2.sh --- old/mkinitrd-2.1/scripts/boot-lvm2.sh 2007-07-17 16:11:20.000000000 +0200 +++ new/mkinitrd-2.1/scripts/boot-lvm2.sh 2007-07-24 12:06:57.000000000 +0200 @@ -14,7 +14,7 @@ ## ## root_lvm2=1 use LVM ## root=/dev/mapper/... use this device as Volume Group -## vg_root use this group as Volume Group +## vg_roots use this group as Volume Group ## # load the necessary module before we initialize the raid system @@ -41,6 +41,6 @@ fi # initialize remebered and parameterized devices -for vgr in $lvm $vg_root; do +for vgr in $lvm $vg_root $vg_roots; do vgchange -a y $vgr done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-dmraid.sh new/mkinitrd-2.1/scripts/setup-dmraid.sh --- old/mkinitrd-2.1/scripts/setup-dmraid.sh 2007-07-17 16:11:20.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-dmraid.sh 2007-07-24 12:06:57.000000000 +0200 @@ -4,8 +4,8 @@ #%provides: dmroot # -newbd= if [ -x /sbin/dmraid -a -x /sbin/dmsetup ] ; then + newbd= for bd in $blockdev ; do update_blockdev $bd if [ $blockdriver = device-mapper ]; then @@ -18,9 +18,11 @@ else newbd="$newbd $bd" fi + else + newbd="$newbd $bd" fi done + blockdev="$newbd" fi -blockdev="$newbd" save_var root_dmraid ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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