]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
lsinitrd.sh: fixed unpack and skipcpio search
authorHarald Hoyer <harald@redhat.com>
Mon, 11 Apr 2016 13:22:11 +0000 (15:22 +0200)
committerHarald Hoyer <harald@redhat.com>
Mon, 11 Apr 2016 13:24:01 +0000 (15:24 +0200)
lsinitrd.sh

index 224b9c1af3412b5c7196d4c59fb33a6c58f5a532..b19a66a036f9f8289adb7b856ce43d94cc2f3088 100755 (executable)
@@ -40,7 +40,6 @@ usage()
 
 sorted=0
 modules=0
-unpack=0
 unset verbose
 declare -A filenames
 
@@ -184,7 +183,11 @@ case $bin in
                 echo "Early CPIO image"
                 list_files
             fi
-            SKIP="$dracutbasedir/skipcpio"
+            if [[ -d "$dracutbasedir/skipcpio" ]]; then
+                SKIP="$dracutbasedir/skipcpio/skipcpio"
+            else
+                SKIP="$dracutbasedir/skipcpio"
+            fi
             if ! [[ -x $SKIP ]]; then
                 echo
                 echo "'$SKIP' not found, cannot display remaining contents!" >&2