refactor(lsinitrd): introduce cpio_extract function

In preparation to support 3cpio as alternative archive tool, move the
cpio extraction call into `cpio_extract`.

diff --git a/lsinitrd.sh b/lsinitrd.sh
index 393e892be25252c4eba78f3da13db24dcab3d8f3..d1bb67d35bc0647272c8da1e73e0b2f5906e05ff 100755 (executable)
--- a/lsinitrd.sh
+++ b/lsinitrd.sh
@@ -187,6 +187,11 @@ dracutlibdirs() {
 SQUASH_TMPFILE=""
 SQUASH_EXTRACT="$TMPDIR/squash-extract"
 
+# Takes optional pattern arguments
+cpio_extract() {
+    $CAT "$image" 2> /dev/null | cpio -id --quiet $verbose -- "$@"
+}
+
 extract_squash_img() {
     local _img _tmp
 
@@ -332,13 +337,13 @@ unpack_files() {
                     cp -rf "$SQUASH_EXTRACT/$f" "$f"
                     ;;
                 *)
-                    $CAT "$image" 2> /dev/null | cpio -id --quiet $verbose "$f"
+                    cpio_extract "$f"
                     ((ret += $?))
                     ;;
             esac
         done
     else
-        $CAT "$image" 2> /dev/null | cpio -id --quiet $verbose
+        cpio_extract
         ((ret += $?))
 
         extract_squash_img || return 0