Attachment 303521 Details for Bug 209473 – The patch in question.

[patch] The patch in question.

mkinitrd-bz209473.patch (text/plain), 1.60 KB, created by Peter Jones on 2008-04-23 16:02:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Jones

Created: 2008-04-23 16:02:24 UTC

Size: 1.60 KB

patch

obsolete

>diff --git a/mkinitrd b/mkinitrd
>index 6b644e4..f3512aa 100755
>--- a/mkinitrd
>+++ b/mkinitrd
>@@ -1187,23 +1187,24 @@ if [ "x$PROBE" == "xyes" ]; then
>         handlenfs $rootdev
>     else
>         # check if it's root by label
>-        if [[ "$rootdev" =~ ^(UUID=|LABEL=) ]]; then
>-            rootdev=$(resolve_device_name "$rootdev")
>+        rdev=$rootdev
>+        if [[ "$rdev" =~ ^(UUID=|LABEL=) ]]; then
>+            rdev=$(resolve_device_name "$rdev")
>         fi
>         rootopts=$(echo $rootopts | sed -e 's/^r[ow],//' -e 's/,_netdev//' -e 's/_netdev//' -e 's/,r[ow],$//' -e 's/,r[ow],/,/' -e 's/^r[ow]$/defaults/' -e 's/$/,ro/')
>-        physdev=$(findblockdevinsys "$rootdev")
>+        physdev=$(findblockdevinsys "$rdev")
>         physdev=${physdev##*/dev/}
>         if [ -n "$physdev" ]; then
>-            vecho "Found root device $physdev for $rootdev"
>+            vecho "Found root device $physdev for $rdev"
>         else
>-            physdev="$rootdev"
>+            physdev="$rdev"
>         fi
>     fi
>     if [ "$rootfs" != "nfs" ]; then
>-        if [ -n "$physdev" -a "$physdev" != "$rootdev" ]; then
>+        if [ -n "$physdev" -a "$physdev" != "$rdev" ]; then
>             handlelvordev "$physdev"
>         fi
>-        handlelvordev $rootdev
>+        handlelvordev $rdev
>     fi
> 
>     # find the first swap dev which would get used for swsusp
>@@ -1834,7 +1835,6 @@ fi
> emit "echo Creating root device."
> # mkrootdev does "echo /dev/root /sysroot ext3 defaults,ro 0 0 >/etc/fstab"
> emit "mkrootdev -t $rootfs -o $rootopts $rootdev"
>-rootdev=/dev/root
> 
> emit "echo Mounting root filesystem."
> emit "mount /sysroot"

Actions: View | Diff

Attachments on bug 209473: 303521