Attachment 879353 Details for Bug 1081396 – Proposed patch

[patch] Proposed patch

lsinitrd-no-dev-fd.patch (text/plain), 1.91 KB, created by Harald Hoyer on 2014-03-27 08:29:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Hoyer

Created: 2014-03-27 08:29:28 UTC

Size: 1.91 KB

patch

obsolete

>commit 2819d1e4445b8be42fc6cbf0827ce4a00c3e66bf
>Author: Harald Hoyer <harald@redhat.com>
>Date:   Thu Mar 27 09:27:53 2014 +0100
>
>    lsinitrd.sh: prevent < <$() construct
>    
>    Running dracut in a chroot environment, which has /dev not correctly
>    setup will result in errors like:
>    
>    /usr/bin/lsinitrd: line 164: /dev/fd/62: No such file or directory
>    cpio: Malformed number ï¿½5ï¿½OKï¿½ï¿½
>    cpio: Malformed number 5ï¿½OKï¿½ï¿½
>    cpio: Malformed number ï¿½OKï¿½ï¿½
>    
>    This is because bash wants /dev/fd/<num> for constructs like:
>    foo < <$(bar)
>
>diff --git a/lsinitrd.sh b/lsinitrd.sh
>index 70e12f8..2fbebd8 100755
>--- a/lsinitrd.sh
>+++ b/lsinitrd.sh
>@@ -160,27 +160,36 @@ case $bin in
>         ;;
> esac
> 
>-if [[ $SKIP ]]; then
>-    read -N 6 bin < <($SKIP "$image")
>-fi
> 
>-case $bin in
>-    $'\x1f\x8b'*)
>-        CAT="zcat --";;
>-    BZh*)
>-        CAT="bzcat --";;
>-    $'\x71\xc7'*|070701)
>-        CAT="cat --"
>-        ;;
>-    $'\x04\x22'*)
>-        CAT="lz4 -d -c";;
>-    *)
>-        CAT="xzcat --";
>-        if echo "test"|xz|xzcat --single-stream >/dev/null 2>&1; then
>-            CAT="xzcat --single-stream --"
>-        fi
>-        ;;
>-esac
>+CAT=$({
>+        if [[ $SKIP ]]; then
>+            $SKIP "$image"
>+        else
>+            cat "$image"
>+        fi } | {
>+        read -N 6 bin
>+        case $bin in
>+            $'\x1f\x8b'*)
>+                echo "zcat --"
>+                ;;
>+            BZh*)
>+                echo "bzcat --"
>+                ;;
>+            $'\x71\xc7'*|070701)
>+                echo "cat --"
>+                ;;
>+            $'\x04\x22'*)
>+                echo "lz4 -d -c"
>+                ;;
>+            *)
>+                if echo "test"|xz|xzcat --single-stream >/dev/null 2>&1; then
>+                    echo "xzcat --single-stream --"
>+                else
>+                    echo "xzcat --"
>+                fi
>+                ;;
>+        esac
>+    })
> 
> skipcpio()
> {

Actions: View | Diff

Attachments on bug 1081396: 879353