Attachment 298912 Details for Bug 438712 – patch

[patch] patch

0001-No-suspdev-with-NFS-root.patch (text/plain), 1.58 KB, created by Warren Togami on 2008-03-24 17:58:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Warren Togami

Created: 2008-03-24 17:58:50 UTC

Size: 1.58 KB

patch

obsolete

>From ce2b73c234fe981073d6e3d8c405f20560b2ad67 Mon Sep 17 00:00:00 2001
>From: Warren Togami <wtogami@redhat.com>
>Date: Mon, 24 Mar 2008 13:55:08 -0400
>Subject: [PATCH] No suspdev with NFS root
>
>---
> mkinitrd |   28 +++++++++++++++-------------
> 1 files changed, 15 insertions(+), 13 deletions(-)
>
>diff --git a/mkinitrd b/mkinitrd
>index d386e76..3ecea57 100755
>--- a/mkinitrd
>+++ b/mkinitrd
>@@ -1185,20 +1185,22 @@ if [ "x$PROBE" == "xyes" ]; then
>         handlelvordev $rootdev
>     fi
> 
>-    # find the first swap dev which would get used for swsusp
>-    swsuspdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; exit }}' $fstab)
>-    if [[ "$swsuspdev" =~ ^(UUID=|LABEL=) ]]; then
>-        swsuspdev=$(resolve_device_name "$swsuspdev")
>-    fi
>+    if [ "$rootfs" != "nfs" ]; then
>+        # find the first swap dev which would get used for swsusp
>+        swsuspdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; exit }}' $fstab)
>+        if [[ "$swsuspdev" =~ ^(UUID=|LABEL=) ]]; then
>+            swsuspdev=$(resolve_device_name "$swsuspdev")
>+        fi
> 
>-    suspdev=$(findblockdevinsys "$swsuspdev")
>-    suspdev=${suspdev##*/dev/}
>-    if [ -n "$suspdev" ]; then
>-        swsuspdev="$suspdev"
>-    fi
>-    unset suspdev
>-    if [ -n "$swsuspdev" ]; then
>-        handlelvordev "$swsuspdev"
>+        suspdev=$(findblockdevinsys "$swsuspdev")
>+        suspdev=${suspdev##*/dev/}
>+        if [ -n "$suspdev" ]; then
>+            swsuspdev="$suspdev"
>+        fi
>+        unset suspdev
>+        if [ -n "$swsuspdev" ]; then
>+            handlelvordev "$swsuspdev"
>+        fi
>     fi
> fi
> 
>-- 
>1.5.4.1
>

Actions: View | Diff

Attachments on bug 438712: 298912