https://bugzilla.novell.com/show_bug.cgi?id=714650
https://bugzilla.novell.com/show_bug.cgi?id=714650#c4
--- Comment #4 from Stephan Kulow 2011-08-30 11:48:17 CEST ---
$dev, $major and $minor need to be set also in the else case of -z $rootdev
Then it works.
diff --git a/scripts/setup-storage.sh b/scripts/setup-storage.sh
index 8beaf1f..58ddf71 100644
--- a/scripts/setup-storage.sh
+++ b/scripts/setup-storage.sh
@@ -264,11 +264,13 @@ resolve_mountpoint()
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 @@ resolve_mountpoint()
update_blockdev $dev
dev="$(beautify_blockdev $dev)"
fi
+ else
+ dev="${!var_dev}"
fi
#if we don't know where the device belongs to
--
Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.