|
Harald Hoyer |
b3dfe7 |
From 18a5011ff2465b7923db907100f0f59f01908c4e Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
b3dfe7 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
b3dfe7 |
Date: Fri, 3 Nov 2017 09:16:45 +0100
|
|
Harald Hoyer |
b3dfe7 |
Subject: [PATCH] Revert "lsinitrd.sh: dismiss "cat" error messages"
|
|
Harald Hoyer |
b3dfe7 |
|
|
Harald Hoyer |
b3dfe7 |
This reverts commit e190224345f3a8b2f9e85d84bc879dd96bf265da.
|
|
Harald Hoyer |
b3dfe7 |
---
|
|
Harald Hoyer |
b3dfe7 |
lsinitrd.sh | 4 ++--
|
|
Harald Hoyer |
b3dfe7 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
Harald Hoyer |
b3dfe7 |
|
|
Harald Hoyer |
b3dfe7 |
diff --git a/lsinitrd.sh b/lsinitrd.sh
|
|
Harald Hoyer |
b3dfe7 |
index f3f727c8..f4088453 100755
|
|
Harald Hoyer |
b3dfe7 |
--- a/lsinitrd.sh
|
|
Harald Hoyer |
b3dfe7 |
+++ b/lsinitrd.sh
|
|
Harald Hoyer |
b3dfe7 |
@@ -172,7 +172,7 @@ fi
|
|
Harald Hoyer |
b3dfe7 |
read -N 6 bin < "$image"
|
|
Harald Hoyer |
b3dfe7 |
case $bin in
|
|
Harald Hoyer |
b3dfe7 |
$'\x71\xc7'*|070701)
|
|
Harald Hoyer |
b3dfe7 |
- CAT="cat 2>/dev/null --"
|
|
Harald Hoyer |
b3dfe7 |
+ CAT="cat --"
|
|
Harald Hoyer |
b3dfe7 |
is_early=$(cpio --extract --verbose --quiet --to-stdout -- 'early_cpio' < "$image" 2>/dev/null)
|
|
Harald Hoyer |
b3dfe7 |
if [[ "$is_early" ]]; then
|
|
Harald Hoyer |
b3dfe7 |
if [[ -n "$unpackearly" ]]; then
|
|
Harald Hoyer |
b3dfe7 |
@@ -211,7 +211,7 @@ case $bin in
|
|
Harald Hoyer |
b3dfe7 |
CAT="bzcat --"
|
|
Harald Hoyer |
b3dfe7 |
;;
|
|
Harald Hoyer |
b3dfe7 |
$'\x71\xc7'*|070701)
|
|
Harald Hoyer |
b3dfe7 |
- CAT="cat 2>/dev/null --"
|
|
Harald Hoyer |
b3dfe7 |
+ CAT="cat --"
|
|
Harald Hoyer |
b3dfe7 |
;;
|
|
Harald Hoyer |
b3dfe7 |
$'\x02\x21'*)
|
|
Harald Hoyer |
b3dfe7 |
CAT="lz4 -d -c"
|
|
Harald Hoyer |
b3dfe7 |
|