Hello community,
here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Tue Aug 30 16:07:42 CEST 2011.
--------
--- mkinitrd/mkinitrd.changes 2011-08-20 14:27:46.000000000 +0200
+++ mkinitrd/mkinitrd.changes 2011-08-30 14:14:07.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Aug 30 12:12:03 UTC 2011 - co...@suse.de
+
+- Fix mkinitrd -d <rootdev> (bnc#714650).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.5BKDLg/_old 2011-08-30 16:07:07.000000000 +0200
+++ /var/tmp/diff_new_pack.5BKDLg/_new 2011-08-30 16:07:07.000000000 +0200
@@ -31,7 +31,7 @@
%endif
AutoReqProv: on
Version: 2.7.0
-Release: 27
+Release: 29
Conflicts: udev < 118
Requires: dhcpcd
PreReq: %fillup_prereq
++++++ mkinitrd.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-08-20 14:26:40.000000000 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-08-30 14:12:52.000000000 +0200
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Aug 30 12:12:03 UTC 2011 - co...@suse.de
+
+- Fix mkinitrd -d <rootdev> (bnc#714650).
+
+-------------------------------------------------------------------
Sat Aug 20 12:26:20 UTC 2011 - mma...@suse.cz
- Fix mkinitrd -D default (bnc#713103).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-storage.sh
new/mkinitrd-2.7.0/scripts/setup-storage.sh
--- old/mkinitrd-2.7.0/scripts/setup-storage.sh 2011-08-20 14:26:40.000000000
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-storage.sh 2011-08-30 14:12:52.000000000
+0200
@@ -264,11 +264,13 @@
local cpio major minor x1
local fstab_device fstab_mountpoint fstab_type fstab_options dummy
+ cpio=`echo "$mountpoint" | /bin/cpio --quiet -o -H newc`
+ major="$(echo $(( 0x${cpio:62:8} )) )"
+ minor="$(echo $(( 0x${cpio:70:8} )) )"
+
if [ -z "${!var_dev}" ] ; then
# no dev specified, get current opts from /etc/fstab and device from
stat
- cpio=`echo "$mountpoint" | /bin/cpio --quiet -o -H newc`
- major="$(echo $(( 0x${cpio:62:8} )) )"
- minor="$(echo $(( 0x${cpio:70:8} )) )"
+
# check if /usr is part of /
if test "$name" = "usr" -a "$major:$minor" = "$rootmajor:$rootminor";
then
return
@@ -299,6 +301,8 @@
update_blockdev $dev
dev="$(beautify_blockdev $dev)"
fi
+ else
+ dev="${!var_dev}"
fi
#if we don't know where the device belongs to
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
