You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
|
|
From 7031115695bf014f39b4efc32a3e71a11daebfbc Mon Sep 17 00:00:00 2001 |
|
|
From: Harald Hoyer <harald@redhat.com> |
|
|
Date: Thu, 27 Mar 2014 09:27:53 +0100 |
|
|
Subject: [PATCH] lsinitrd.sh: prevent < <$() construct |
|
|
MIME-Version: 1.0 |
|
|
Content-Type: text/plain; charset=UTF-8 |
|
|
Content-Transfer-Encoding: 8bit |
|
|
|
|
|
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 <EFBFBD>5<EFBFBD>OK<EFBFBD><EFBFBD> |
|
|
cpio: Malformed number 5<EFBFBD>OK<EFBFBD><EFBFBD> |
|
|
cpio: Malformed number <EFBFBD>OK<EFBFBD><EFBFBD> |
|
|
|
|
|
This is because bash wants /dev/fd/<num> for constructs like: |
|
|
foo < <$(bar) |
|
|
--- |
|
|
lsinitrd.sh | 49 +++++++++++++++++++++++++++++-------------------- |
|
|
1 file changed, 29 insertions(+), 20 deletions(-) |
|
|
|
|
|
diff --git a/lsinitrd.sh b/lsinitrd.sh |
|
|
index 70e12f81..2fbebd8e 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() |
|
|
{
|
|
|
|
