Attachment 305917 Details for Bug 447273 – Updated patch

[patch] Updated patch

mkinitrd.patch (text/plain), 1.91 KB, created by Jiang Jiang on 2008-05-19 09:58:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiang Jiang

Created: 2008-05-19 09:58:58 UTC

Size: 1.91 KB

patch

obsolete

>From 24cc7cc932a8f7ce3d2d13ed78e81128c69d71f1 Mon Sep 17 00:00:00 2001
>From: Jiang Jiang <gzjjgod@gmail.com>
>Date: Tue, 20 May 2008 00:02:39 +0800
>Subject: [PATCH] Fix some bash & system compatibility issues
>
>---
> mkinitrd |    8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/mkinitrd b/mkinitrd
>index f3512aa..7c3a470 100755
>--- a/mkinitrd
>+++ b/mkinitrd
>@@ -77,7 +77,7 @@ NET_LIST=""
> LD_SO_CONF=/etc/ld.so.conf
> LD_SO_CONF_D=/etc/ld.so.conf.d/
> 
>-[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd
>+[ -f /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd
> 
> CONFMODS="$MODULES"
> MODULES=""
>@@ -555,7 +555,7 @@ findstoragedriver () {
>             continue
>         fi
>         vecho "Looking for driver for device $device"
>-        if [[ "$device" =~ ^(dm-|mapper/) ]]; then
>+        if [[ "$device" =~ "^(dm-|mapper/)" ]]; then
>             majmin=$(get_numeric_dev dec "/dev/$device")
>             sysfs=$(finddevnoinsys $majmin)
>             handledm $(echo "$majmin" |cut -d : -f 1) $(echo "$majmin" |cut -d : -f 2)
>@@ -1188,7 +1188,7 @@ if [ "x$PROBE" == "xyes" ]; then
>     else
>         # check if it's root by label
>         rdev=$rootdev
>-        if [[ "$rdev" =~ ^(UUID=|LABEL=) ]]; then
>+        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/')
>@@ -1210,7 +1210,7 @@ if [ "x$PROBE" == "xyes" ]; then
>     # find the first swap dev which would get used for swsusp
>     swsuspdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; exit }}' $fstab)
>     if [ -n "$swsuspdev" ]; then
>-        if [[ "$swsuspdev" =~ ^(UUID=|LABEL=) ]]; then
>+        if [[ "$swsuspdev" =~ "^(UUID=|LABEL=)" ]]; then
>             swsuspdev=$(resolve_device_name "$swsuspdev")
>         fi
> 
>-- 
>1.5.3.6
>

Actions: View | Diff

Attachments on bug 447273: 305915 | 305917 | 308991