]> git.ipfire.org Git - thirdparty/dracut.git/blobdiff - dracut.sh
fix(zfcp_rules): correct shellcheck regression when parsing ccw args
[thirdparty/dracut.git] / dracut.sh
index 1d54a7d90863dda78d809268261e4ff4215a330a..3b292910f3240c87000a7af31c7eb4acdd84ed0e 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -1,9 +1,6 @@
 #!/bin/bash -p
 #
 # Generator script for a dracut initramfs
-# Tries to retain some degree of compatibility with the command line
-# of the various mkinitrd implementations out there
-#
 
 # Copyright 2005-2013 Red Hat, Inc.  All rights reserved.
 #
@@ -27,12 +24,13 @@ unset BASH_ENV
 unset GZIP
 
 # Verify bash version, current minimum is 4
-if (( BASH_VERSINFO[0] < 4 )); then
-    printf -- 'You need at least Bash 4 to use dracut, sorry.' >&2
+if ((BASH_VERSINFO[0] < 4)); then
+    printf "%s\n" "dracut[F]: dracut requires at least Bash 4." >&2
     exit 1
 fi
 
-dracut_args=( "$@" )
+dracut_args=("$@")
+# shellcheck disable=SC2155
 readonly dracut_cmd=$(readlink -f "$0")
 
 set -o pipefail
@@ -45,7 +43,7 @@ usage() {
         . "$dracutbasedir"/dracut-version.sh
     fi
 
-#                                                       80x25 linebreak here ^
+    #                                                   80x25 linebreak here ^
     cat << EOF
 Usage: $dracut_cmd [OPTION]... [<initramfs> [<kernel-version>]]
 
@@ -71,7 +69,7 @@ long_usage() {
         . "$dracutbasedir"/dracut-version.sh
     fi
 
-#                                                       80x25 linebreak here ^
+    #                                                   80x25 linebreak here ^
     cat << EOF
 Usage: $dracut_cmd [OPTION]... [<initramfs> [<kernel-version>]]
 
@@ -81,53 +79,69 @@ Creates initial ramdisk images for preloading modules
 
   --kver [VERSION]      Set kernel version to [VERSION].
   -f, --force           Overwrite existing initramfs file.
+  [OUTPUT_FILE] --rebuild
+                        Append the current arguments to those with which the
+                         input initramfs image was built. This option helps in
+                         incrementally building the initramfs for testing.
+                         If optional [OUTPUT_FILE] is not provided, the input
+                         initramfs provided to rebuild will be used as output
+                         file.
   -a, --add [LIST]      Add a space-separated list of dracut modules.
-  --rebuild         Append arguments to those of existing image and rebuild
+  --force-add [LIST]    Force to add a space-separated list of dracut modules
+                         to the default set of modules, when -H is specified.
+  -o, --omit [LIST]     Omit a space-separated list of dracut modules.
   -m, --modules [LIST]  Specify a space-separated list of dracut modules to
                          call when building the initramfs. Modules are located
                          in /usr/lib/dracut/modules.d.
-  -o, --omit [LIST]     Omit a space-separated list of dracut modules.
-  --force-add [LIST]    Force to add a space-separated list of dracut modules
-                         to the default set of modules, when -H is specified.
-  -d, --drivers [LIST]  Specify a space-separated list of kernel modules to
-                         exclusively include in the initramfs.
+                         This option forces dracut to only include the specified
+                         dracut modules.
+                         In most cases the --add option is what you want to use.
   --add-drivers [LIST]  Specify a space-separated list of kernel
                          modules to add to the initramfs.
-  --force-drivers [LIST] Specify a space-separated list of kernel
+  --force-drivers [LIST]
+                        Specify a space-separated list of kernel
                          modules to add to the initramfs and make sure they
                          are tried to be loaded via modprobe same as passing
                          rd.driver.pre=DRIVER kernel parameter.
   --omit-drivers [LIST] Specify a space-separated list of kernel
                          modules not to add to the initramfs.
+  -d, --drivers [LIST]  Specify a space-separated list of kernel modules to
+                         exclusively include in the initramfs.
   --filesystems [LIST]  Specify a space-separated list of kernel filesystem
                          modules to exclusively include in the generic
                          initramfs.
-  -k, --kmoddir [DIR]   Specify the directory, where to look for kernel
-                         modules
-  --fwdir [DIR]         Specify additional directories, where to look for
-                         firmwares, separated by :
-  --kernel-only         Only install kernel drivers and firmware files
-  --no-kernel           Do not install kernel drivers and firmware files
-  --print-cmdline       Print the kernel command line for the given disk layout
-  --early-microcode     Combine early microcode with ramdisk
-  --no-early-microcode  Do not combine early microcode with ramdisk
-  --kernel-cmdline [PARAMETERS] Specify default kernel command line parameters
-  --strip               Strip binaries in the initramfs
-  --nostrip             Do not strip binaries in the initramfs
-  --hardlink            Hardlink files in the initramfs
-  --nohardlink          Do not hardlink files in the initramfs
-  --prefix [DIR]        Prefix initramfs files with [DIR]
-  --noprefix            Do not prefix initramfs files
-  --mdadmconf           Include local /etc/mdadm.conf
-  --nomdadmconf         Do not include local /etc/mdadm.conf
-  --lvmconf             Include local /etc/lvm/lvm.conf
-  --nolvmconf           Do not include local /etc/lvm/lvm.conf
+  -k, --kmoddir [DIR]   Specify the directory where to look for kernel
+                         modules.
+  --fwdir [DIR]         Specify additional colon-separated list of directories
+                         where to look for firmware files.
+  --libdirs [LIST]      Specify a space-separated list of directories
+                         where to look for libraries.
+  --kernel-only         Only install kernel drivers and firmware files.
+  --no-kernel           Do not install kernel drivers and firmware files.
+  --print-cmdline       Print the kernel command line for the given disk layout.
+  --early-microcode     Combine early microcode with ramdisk.
+  --no-early-microcode  Do not combine early microcode with ramdisk.
+  --kernel-cmdline [PARAMETERS]
+                        Specify default kernel command line parameters.
+  --strip               Strip binaries in the initramfs.
+  --aggressive-strip     Strip more than just debug symbol and sections,
+                         for a smaller initramfs build. The --strip option must
+                         also be specified.
+  --nostrip             Do not strip binaries in the initramfs.
+  --hardlink            Hardlink files in the initramfs.
+  --nohardlink          Do not hardlink files in the initramfs.
+  --prefix [DIR]        Prefix initramfs files with [DIR].
+  --noprefix            Do not prefix initramfs files.
+  --mdadmconf           Include local /etc/mdadm.conf file.
+  --nomdadmconf         Do not include local /etc/mdadm.conf file.
+  --lvmconf             Include local /etc/lvm/lvm.conf file.
+  --nolvmconf           Do not include local /etc/lvm/lvm.conf file.
   --fscks [LIST]        Add a space-separated list of fsck helpers.
   --nofscks             Inhibit installation of any fsck helpers.
   --ro-mnt              Mount / and /usr read-only by default.
-  -h, --help            This message
-  --debug               Output debug information of the build process
-  --profile             Output profile information of the build process
+  -h, --help            This message.
+  --debug               Output debug information of the build process.
+  --profile             Output profile information of the build process.
   -L, --stdlog [0-6]    Specify logging level (to standard error)
                          0 - suppress any messages
                          1 - only fatal errors
@@ -136,8 +150,8 @@ Creates initial ramdisk images for preloading modules
                          4 - info
                          5 - debug info (here starts lots of output)
                          6 - trace info (and even more)
-  -v, --verbose         Increase verbosity level
-  -q, --quiet           Decrease verbosity level
+  -v, --verbose         Increase verbosity level.
+  -q, --quiet           Decrease verbosity level.
   -c, --conf [FILE]     Specify configuration file to use.
                          Default: /etc/dracut.conf
   --confdir [DIR]       Specify configuration directory to use *.conf files
@@ -149,49 +163,52 @@ Creates initial ramdisk images for preloading modules
                          directory instead of the system-wide installed in
                          /usr/lib/dracut/modules.d.
                          Useful when running dracut from a git checkout.
-  -H, --hostonly        Host-Only mode: Install only what is needed for
-                        booting the local host instead of a generic host.
-  -N, --no-hostonly     Disables Host-Only mode
-  --hostonly-mode <mode>
-                        Specify the hostonly mode to use. <mode> could be
-                        one of "sloppy" or "strict". "sloppy" mode is used
-                        by default.
-                        In "sloppy" hostonly mode, extra drivers and modules
-                        will be installed, so minor hardware change won't make
-                        the image unbootable (eg. changed keyboard), and the
-                        image is still portable among similar hosts.
-                        With "strict" mode enabled, anything not necessary
-                        for booting the local host in its current state will
-                        not be included, and modules may do some extra job
-                        to save more space. Minor change of hardware or
-                        environment could make the image unbootable.
-                        DO NOT use "strict" mode unless you know what you
-                        are doing.
+  -H, --hostonly        Host-only mode: Install only what is needed for
+                         booting the local host instead of a generic host.
+  -N, --no-hostonly     Disables host-only mode.
+  --hostonly-mode [MODE]
+                        Specify the host-only mode to use. [MODE] could be
+                         one of "sloppy" or "strict". "sloppy" mode is used
+                         by default.
+                         In "sloppy" host-only mode, extra drivers and modules
+                         will be installed, so minor hardware change won't make
+                         the image unbootable (e.g. changed keyboard), and the
+                         image is still portable among similar hosts.
+                         With "strict" mode enabled, anything not necessary
+                         for booting the local host in its current state will
+                         not be included, and modules may do some extra job
+                         to save more space. Minor change of hardware or
+                         environment could make the image unbootable.
+                         DO NOT use "strict" mode unless you know what you
+                         are doing.
   --hostonly-cmdline    Store kernel command line arguments needed
-                        in the initramfs
+                         in the initramfs.
   --no-hostonly-cmdline Do not store kernel command line arguments needed
-                        in the initramfs
+                         in the initramfs.
   --no-hostonly-default-device
                         Do not generate implicit host devices like root,
-                        swap, fstab, etc. Use "--mount" or "--add-device"
-                        to explicitly add devices as needed.
+                         swap, fstab, etc. Use "--mount" or "--add-device"
+                         to explicitly add devices as needed.
   --hostonly-i18n       Install only needed keyboard and font files according
-                        to the host configuration (default).
+                         to the host configuration (default).
   --no-hostonly-i18n    Install all keyboard and font files available.
   --hostonly-nics [LIST]
-                        Only enable listed NICs in the initramfs.
+                        Only enable listed NICs in the initramfs. The list can
+                         be empty, so other modules can install only the
+                         necessary network drivers.
   --persistent-policy [POLICY]
                         Use [POLICY] to address disks and partitions.
-                        POLICY can be any directory name found in /dev/disk.
-                        E.g. "by-uuid", "by-label"
+                         POLICY can be any directory name found in /dev/disk
+                         (e.g. "by-uuid", "by-label"), or "mapper" to use
+                         /dev/mapper device names (default).
   --fstab               Use /etc/fstab to determine the root device.
-  --add-fstab [FILE]    Add file to the initramfs fstab
+  --add-fstab [FILE]    Add file to the initramfs fstab.
   --mount "[DEV] [MP] [FSTYPE] [FSOPTS]"
                         Mount device [DEV] on mountpoint [MP] with filesystem
-                        [FSTYPE] and options [FSOPTS] in the initramfs
+                         [FSTYPE] and options [FSOPTS] in the initramfs.
   --mount "[MP]"        Same as above, but [DEV], [FSTYPE] and [FSOPTS] are
-                        determined by looking at the current mounts.
-  --add-device "[DEV]"  Bring up [DEV] in initramfs
+                         determined by looking at the current mounts.
+  --add-device "[DEV]"  Bring up [DEV] in initramfs.
   -i, --include [SOURCE] [TARGET]
                         Include the files in the SOURCE directory into the
                          Target directory in the final initramfs.
@@ -199,7 +216,8 @@ Creates initial ramdisk images for preloading modules
                          in the final initramfs.
   -I, --install [LIST]  Install the space separated list of files into the
                          initramfs.
-  --install-optional [LIST]  Install the space separated list of files into the
+  --install-optional [LIST]
+                        Install the space separated list of files into the
                          initramfs, if they exist.
   --gzip                Compress the generated initramfs using gzip.
                          This will be done by default, unless another
@@ -222,33 +240,48 @@ Creates initial ramdisk images for preloading modules
   --zstd                Compress the generated initramfs using Zstandard.
                          Make sure that your kernel has zstd support compiled
                          in, otherwise you will not be able to boot.
-  --compress [COMPRESSION] Compress the generated initramfs with the
+  --compress [COMPRESSION]
+                        Compress the generated initramfs with the
                          passed compression program.  Make sure your kernel
                          knows how to decompress the generated initramfs,
                          otherwise you will not be able to boot.
-  --no-compress         Do not compress the generated initramfs.  This will
+  --no-compress         Do not compress the generated initramfs. This will
                          override any other compression options.
+  --squash-compressor [COMPRESSION]
+                        Specify the compressor and compressor specific options
+                         used by mksquashfs if squash module is called when
+                         building the initramfs.
+  --enhanced-cpio       Attempt to reflink cpio file data using dracut-cpio.
   --list-modules        List all available dracut modules.
   -M, --show-modules    Print included module's name to standard output during
                          build.
-  --keep                Keep the temporary initramfs for debugging purposes
-  --printsize           Print out the module install size
-  --sshkey [SSHKEY]     Add ssh key to initramfs (use with ssh-client module)
-  --logfile [FILE]      Logfile to use (overrides configuration setting)
-  --reproducible        Create reproducible images
-  --no-reproducible     Do not create reproducible images
-  --loginstall [DIR]    Log all files installed from the host to [DIR]
+  --keep                Keep the temporary initramfs for debugging purposes.
+  --printsize           Print out the module install size.
+  --sshkey [SSHKEY]     Add SSH key to initramfs (use with ssh-client module).
+  --logfile [FILE]      Logfile to use (overrides configuration setting).
+  --reproducible        Create reproducible images.
+  --no-reproducible     Do not create reproducible images.
+  --loginstall [DIR]    Log all files installed from the host to [DIR].
   --uefi                Create an UEFI executable with the kernel cmdline and
-                        kernel combined
-  --no-uefi             Disables UEFI mode
-  --uefi-stub [FILE]    Use the UEFI stub [FILE] to create an UEFI executable
+                         kernel combined.
+  --no-uefi             Disables UEFI mode.
+  --no-machineid        Affects the default output filename of the UEFI
+                         executable, discarding the <MACHINE_ID> part.
+  --uefi-stub [FILE]    Use the UEFI stub [FILE] to create an UEFI executable.
   --uefi-splash-image [FILE]
                         Use [FILE] as a splash image when creating an UEFI
-                        executable
-  --kernel-image [FILE] location of the kernel image
+                         executable. Requires bitmap (.bmp) image format.
+  --kernel-image [FILE] Location of the kernel image.
+  --sbat [PARAMETERS]   The SBAT parameters to be added to .sbat.
+                         The string "sbat,1,SBAT Version,sbat,1,
+                         https://github.com/rhboot/shim/blob/main/SBAT.md" is
+                         already added by default.
   --regenerate-all      Regenerate all initramfs images at the default location
-                        for the kernel versions found on the system
-  --version             Display version
+                         for the kernel versions found on the system.
+  -p, --parallel        Use parallel processing if possible (currently only
+                        supported --regenerate-all)
+                        images simultaneously.
+  --version             Display version.
 
 If [LIST] has multiple arguments, then you have to put these in quotes.
 
@@ -273,7 +306,7 @@ push_host_devs() {
     local _dev
     for _dev in "$@"; do
         [[ " ${host_devs[*]} " == *" $_dev "* ]] && return
-        host_devs+=( "$_dev" )
+        host_devs+=("$_dev")
     done
 }
 
@@ -295,23 +328,22 @@ read_arg() {
     fi
 }
 
-check_conf_file()
-{
+check_conf_file() {
     if grep -H -e '^[^#]*[+]=\("[^ ]\|.*[^ ]"\)' "$@"; then
-        printf '\ndracut: WARNING: <key>+=" <values> ": <values> should have surrounding white spaces!\n' >&2
-        printf 'dracut: WARNING: This will lead to unwanted side effects! Please fix the configuration file.\n\n' >&2
+        printf '\ndracut[W]: <key>+=" <values> ": <values> should have surrounding white spaces!\n' >&2
+        printf 'dracut[W]: This will lead to unwanted side effects! Please fix the configuration file.\n\n' >&2
     fi
 }
 
-dropindirs_sort()
-{
-    local suffix=$1; shift
+dropindirs_sort() {
+    local suffix=$1
+    shift
     local -a files
     local f d
 
     for d in "$@"; do
         for i in "$d/"*"$suffix"; do
-            if [[ -e "$i" ]]; then
+            if [[ -e $i ]]; then
                 printf "%s\n" "${i##*/}"
             fi
         done
@@ -329,12 +361,11 @@ dropindirs_sort()
     }
 }
 
-rearrange_params()
-{
+rearrange_params() {
     # Workaround -i, --include taking 2 arguments
     newat=()
     for i in "$@"; do
-      if [[ $i == "-i" ]] || [[ $i == "--include" ]]; then
+        if [[ $i == "-i" ]] || [[ $i == "--include" ]]; then
             newat+=("++include") # Replace --include by ++include
         else
             newat+=("$i")
@@ -342,103 +373,111 @@ rearrange_params()
     done
     set -- "${newat[@]}" # Set new $@
 
-    TEMP=$(unset POSIXLY_CORRECT; getopt \
-        -o "a:m:o:d:I:k:c:r:L:fvqlHhMN" \
-        --long kver: \
-        --long add: \
-        --long force-add: \
-        --long add-drivers: \
-        --long force-drivers: \
-        --long omit-drivers: \
-        --long modules: \
-        --long omit: \
-        --long drivers: \
-        --long filesystems: \
-        --long install: \
-        --long install-optional: \
-        --long fwdir: \
-        --long libdirs: \
-        --long fscks: \
-        --long add-fstab: \
-        --long mount: \
-        --long device: \
-        --long add-device: \
-        --long nofscks \
-        --long ro-mnt \
-        --long kmoddir: \
-        --long conf: \
-        --long confdir: \
-        --long tmpdir: \
-        --long sysroot: \
-        --long stdlog: \
-        --long compress: \
-        --long prefix: \
-        --long rebuild: \
-        --long force \
-        --long kernel-only \
-        --long no-kernel \
-        --long print-cmdline \
-        --long kernel-cmdline: \
-        --long strip \
-        --long nostrip \
-        --long hardlink \
-        --long nohardlink \
-        --long noprefix \
-        --long mdadmconf \
-        --long nomdadmconf \
-        --long lvmconf \
-        --long nolvmconf \
-        --long debug \
-        --long profile \
-        --long sshkey: \
-        --long logfile: \
-        --long verbose \
-        --long quiet \
-        --long local \
-        --long hostonly \
-        --long host-only \
-        --long no-hostonly \
-        --long no-host-only \
-        --long hostonly-mode: \
-        --long hostonly-cmdline \
-        --long no-hostonly-cmdline \
-        --long no-hostonly-default-device \
-        --long persistent-policy: \
-        --long fstab \
-        --long help \
-        --long bzip2 \
-        --long lzma \
-        --long xz \
-        --long lzo \
-        --long lz4 \
-        --long zstd \
-        --long no-compress \
-        --long gzip \
-        --long list-modules \
-        --long show-modules \
-        --long keep \
-        --long printsize \
-        --long regenerate-all \
-        --long noimageifnotneeded \
-        --long early-microcode \
-        --long no-early-microcode \
-        --long reproducible \
-        --long no-reproducible \
-        --long loginstall: \
-        --long uefi \
-        --long no-uefi \
-        --long uefi-stub: \
-        --long uefi-splash-image: \
-        --long kernel-image: \
-        --long no-hostonly-i18n \
-        --long hostonly-i18n \
-        --long hostonly-nics: \
-        --long no-machineid \
-        --long version \
-        -- "$@")
+    TEMP=$(
+        unset POSIXLY_CORRECT
+        getopt \
+            -o "a:m:o:d:I:k:c:r:L:fvqlHhMNp" \
+            --long kver: \
+            --long add: \
+            --long force-add: \
+            --long add-drivers: \
+            --long force-drivers: \
+            --long omit-drivers: \
+            --long modules: \
+            --long omit: \
+            --long drivers: \
+            --long filesystems: \
+            --long install: \
+            --long install-optional: \
+            --long fwdir: \
+            --long libdirs: \
+            --long fscks: \
+            --long add-fstab: \
+            --long mount: \
+            --long device: \
+            --long add-device: \
+            --long nofscks \
+            --long ro-mnt \
+            --long kmoddir: \
+            --long conf: \
+            --long confdir: \
+            --long tmpdir: \
+            --long sysroot: \
+            --long stdlog: \
+            --long compress: \
+            --long squash-compressor: \
+            --long prefix: \
+            --long rebuild: \
+            --long force \
+            --long kernel-only \
+            --long no-kernel \
+            --long print-cmdline \
+            --long kernel-cmdline: \
+            --long strip \
+            --long aggressive-strip \
+            --long nostrip \
+            --long hardlink \
+            --long nohardlink \
+            --long noprefix \
+            --long mdadmconf \
+            --long nomdadmconf \
+            --long lvmconf \
+            --long nolvmconf \
+            --long debug \
+            --long profile \
+            --long sshkey: \
+            --long logfile: \
+            --long verbose \
+            --long quiet \
+            --long local \
+            --long hostonly \
+            --long host-only \
+            --long no-hostonly \
+            --long no-host-only \
+            --long hostonly-mode: \
+            --long hostonly-cmdline \
+            --long no-hostonly-cmdline \
+            --long no-hostonly-default-device \
+            --long persistent-policy: \
+            --long fstab \
+            --long help \
+            --long bzip2 \
+            --long lzma \
+            --long xz \
+            --long lzo \
+            --long lz4 \
+            --long zstd \
+            --long no-compress \
+            --long gzip \
+            --long enhanced-cpio \
+            --long list-modules \
+            --long show-modules \
+            --long keep \
+            --long printsize \
+            --long regenerate-all \
+            --long parallel \
+            --long noimageifnotneeded \
+            --long early-microcode \
+            --long no-early-microcode \
+            --long reproducible \
+            --long no-reproducible \
+            --long loginstall: \
+            --long uefi \
+            --long no-uefi \
+            --long uefi-stub: \
+            --long uefi-splash-image: \
+            --long kernel-image: \
+            --long sbat: \
+            --long no-hostonly-i18n \
+            --long hostonly-i18n \
+            --long hostonly-nics: \
+            --long no-machineid \
+            --long version \
+            -- "$@"
+    )
 
     # shellcheck disable=SC2181
-    if (( $? != 0 )); then
+    if (($? != 0)); then
         usage
         exit 1
     fi
@@ -454,20 +493,21 @@ eval set -- "$TEMP"
 # parse command line args to check if '--rebuild' option is present
 unset append_args_l
 unset rebuild_file
-while :
-do
+while :; do
     if [ "$1" == "--" ]; then
-        shift; break
+        shift
+        break
     fi
     if [ "$1" == "--rebuild" ]; then
         append_args_l="yes"
-            rebuild_file="$2"
-            if [ ! -e "$rebuild_file" ]; then
-                echo "Image file '$rebuild_file', for rebuild, does not exist!"
-                exit 1
-            fi
-            abs_rebuild_file=$(readlink -f "$rebuild_file") && rebuild_file="$abs_rebuild_file"
-        shift; continue
+        rebuild_file="$2"
+        if [ ! -e "$rebuild_file" ]; then
+            echo "Image file '$rebuild_file', for rebuild, does not exist!"
+            exit 1
+        fi
+        abs_rebuild_file=$(readlink -f "$rebuild_file") && rebuild_file="$abs_rebuild_file"
+        shift
+        continue
     fi
     shift
 done
@@ -476,7 +516,8 @@ done
 while (($# > 0)); do
     case ${1%%=*} in
         ++include)
-            shift 2;;
+            shift 2
+            ;;
         *)
             if ! [[ ${outfile+x} ]]; then
                 outfile=$1
@@ -484,7 +525,8 @@ while (($# > 0)); do
                 kernel=$1
             else
                 printf "\nUnknown arguments: %s\n\n" "$*" >&2
-                usage; exit 1;
+                usage
+                exit 1
             fi
             ;;
     esac
@@ -520,128 +562,311 @@ eval set -- "$TEMP"
 
 while :; do
     if [[ $1 != "--" ]] && [[ $1 != "--rebuild" ]]; then
-        PARMS_TO_STORE+=" $1";
+        PARMS_TO_STORE+=" $1"
     fi
     case $1 in
-        --kver)        kernel="$2";                           PARMS_TO_STORE+=" '$2'"; shift;;
-        -a|--add)      add_dracutmodules_l+=("$2");           PARMS_TO_STORE+=" '$2'"; shift;;
-        --force-add)   force_add_dracutmodules_l+=("$2");     PARMS_TO_STORE+=" '$2'"; shift;;
-        --add-drivers) add_drivers_l+=("$2");                 PARMS_TO_STORE+=" '$2'"; shift;;
-        --force-drivers) force_drivers_l+=("$2");             PARMS_TO_STORE+=" '$2'"; shift;;
-        --omit-drivers) omit_drivers_l+=("$2");               PARMS_TO_STORE+=" '$2'"; shift;;
-        -m|--modules)  dracutmodules_l+=("$2");               PARMS_TO_STORE+=" '$2'"; shift;;
-        -o|--omit)     omit_dracutmodules_l+=("$2");          PARMS_TO_STORE+=" '$2'"; shift;;
-        -d|--drivers)  drivers_l+=("$2");                     PARMS_TO_STORE+=" '$2'"; shift;;
-        --filesystems) filesystems_l+=("$2");                 PARMS_TO_STORE+=" '$2'"; shift;;
-        -I|--install)  install_items_l+=("$2");               PARMS_TO_STORE+=" '$2'"; shift;;
-        --install-optional) install_optional_items_l+=("$2"); PARMS_TO_STORE+=" '$2'"; shift;;
-        --fwdir)       fw_dir_l+=("$2");                      PARMS_TO_STORE+=" '$2'"; shift;;
-        --libdirs)     libdirs_l+=("$2");                     PARMS_TO_STORE+=" '$2'"; shift;;
-        --fscks)       fscks_l+=("$2");                       PARMS_TO_STORE+=" '$2'"; shift;;
-        --add-fstab)   add_fstab_l+=("$2");                   PARMS_TO_STORE+=" '$2'"; shift;;
-        --mount)       fstab_lines+=("$2");                   PARMS_TO_STORE+=" '$2'"; shift;;
-        --add-device|--device) add_device_l+=("$2");          PARMS_TO_STORE+=" '$2'"; shift;;
-        --kernel-cmdline) kernel_cmdline_l+=("$2");           PARMS_TO_STORE+=" '$2'"; shift;;
-        --nofscks)     nofscks_l="yes";;
-        --ro-mnt)      ro_mnt_l="yes";;
-        -k|--kmoddir)  drivers_dir_l="$2";             PARMS_TO_STORE+=" '$2'"; shift;;
-        -c|--conf)     conffile="$2";                  PARMS_TO_STORE+=" '$2'"; shift;;
-        --confdir)     confdir="$2";                   PARMS_TO_STORE+=" '$2'"; shift;;
-        --tmpdir)      tmpdir_l="$2";                  PARMS_TO_STORE+=" '$2'"; shift;;
-        -r|--sysroot)  sysroot_l="$2";                 PARMS_TO_STORE+=" '$2'"; shift;;
-        -L|--stdlog)   stdloglvl_l="$2";               PARMS_TO_STORE+=" '$2'"; shift;;
-        --compress)    compress_l="$2";                PARMS_TO_STORE+=" '$2'"; shift;;
-        --prefix)      prefix_l="$2";                  PARMS_TO_STORE+=" '$2'"; shift;;
-        --loginstall)  loginstall_l="$2";              PARMS_TO_STORE+=" '$2'"; shift;;
-        --rebuild)     if [[ $rebuild_file == "$outfile" ]]; then
-                           force=yes
-                       fi
-                       shift
-                       ;;
-        -f|--force)    force=yes;;
-        --kernel-only) kernel_only="yes"; no_kernel="no";;
-        --no-kernel)   kernel_only="no"; no_kernel="yes";;
+        --kver)
+            kernel="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        -a | --add)
+            add_dracutmodules_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --force-add)
+            force_add_dracutmodules_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --add-drivers)
+            add_drivers_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --force-drivers)
+            force_drivers_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --omit-drivers)
+            omit_drivers_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        -m | --modules)
+            dracutmodules_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        -o | --omit)
+            omit_dracutmodules_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        -d | --drivers)
+            drivers_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --filesystems)
+            filesystems_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        -I | --install)
+            install_items_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --install-optional)
+            install_optional_items_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --fwdir)
+            fw_dir_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --libdirs)
+            libdirs_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --fscks)
+            fscks_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --add-fstab)
+            add_fstab_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --mount)
+            fstab_lines+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --add-device | --device)
+            add_device_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --kernel-cmdline)
+            kernel_cmdline_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --nofscks) nofscks_l="yes" ;;
+        --ro-mnt) ro_mnt_l="yes" ;;
+        -k | --kmoddir)
+            drivers_dir_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        -c | --conf)
+            conffile="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --confdir)
+            confdir="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --tmpdir)
+            tmpdir_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        -r | --sysroot)
+            sysroot_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        -L | --stdlog)
+            stdloglvl_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --compress)
+            compress_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --squash-compressor)
+            squash_compress_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --prefix)
+            prefix_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --loginstall)
+            loginstall_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --rebuild)
+            if [[ $rebuild_file == "$outfile" ]]; then
+                force=yes
+            fi
+            shift
+            ;;
+        -f | --force) force=yes ;;
+        --kernel-only)
+            kernel_only="yes"
+            no_kernel="no"
+            ;;
+        --no-kernel)
+            kernel_only="no"
+            no_kernel="yes"
+            ;;
         --print-cmdline)
-                       print_cmdline="yes"; hostonly_l="yes"; kernel_only="yes"; no_kernel="yes";;
+            print_cmdline="yes"
+            hostonly_l="yes"
+            kernel_only="yes"
+            no_kernel="yes"
+            ;;
         --early-microcode)
-                       early_microcode_l="yes";;
+            early_microcode_l="yes"
+            ;;
         --no-early-microcode)
-                       early_microcode_l="no";;
-        --strip)       do_strip_l="yes";;
-        --nostrip)     do_strip_l="no";;
-        --hardlink)    do_hardlink_l="yes";;
-        --nohardlink)  do_hardlink_l="no";;
-        --noprefix)    prefix_l="/";;
-        --mdadmconf)   mdadmconf_l="yes";;
-        --nomdadmconf) mdadmconf_l="no";;
-        --lvmconf)     lvmconf_l="yes";;
-        --nolvmconf)   lvmconf_l="no";;
-        --debug)       debug="yes";;
-        --profile)     profile="yes";;
-        --sshkey)      sshkey="$2";                    PARMS_TO_STORE+=" '$2'"; shift;;
-        --logfile)     logfile_l="$2"; shift;;
-        -v|--verbose)  ((verbosity_mod_l++));;
-        -q|--quiet)    ((verbosity_mod_l--));;
-        -l|--local)
-                       allowlocal="yes"
-                       [[ -f "$(readlink -f "${0%/*}")/dracut-init.sh" ]] \
-                           && dracutbasedir="$(readlink -f "${0%/*}")"
-                       ;;
-        -H|--hostonly|--host-only)
-                       hostonly_l="yes" ;;
-        -N|--no-hostonly|--no-host-only)
-                       hostonly_l="no" ;;
+            early_microcode_l="no"
+            ;;
+        --strip) do_strip_l="yes" ;;
+        --aggressive-strip) aggressive_strip_l="yes" ;;
+        --nostrip) do_strip_l="no" ;;
+        --hardlink) do_hardlink_l="yes" ;;
+        --nohardlink) do_hardlink_l="no" ;;
+        --noprefix) prefix_l="/" ;;
+        --mdadmconf) mdadmconf_l="yes" ;;
+        --nomdadmconf) mdadmconf_l="no" ;;
+        --lvmconf) lvmconf_l="yes" ;;
+        --nolvmconf) lvmconf_l="no" ;;
+        --debug) debug="yes" ;;
+        --profile) profile="yes" ;;
+        --sshkey)
+            sshkey="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --logfile)
+            logfile_l="$2"
+            shift
+            ;;
+        -v | --verbose) ((verbosity_mod_l++)) ;;
+        -q | --quiet) ((verbosity_mod_l--)) ;;
+        -l | --local)
+            allowlocal="yes"
+            [[ -f "$(readlink -f "${0%/*}")/dracut-init.sh" ]] \
+                && dracutbasedir="$(readlink -f "${0%/*}")"
+            ;;
+        -H | --hostonly | --host-only)
+            hostonly_l="yes"
+            ;;
+        -N | --no-hostonly | --no-host-only)
+            hostonly_l="no"
+            ;;
         --hostonly-mode)
-                       hostonly_mode_l="$2";           PARMS_TO_STORE+=" '$2'"; shift;;
+            hostonly_mode_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
         --hostonly-cmdline)
-                       hostonly_cmdline_l="yes" ;;
+            hostonly_cmdline_l="yes"
+            ;;
         --hostonly-i18n)
-                       i18n_install_all_l="no" ;;
+            i18n_install_all_l="no"
+            ;;
         --hostonly-nics)
-                       hostonly_nics_l+=("$2");           PARMS_TO_STORE+=" '$2'"; shift;;
+            hostonly_nics_l+=("$2")
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
         --no-hostonly-i18n)
-                       i18n_install_all_l="yes" ;;
+            i18n_install_all_l="yes"
+            ;;
         --no-hostonly-cmdline)
-                       hostonly_cmdline_l="no" ;;
+            hostonly_cmdline_l="no"
+            ;;
         --no-hostonly-default-device)
-                       hostonly_default_device="no" ;;
+            hostonly_default_device="no"
+            ;;
         --persistent-policy)
-                       persistent_policy_l="$2";       PARMS_TO_STORE+=" '$2'"; shift;;
-        --fstab)       use_fstab_l="yes" ;;
-        -h|--help)     long_usage; exit 1 ;;
-        --bzip2)       compress_l="bzip2";;
-        --lzma)        compress_l="lzma";;
-        --xz)          compress_l="xz";;
-        --lzo)         compress_l="lzo";;
-        --lz4)         compress_l="lz4";;
-        --zstd)        compress_l="zstd";;
-        --no-compress) _no_compress_l="cat";;
-        --gzip)        compress_l="gzip";;
-        --list-modules) do_list="yes";;
-        -M|--show-modules)
-                       show_modules_l="yes"
-                       ;;
-        --keep)        keep="yes";;
-        --printsize)   printsize="yes";;
-        --regenerate-all) regenerate_all="yes";;
-        --noimageifnotneeded) noimageifnotneeded="yes";;
-        --reproducible) reproducible_l="yes";;
-        --no-reproducible) reproducible_l="no";;
-        --uefi)        uefi_l="yes";;
-        --no-uefi)     uefi_l="no";;
+            persistent_policy_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --fstab) use_fstab_l="yes" ;;
+        -h | --help)
+            long_usage
+            exit 0
+            ;;
+        --bzip2) compress_l="bzip2" ;;
+        --lzma) compress_l="lzma" ;;
+        --xz) compress_l="xz" ;;
+        --lzo) compress_l="lzop" ;;
+        --lz4) compress_l="lz4" ;;
+        --zstd) compress_l="zstd" ;;
+        --no-compress) _no_compress_l="cat" ;;
+        --gzip) compress_l="gzip" ;;
+        --enhanced-cpio) enhanced_cpio_l="yes" ;;
+        --list-modules) do_list="yes" ;;
+        -M | --show-modules)
+            show_modules_l="yes"
+            ;;
+        --keep) keep="yes" ;;
+        --printsize) printsize="yes" ;;
+        --regenerate-all) regenerate_all_l="yes" ;;
+        -p | --parallel) parallel_l="yes" ;;
+        --noimageifnotneeded) noimageifnotneeded="yes" ;;
+        --reproducible) reproducible_l="yes" ;;
+        --no-reproducible) reproducible_l="no" ;;
+        --uefi) uefi_l="yes" ;;
+        --no-uefi) uefi_l="no" ;;
         --uefi-stub)
-                       uefi_stub_l="$2";               PARMS_TO_STORE+=" '$2'"; shift;;
+            uefi_stub_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
         --uefi-splash-image)
-                       uefi_splash_image_l="$2";       PARMS_TO_STORE+=" '$2'"; shift;;
+            uefi_splash_image_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
         --kernel-image)
-                       kernel_image_l="$2";            PARMS_TO_STORE+=" '$2'"; shift;;
+            kernel_image_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
+        --sbat)
+            sbat_l="$2"
+            PARMS_TO_STORE+=" '$2'"
+            shift
+            ;;
         --no-machineid)
-                       machine_id_l="no";;
-        --version)     long_version; exit 1 ;;
-        --) shift; break;;
+            machine_id_l="no"
+            ;;
+        --version)
+            long_version
+            exit 0
+            ;;
+        --)
+            shift
+            break
+            ;;
 
-        *)  # should not even reach this point
-            printf "\n!Unknown option: '%s'\n\n" "$1" >&2; usage; exit 1;;
+        *) # should not even reach this point
+            printf "\n!Unknown option: '%s'\n\n" "$1" >&2
+            usage
+            exit 1
+            ;;
     esac
     shift
 done
@@ -661,37 +886,6 @@ done
 
 [[ $sysroot_l ]] && dracutsysrootdir="$sysroot_l"
 
-if [[ $regenerate_all == "yes" ]]; then
-    ret=0
-    if [[ $kernel ]]; then
-        printf -- "--regenerate-all cannot be called with a kernel version\n" >&2
-        exit 1
-    fi
-
-    if [[ $outfile ]]; then
-        printf -- "--regenerate-all cannot be called with a image file\n" >&2
-        exit 1
-    fi
-
-    ((len=${#dracut_args[@]}))
-    for ((i=0; i < len; i++)); do
-        [[ ${dracut_args[$i]} == "--regenerate-all" ]] && \
-            unset "dracut_args[$i]"
-    done
-
-    cd "$dracutsysrootdir"/lib/modules || exit 1
-    for i in *; do
-        [[ -f $i/modules.dep ]] || [[ -f $i/modules.dep.bin ]] || continue
-        "$dracut_cmd" --kver="$i" "${dracut_args[@]}"
-        ((ret+=$?))
-    done
-    exit "$ret"
-fi
-
-if ! [[ $kernel ]]; then
-    kernel=$(uname -r)
-fi
-
 export LC_ALL=C
 export LANG=C
 unset LC_MESSAGES
@@ -703,12 +897,12 @@ unset GREP_OPTIONS
 export DRACUT_LOG_LEVEL=warning
 [[ $debug ]] && {
     export DRACUT_LOG_LEVEL=debug
-    export PS4='${BASH_SOURCE}@${LINENO}(${FUNCNAME[0]}): ';
+    export PS4='${BASH_SOURCE}@${LINENO}(${FUNCNAME[0]-}): '
     set -x
 }
 
 [[ $profile ]] && {
-    export PS4='+ $(date "+%s.%N") ${BASH_SOURCE}@${LINENO}: ';
+    export PS4='+ $(date "+%s.%N") ${BASH_SOURCE}@${LINENO}: '
     set -x
     debug=yes
 }
@@ -716,20 +910,26 @@ export DRACUT_LOG_LEVEL=warning
 [[ $dracutbasedir ]] || dracutbasedir="$dracutsysrootdir"/usr/lib/dracut
 
 # if we were not passed a config file, try the default one
-if [[ ! -f $conffile ]]; then
+if [[ -z $conffile ]]; then
     if [[ $allowlocal ]]; then
         conffile="$dracutbasedir/dracut.conf"
     else
         conffile="$dracutsysrootdir/etc/dracut.conf"
     fi
+elif [[ ! -e $conffile ]]; then
+    printf "%s\n" "dracut[F]: Configuration file '$conffile' not found." >&2
+    exit 1
 fi
 
-if [[ ! -d $confdir ]]; then
+if [[ -z $confdir ]]; then
     if [[ $allowlocal ]]; then
         confdir="$dracutbasedir/dracut.conf.d"
     else
         confdir="$dracutsysrootdir/etc/dracut.conf.d"
     fi
+elif [[ ! -d $confdir ]]; then
+    printf "%s\n" "dracut[F]: Configuration directory '$confdir' not found." >&2
+    exit 1
 fi
 
 # source our config file
@@ -746,6 +946,63 @@ for f in $(dropindirs_sort ".conf" "$confdir" "$dracutbasedir/dracut.conf.d"); d
     [[ -e $f ]] && . "$f"
 done
 
+# regenerate_all shouldn't be set in conf files
+regenerate_all=$regenerate_all_l
+if [[ $parallel_l == "yes" ]]; then
+    parallel=yes
+fi
+
+if [[ $regenerate_all == "yes" ]]; then
+    ret=0
+    if [[ $kernel ]]; then
+        printf "%s\n" "dracut[F]: --regenerate-all cannot be called with a kernel version." >&2
+        exit 1
+    fi
+
+    if [[ $outfile ]]; then
+        printf "%s\n" "dracut[F]: --regenerate-all cannot be called with an image file." >&2
+        exit 1
+    fi
+
+    ((len = ${#dracut_args[@]}))
+    for ((i = 0; i < len; i++)); do
+        case ${dracut_args[$i]} in
+            --regenerate-all | --parallel)
+                # shellcheck disable=SC2184
+                unset dracut_args["$i"]
+                ;;
+        esac
+    done
+
+    cd "$dracutsysrootdir"/lib/modules || exit 1
+    if [[ $parallel != "yes" ]]; then
+        for i in *; do
+            [[ -f $i/modules.dep ]] || [[ -f $i/modules.dep.bin ]] || continue
+            "$dracut_cmd" --kver="$i" "${dracut_args[@]}"
+            ((ret += $?))
+        done
+    else
+        for i in *; do
+            [[ -f $i/modules.dep ]] || [[ -f $i/modules.dep.bin ]] || continue
+            "$dracut_cmd" --kver="$i" "${dracut_args[@]}" &
+        done
+        while true; do
+            wait -n
+            wst=$?
+            if [[ $wst == 127 ]]; then
+                break
+            else
+                ((ret += wst))
+            fi
+        done
+    fi
+    exit "$ret"
+fi
+
+if ! [[ $kernel ]]; then
+    kernel=$(uname -r)
+fi
+
 DRACUT_PATH=${DRACUT_PATH:-/sbin /bin /usr/sbin /usr/bin}
 
 for i in $DRACUT_PATH; do
@@ -753,31 +1010,31 @@ for i in $DRACUT_PATH; do
     if [ -L "$dracutsysrootdir$i" ]; then
         rl=$(readlink -f "$dracutsysrootdir$i")
     fi
-    rl="${rl#$dracutsysrootdir}"
-    if [[ "$NPATH" != *:$rl* ]] ; then
+    rl="${rl#"$dracutsysrootdir"}"
+    if [[ $NPATH != *:$rl* ]]; then
         NPATH+=":$rl"
     fi
 done
-[[ -z "$dracutsysrootdir" ]] && export PATH="${NPATH#:}"
+[[ -z $dracutsysrootdir ]] && export PATH="${NPATH#:}"
 unset NPATH
 
 export SYSTEMCTL=${SYSTEMCTL:-systemctl}
 
 # these options add to the stuff in the config file
-(( ${#add_dracutmodules_l[@]} )) && add_dracutmodules+=" ${add_dracutmodules_l[*]} "
-(( ${#force_add_dracutmodules_l[@]} )) && force_add_dracutmodules+=" ${force_add_dracutmodules_l[*]} "
-(( ${#fscks_l[@]} )) && fscks+=" ${fscks_l[*]} "
-(( ${#add_fstab_l[@]} )) && add_fstab+=" ${add_fstab_l[*]} "
-(( ${#install_items_l[@]} )) && install_items+=" ${install_items_l[*]} "
-(( ${#install_optional_items_l[@]} )) && install_optional_items+=" ${install_optional_items_l[*]} "
-(( ${#hostonly_nics_l[@]} )) && hostonly_nics+=" ${hostonly_nics_l[*]} "
+((${#add_dracutmodules_l[@]})) && add_dracutmodules+=" ${add_dracutmodules_l[*]} "
+((${#omit_dracutmodules_l[@]})) && omit_dracutmodules+=" ${omit_dracutmodules_l[*]} "
+((${#force_add_dracutmodules_l[@]})) && force_add_dracutmodules+=" ${force_add_dracutmodules_l[*]} "
+((${#fscks_l[@]})) && fscks+=" ${fscks_l[*]} "
+((${#add_fstab_l[@]})) && add_fstab+=" ${add_fstab_l[*]} "
+((${#install_items_l[@]})) && install_items+=" ${install_items_l[*]} "
+((${#install_optional_items_l[@]})) && install_optional_items+=" ${install_optional_items_l[*]} "
+((${#hostonly_nics_l[@]})) && hostonly_nics+=" ${hostonly_nics_l[*]} "
 
 # these options override the stuff in the config file
-(( ${#dracutmodules_l[@]} )) && dracutmodules="${dracutmodules_l[*]}"
-(( ${#omit_dracutmodules_l[@]} )) && omit_dracutmodules="${omit_dracutmodules_l[*]}"
-(( ${#filesystems_l[@]} )) && filesystems="${filesystems_l[*]}"
-(( ${#fw_dir_l[@]} )) && fw_dir="${fw_dir_l[*]}"
-(( ${#libdirs_l[@]} ))&& libdirs="${libdirs_l[*]}"
+((${#dracutmodules_l[@]})) && dracutmodules="${dracutmodules_l[*]}"
+((${#filesystems_l[@]})) && filesystems="${filesystems_l[*]}"
+((${#fw_dir_l[@]})) && fw_dir="${fw_dir_l[*]}"
+((${#libdirs_l[@]})) && libdirs="${libdirs_l[*]}"
 
 [[ $stdloglvl_l ]] && stdloglvl=$stdloglvl_l
 [[ ! $stdloglvl ]] && stdloglvl=4
@@ -786,16 +1043,18 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
 ((stdloglvl < 0)) && stdloglvl=0
 
 [[ $drivers_dir_l ]] && drivers_dir=$drivers_dir_l
+drivers_dir="${drivers_dir%"${drivers_dir##*[!/]}"}"
 [[ $do_strip_l ]] && do_strip=$do_strip_l
 [[ $do_strip ]] || do_strip=yes
+[[ $aggressive_strip_l ]] && aggressive_strip=$aggressive_strip_l
 [[ $do_hardlink_l ]] && do_hardlink=$do_hardlink_l
 [[ $do_hardlink ]] || do_hardlink=yes
 [[ $prefix_l ]] && prefix=$prefix_l
-[[ $prefix = "/" ]] && unset prefix
+[[ $prefix == "/" ]] && unset prefix
 [[ $hostonly_l ]] && hostonly=$hostonly_l
 [[ $hostonly_cmdline_l ]] && hostonly_cmdline=$hostonly_cmdline_l
 [[ $hostonly_mode_l ]] && hostonly_mode=$hostonly_mode_l
-[[ "$hostonly" == "yes" ]] && ! [[ $hostonly_cmdline ]] && hostonly_cmdline="yes"
+[[ $hostonly == "yes" ]] && ! [[ $hostonly_cmdline ]] && hostonly_cmdline="yes"
 # shellcheck disable=SC2034
 [[ $i18n_install_all_l ]] && i18n_install_all=$i18n_install_all_l
 # shellcheck disable=SC2034
@@ -804,20 +1063,25 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
 [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
 [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
 [[ $dracutbasedir ]] || dracutbasedir="$dracutsysrootdir"/usr/lib/dracut
-[[ $fw_dir ]] || fw_dir="$dracutsysrootdir/lib/firmware/updates:$dracutsysrootdir/lib/firmware:$dracutsysrootdir/lib/firmware/$kernel"
+[[ $fw_dir ]] || {
+    fw_path_para=$(< /sys/module/firmware_class/parameters/path)
+    fw_dir="${fw_path_para:+$dracutsysrootdir$fw_path_para:}$dracutsysrootdir/lib/firmware/updates/$kernel:$dracutsysrootdir/lib/firmware/updates:$dracutsysrootdir/lib/firmware/$kernel:$dracutsysrootdir/lib/firmware"
+}
 [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
 [[ $tmpdir ]] || tmpdir="$TMPDIR"
 [[ $tmpdir ]] || tmpdir="$dracutsysrootdir"/var/tmp
 [[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
 [[ $compress_l ]] && compress=$compress_l
+[[ $squash_compress_l ]] && squash_compress=$squash_compress_l
+[[ $enhanced_cpio_l ]] && enhanced_cpio=$enhanced_cpio_l
 [[ $show_modules_l ]] && show_modules=$show_modules_l
 [[ $nofscks_l ]] && nofscks="yes"
 [[ $ro_mnt_l ]] && ro_mnt="yes"
 [[ $early_microcode_l ]] && early_microcode=$early_microcode_l
 [[ $early_microcode ]] || early_microcode=yes
 [[ $early_microcode_image_dir ]] || early_microcode_image_dir=('/boot')
-[[ $early_microcode_image_name ]] || \
-    early_microcode_image_name=('intel-uc.img' 'intel-ucode.img' 'amd-uc.img' 'amd-ucode.img' 'early_ucode.cpio' 'microcode.cpio')
+[[ $early_microcode_image_name ]] \
+    || early_microcode_image_name=('intel-uc.img' 'intel-ucode.img' 'amd-uc.img' 'amd-ucode.img' 'early_ucode.cpio' 'microcode.cpio')
 [[ $logfile_l ]] && logfile="$logfile_l"
 [[ $reproducible_l ]] && reproducible="$reproducible_l"
 [[ $loginstall_l ]] && loginstall="$loginstall_l"
@@ -825,35 +1089,44 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
 [[ $uefi_stub_l ]] && uefi_stub="$uefi_stub_l"
 [[ $uefi_splash_image_l ]] && uefi_splash_image="$uefi_splash_image_l"
 [[ $kernel_image_l ]] && kernel_image="$kernel_image_l"
+[[ $sbat_l ]] && sbat="$sbat_l"
 [[ $machine_id_l ]] && machine_id="$machine_id_l"
 
 if ! [[ $outfile ]]; then
     if [[ $machine_id != "no" ]]; then
-        [[ -f "$dracutsysrootdir"/etc/machine-id ]] && read -r MACHINE_ID < "$dracutsysrootdir"/etc/machine-id
+        if [[ -d "$dracutsysrootdir"/efi/Default ]] \
+            || [[ -d "$dracutsysrootdir"/boot/Default ]] \
+            || [[ -d "$dracutsysrootdir"/boot/efi/Default ]]; then
+            MACHINE_ID="Default"
+        elif [[ -s "$dracutsysrootdir"/etc/machine-id ]]; then
+            read -r MACHINE_ID < "$dracutsysrootdir"/etc/machine-id
+            [[ $MACHINE_ID == "uninitialized" ]] && MACHINE_ID="Default"
+        else
+            MACHINE_ID="Default"
+        fi
     fi
 
     if [[ $uefi == "yes" ]]; then
-        # shellcheck disable=SC2154
-        if [[ -n "$uefi_secureboot_key" && -z "$uefi_secureboot_cert" ]] || [[ -z $uefi_secureboot_key && -n $uefi_secureboot_cert ]]; then
-            dfatal "Need 'uefi_secureboot_key' and 'uefi_secureboot_cert' both to be set."
+        if [[ -n $uefi_secureboot_key && -z $uefi_secureboot_cert ]] || [[ -z $uefi_secureboot_key && -n $uefi_secureboot_cert ]]; then
+            printf "%s\n" "dracut[F]: Need 'uefi_secureboot_key' and 'uefi_secureboot_cert' both to be set." >&2
             exit 1
         fi
 
-        if [[ -n "$uefi_secureboot_key" && -n "$uefi_secureboot_cert" ]] && ! command -v sbsign &>/dev/null; then
-            dfatal "Need 'sbsign' to create a signed UEFI executable"
+        if [[ -n $uefi_secureboot_key && -n $uefi_secureboot_cert ]] && ! command -v sbsign &> /dev/null; then
+            printf "%s\n" "dracut[F]: Need 'sbsign' to create a signed UEFI executable." >&2
             exit 1
         fi
 
         BUILD_ID=$(cat "$dracutsysrootdir"/etc/os-release "$dracutsysrootdir"/usr/lib/os-release \
-                       | while read -r line || [[ $line ]]; do \
-                       [[ $line =~ BUILD_ID\=* ]] && eval "$line" && echo "$BUILD_ID" && break; \
-                   done)
+            | while read -r line || [[ $line ]]; do
+                [[ $line =~ BUILD_ID\=* ]] && eval "$line" && echo "$BUILD_ID" && break
+            done)
         if [[ -z $dracutsysrootdir ]]; then
             if [[ -d /efi ]] && mountpoint -q /efi; then
                 efidir=/efi/EFI
             else
                 efidir=/boot/EFI
-                if [[ -d $dracutsysrootdir/boot/efi/EFI ]]; then
+                if [[ -d /boot/efi/EFI ]]; then
                     efidir=/boot/efi/EFI
                 fi
             fi
@@ -866,12 +1139,32 @@ if ! [[ $outfile ]]; then
         mkdir -p "$dracutsysrootdir$efidir/Linux"
         outfile="$dracutsysrootdir$efidir/Linux/linux-$kernel${MACHINE_ID:+-${MACHINE_ID}}${BUILD_ID:+-${BUILD_ID}}.efi"
     else
-        if [[ -e $dracutsysrootdir/boot/vmlinuz-$kernel ]]; then
-            outfile="/boot/initramfs-$kernel.img"
-        elif [[ $MACHINE_ID ]] && { [[ -d $dracutsysrootdir/boot/${MACHINE_ID} ]] || [[ -L $dracutsysrootdir/boot/${MACHINE_ID} ]] ;}; then
-            outfile="$dracutsysrootdir/boot/${MACHINE_ID}/$kernel/initrd"
+        if [[ -d "$dracutsysrootdir"/efi/loader/entries || -L "$dracutsysrootdir"/efi/loader/entries ]] \
+            && [[ $MACHINE_ID ]] \
+            && [[ -d "$dracutsysrootdir"/efi/${MACHINE_ID} || -L "$dracutsysrootdir"/efi/${MACHINE_ID} ]]; then
+            outfile="$dracutsysrootdir/efi/${MACHINE_ID}/${kernel}/initrd"
+        elif [[ -d "$dracutsysrootdir"/boot/loader/entries || -L "$dracutsysrootdir"/boot/loader/entries ]] \
+            && [[ $MACHINE_ID ]] \
+            && [[ -d "$dracutsysrootdir"/boot/${MACHINE_ID} || -L "$dracutsysrootdir"/boot/${MACHINE_ID} ]]; then
+            outfile="$dracutsysrootdir/boot/${MACHINE_ID}/${kernel}/initrd"
+        elif [[ -d "$dracutsysrootdir"/boot/efi/loader/entries || -L "$dracutsysrootdir"/boot/efi/loader/entries ]] \
+            && [[ $MACHINE_ID ]] \
+            && [[ -d "$dracutsysrootdir"/boot/efi/${MACHINE_ID} || -L "$dracutsysrootdir"/boot/efi/${MACHINE_ID} ]]; then
+            outfile="$dracutsysrootdir/boot/efi/${MACHINE_ID}/${kernel}/initrd"
+        elif [[ -f "$dracutsysrootdir"/lib/modules/${kernel}/initrd ]]; then
+            outfile="$dracutsysrootdir/lib/modules/${kernel}/initrd"
+        elif [[ -e $dracutsysrootdir/boot/vmlinuz-${kernel} ]]; then
+            outfile="$dracutsysrootdir/boot/initramfs-${kernel}.img"
+        elif [[ -z $dracutsysrootdir ]] \
+            && [[ $MACHINE_ID ]] \
+            && mountpoint -q /efi; then
+            outfile="/efi/${MACHINE_ID}/${kernel}/initrd"
+        elif [[ -z $dracutsysrootdir ]] \
+            && [[ $MACHINE_ID ]] \
+            && mountpoint -q /boot/efi; then
+            outfile="/boot/efi/${MACHINE_ID}/${kernel}/initrd"
         else
-            outfile="$dracutsysrootdir/boot/initramfs-$kernel.img"
+            outfile="$dracutsysrootdir/boot/initramfs-${kernel}.img"
         fi
     fi
 fi
@@ -881,10 +1174,10 @@ export DRACUT_FIRMWARE_PATH=${fw_dir// /:}
 fw_dir=${fw_dir//:/ }
 
 # check for logfile and try to create one if it doesn't exist
-if [[ -n "$logfile" ]]; then
-    if [[ ! -f "$logfile" ]]; then
+if [[ -n $logfile ]]; then
+    if [[ ! -f $logfile ]]; then
         if touch "$logfile"; then
-            printf "%s\n" "dracut: touch $logfile failed." >&2
+            printf "%s\n" "dracut[W]: touch $logfile failed." >&2
         fi
     fi
 fi
@@ -901,107 +1194,73 @@ DRACUT_COMPRESS_ZSTD=${DRACUT_COMPRESS_ZSTD:-zstd}
 DRACUT_COMPRESS_LZ4=${DRACUT_COMPRESS_LZ4:-lz4}
 DRACUT_COMPRESS_CAT=${DRACUT_COMPRESS_CAT:-cat}
 
-if [[ $_no_compress_l = "$DRACUT_COMPRESS_CAT" ]]; then
+if [[ $_no_compress_l == "$DRACUT_COMPRESS_CAT" ]]; then
     compress="$DRACUT_COMPRESS_CAT"
 fi
 
-if ! [[ $compress ]]; then
-    # check all known compressors, if none specified
-    for i in $DRACUT_COMPRESS_PIGZ $DRACUT_COMPRESS_GZIP $DRACUT_COMPRESS_LZ4 $DRACUT_COMPRESS_LZOP $ $DRACUT_COMPRESS_ZSTD $DRACUT_COMPRESS_LZMA $DRACUT_COMPRESS_XZ $DRACUT_COMPRESS_LBZIP2 $OMPRESS_BZIP2 $DRACUT_COMPRESS_CAT; do
-        command -v "$i" &>/dev/null || continue
-        compress="$i"
-        break
-    done
-    if [[ $compress = cat ]]; then
-            printf "%s\n" "dracut: no compression tool available. Initramfs image is going to be big." >&2
-    fi
-fi
-
-# choose the right arguments for the compressor
-case $compress in
-    bzip2|lbzip2)
-        if [[ "$compress" =  lbzip2 ]] || command -v "$DRACUT_COMPRESS_LBZIP2" &>/dev/null; then
-            compress="$DRACUT_COMPRESS_LBZIP2 -9"
-        else
-            compress="$DRACUT_COMPRESS_BZIP2 -9"
-        fi
-        ;;
-    lzma)
-        compress="$DRACUT_COMPRESS_LZMA -9 -T0"
-        ;;
-    xz)
-        compress="$DRACUT_COMPRESS_XZ --check=crc32 --lzma2=dict=1MiB -T0"
-        ;;
-    gzip|pigz)
-        if [[ "$compress" = pigz ]] || command -v "$DRACUT_COMPRESS_PIGZ" &>/dev/null; then
-            compress="$DRACUT_COMPRESS_PIGZ -9 -n -T -R"
-        elif command -v gzip &>/dev/null && $DRACUT_COMPRESS_GZIP --help 2>&1 | grep -q rsyncable; then
-            compress="$DRACUT_COMPRESS_GZIP -n -9 --rsyncable"
-        else
-            compress="$DRACUT_COMPRESS_GZIP -n -9"
-        fi
-        ;;
-    lzo|lzop)
-        compress="$DRACUT_COMPRESS_LZOP -9"
-        ;;
-    lz4)
-        compress="$DRACUT_COMPRESS_LZ4 -l -9"
-        ;;
-    zstd)
-       compress="$DRACUT_COMPRESS_ZSTD -15 -q -T0"
-       ;;
-esac
-
-[[ $hostonly = yes ]] && hostonly="-h"
+[[ $hostonly == yes ]] && hostonly="-h"
 [[ $hostonly != "-h" ]] && unset hostonly
 
 case $hostonly_mode in
     '')
-        [[ $hostonly ]] && hostonly_mode="sloppy" ;;
-    sloppy|strict)
+        [[ $hostonly ]] && hostonly_mode="sloppy"
+        ;;
+    sloppy | strict)
         if [[ ! $hostonly ]]; then
             unset hostonly_mode
         fi
         ;;
     *)
-        printf "%s\n" "dracut: Invalid hostonly mode '$hostonly_mode'." >&2
+        printf "%s\n" "dracut[F]: Invalid hostonly mode '$hostonly_mode'." >&2
         exit 1
+        ;;
 esac
 
 [[ $reproducible == yes ]] && DRACUT_REPRODUCIBLE=1
 
-case "${drivers_dir}" in
-    ''|*lib/modules/${kernel}|*lib/modules/${kernel}/) ;;
-    *)
-        [[ "$DRACUT_KMODDIR_OVERRIDE" ]] || {
-            printf "%s\n" "dracut: -k/--kmoddir path must contain \"lib/modules\" as a parent of your kernel module directory,"
-            printf "%s\n" "dracut: or modules may not be placed in the correct location inside the initramfs."
-            printf "%s\n" "dracut: was given: ${drivers_dir}"
-            printf "%s\n" "dracut: expected: $(dirname "${drivers_dir}")/lib/modules/${kernel}"
-            printf "%s\n" "dracut: Please move your modules into the correct directory structure and pass the new location,"
-            printf "%s\n" "dracut: or set DRACUT_KMODDIR_OVERRIDE=1 to ignore this check."
-            exit 1
-        }
-        ;;
-esac
+if [[ -z $DRACUT_KMODDIR_OVERRIDE && -n $drivers_dir ]]; then
+    drivers_basename="${drivers_dir##*/}"
+    if [[ -n $drivers_basename && $drivers_basename != "$kernel" ]]; then
+        printf "%s\n" "dracut[F]: The provided directory where to look for kernel modules ($drivers_basename)" >&2
+        printf "%s\n" "dracut[F]: does not match the kernel version set for the initramfs ($kernel)." >&2
+        printf "%s\n" "dracut[F]: Set DRACUT_KMODDIR_OVERRIDE=1 to ignore this check." >&2
+        exit 1
+    fi
+    drivers_dirname="${drivers_dir%/*}/"
+    if [[ ! $drivers_dirname =~ .*/lib/modules/$ ]]; then
+        printf "%s\n" "dracut[F]: drivers_dir path ${drivers_dir_l:+"set via -k/--kmoddir "}must contain \"/lib/modules/\" as a parent of your kernel module directory," >&2
+        printf "%s\n" "dracut[F]: or modules may not be placed in the correct location inside the initramfs." >&2
+        printf "%s\n" "dracut[F]: was given: ${drivers_dir}" >&2
+        printf "%s\n" "dracut[F]: expected: ${drivers_dirname}lib/modules/${kernel}" >&2
+        printf "%s\n" "dracut[F]: Please move your modules into the correct directory structure and pass the new location," >&2
+        printf "%s\n" "dracut[F]: or set DRACUT_KMODDIR_OVERRIDE=1 to ignore this check." >&2
+        exit 1
+    fi
+fi
 
+# shellcheck disable=SC2155
 readonly TMPDIR="$(realpath -e "$tmpdir")"
 [ -d "$TMPDIR" ] || {
-    printf "%s\n" "dracut: Invalid tmpdir '$tmpdir'." >&2
+    printf "%s\n" "dracut[F]: Invalid tmpdir '$tmpdir'." >&2
     exit 1
 }
 
 if findmnt --raw -n --target "$tmpdir" --output=options | grep -q noexec; then
-    [[ $debug == yes ]] && printf "%s\n" "dracut: Tmpdir '$tmpdir' is mounted with 'noexec'."
+    [[ $debug == yes ]] && printf "%s\n" "dracut[D]: Tmpdir '$tmpdir' is mounted with 'noexec'." >&2
     noexec=1
 fi
 
+# shellcheck disable=SC2155
 readonly DRACUT_TMPDIR="$(mktemp -p "$TMPDIR/" -d -t dracut.XXXXXX)"
 [ -d "$DRACUT_TMPDIR" ] || {
-    printf "%s\n" "dracut: mktemp -p '$TMPDIR/' -d -t dracut.XXXXXX failed." >&2
+    printf "%s\n" "dracut[F]: mktemp -p '$TMPDIR/' -d -t dracut.XXXXXX failed." >&2
     exit 1
 }
 
+# Cache file used to optimize get_maj_min()
+declare -x -r get_maj_min_cache_file="${DRACUT_TMPDIR}/majmin_cache"
+: > "$get_maj_min_cache_file"
+
 # clean up after ourselves no matter how we die.
 trap '
     ret=$?;
@@ -1018,8 +1277,7 @@ trap 'exit 1;' SIGINT
 readonly initdir="${DRACUT_TMPDIR}/initramfs"
 mkdir -p "$initdir"
 
-# shellcheck disable=SC2154
-if [[ $early_microcode = yes ]] || { [[ $acpi_override = yes ]] && [[ -d $acpi_table_dir ]] ;}; then
+if [[ $early_microcode == yes ]] || { [[ $acpi_override == yes ]] && [[ -d $acpi_table_dir ]]; }; then
     readonly early_cpio_dir="${DRACUT_TMPDIR}/earlycpio"
     mkdir "$early_cpio_dir"
 fi
@@ -1038,26 +1296,52 @@ if [[ -f $dracutbasedir/dracut-version.sh ]]; then
     . "$dracutbasedir"/dracut-version.sh
 fi
 
+if systemd-detect-virt -c &> /dev/null; then
+    export DRACUT_NO_MKNOD=1 DRACUT_NO_XATTR=1
+    if [[ $hostonly ]]; then
+        printf "%s\n" "dracut[W]: Running in hostonly mode in a container!" >&2
+    fi
+fi
+
 if [[ -f $dracutbasedir/dracut-init.sh ]]; then
     # shellcheck source=./dracut-init.sh
     . "$dracutbasedir"/dracut-init.sh
 else
-    printf "%s\n" "dracut: Cannot find $dracutbasedir/dracut-init.sh." >&2
-    printf "%s\n" "dracut: Are you running from a git checkout?" >&2
-    printf "%s\n" "dracut: Try passing -l as an argument to $dracut_cmd" >&2
+    printf "%s\n" "dracut[F]: Cannot find $dracutbasedir/dracut-init.sh." >&2
+    printf "%s\n" "dracut[F]: Are you running from a git checkout?" >&2
+    printf "%s\n" "dracut[F]: Try passing -l as an argument to $dracut_cmd" >&2
     exit 1
 fi
 
-# shellcheck disable=SC2154
+if [[ $persistent_policy == "mapper" ]]; then
+    unset persistent_policy
+elif [[ -n $persistent_policy && ! -d "/dev/disk/${persistent_policy}" ]]; then
+    dwarn "Invalid persistent policy, your system does not have a /dev/disk/${persistent_policy} directory."
+    unset persistent_policy
+fi
+
+if [[ $enhanced_cpio == "yes" ]]; then
+    enhanced_cpio="$dracutbasedir/dracut-cpio"
+    if [[ -x $enhanced_cpio ]]; then
+        # align based on statfs optimal transfer size
+        cpio_align=$(stat --file-system -c "%s" -- "$initdir")
+    else
+        dinfo "--enhanced-cpio ignored due to lack of dracut-cpio"
+        unset enhanced_cpio
+    fi
+else
+    unset enhanced_cpio
+fi
+
 if [[ $no_kernel != yes ]] && ! [[ -d $srcmods ]]; then
-    printf "%s\n" "dracut: Cannot find module directory $srcmods" >&2
-    printf "%s\n" "dracut: and --no-kernel was not specified" >&2
+    dfatal "Cannot find module directory $srcmods"
+    dfatal "and --no-kernel was not specified"
     exit 1
 fi
 
 if ! [[ $print_cmdline ]]; then
     inst "$DRACUT_TESTBIN"
-    if ! $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${dracutsysrootdir:+-r "$dracutsysrootdir"} -R "$DRACUT_TESTBIN" &>/dev/null; then
+    if ! $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${dracutsysrootdir:+-r "$dracutsysrootdir"} -R "$DRACUT_TESTBIN" &> /dev/null; then
         unset DRACUT_RESOLVE_LAZY
         export DRACUT_RESOLVE_DEPS=1
     fi
@@ -1067,43 +1351,41 @@ fi
 dracutfunctions=$dracutbasedir/dracut-functions.sh
 export dracutfunctions
 
-(( ${#drivers_l[@]} )) && drivers="${drivers_l[*]}"
+((${#drivers_l[@]})) && drivers="${drivers_l[*]}"
 drivers=${drivers/-/_}
 
-(( ${#add_drivers_l[@]} )) && add_drivers+=" ${add_drivers_l[*]} "
+((${#add_drivers_l[@]})) && add_drivers+=" ${add_drivers_l[*]} "
 add_drivers=${add_drivers/-/_}
 
-(( ${#force_drivers_l[@]} )) && force_drivers+=" ${force_drivers_l[*]} "
+((${#force_drivers_l[@]})) && force_drivers+=" ${force_drivers_l[*]} "
 force_drivers=${force_drivers/-/_}
 
-(( ${#omit_drivers_l[@]} )) && omit_drivers+=" ${omit_drivers_l[*]} "
+((${#omit_drivers_l[@]})) && omit_drivers+=" ${omit_drivers_l[*]} "
 omit_drivers=${omit_drivers/-/_}
 
-(( ${#kernel_cmdline_l[@]} )) && kernel_cmdline+=" ${kernel_cmdline_l[*]} "
+((${#kernel_cmdline_l[@]})) && kernel_cmdline+=" ${kernel_cmdline_l[*]} "
 
 omit_drivers_corrected=""
 for d in $omit_drivers; do
     [[ " $drivers $add_drivers " == *\ $d\ * ]] && continue
     [[ " $drivers $force_drivers " == *\ $d\ * ]] && continue
-    omit_drivers_corrected+="$d|"
+    omit_drivers_corrected+="^$d$|"
 done
 omit_drivers="${omit_drivers_corrected%|}"
 unset omit_drivers_corrected
 
 # prepare args for logging
-for ((i=0; i < ${#dracut_args[@]}; i++)); do
-    [[ "${dracut_args[$i]}" == *\ * ]] && \
-        dracut_args[$i]="\"${dracut_args[$i]}\""
-        #" keep vim happy
+for ((i = 0; i < ${#dracut_args[@]}; i++)); do
+    [[ ${dracut_args[$i]} == *\ * ]] \
+        && dracut_args[$i]="\"${dracut_args[$i]}\""
+    #" keep vim happy
 done
 
 dinfo "Executing: $dracut_cmd ${dracut_args[*]}"
 
-[[ $do_list = yes ]] && {
+[[ $do_list == yes ]] && {
     for mod in "$dracutbasedir"/modules.d/*; do
-        [[ -d $mod ]] || continue;
-        [[ -e $mod/install || -e $mod/installkernel || \
-            -e $mod/module-setup.sh ]] || continue
+        [[ -e $mod/module-setup.sh ]] || continue
         printf "%s\n" "${mod##*/??}"
     done
     exit 0
@@ -1111,24 +1393,83 @@ dinfo "Executing: $dracut_cmd ${dracut_args[*]}"
 
 # This is kinda legacy -- eventually it should go away.
 case $dracutmodules in
-    ""|auto) dracutmodules="all" ;;
+    "" | auto) dracutmodules="all" ;;
 esac
 
 abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
 
+# Helper function to set global variables
+# set_global_var <pkg_config> <pkg_var[:exported_var]> <value[:check_file]> [<value[:check_file]>] ...
+set_global_var() {
+    local _pkgconfig="$1"
+    local _pkgvar="${2%:*}"
+    local _var="${2#*:}"
+    [[ -z ${!_var} || ! -d ${dracutsysrootdir}${!_var} ]] \
+        && export "$_var"="$(pkg-config "$_pkgconfig" --variable="$_pkgvar" 2> /dev/null)"
+    if [[ -z ${!_var} || ! -d ${dracutsysrootdir}${!_var} ]]; then
+        shift 2
+        if (($# == 1)); then
+            export "$_var"="$1"
+        else
+            local _val
+            for _val in "$@"; do
+                _check=${_val##*:}
+                _val=${_val%:*}
+                [[ -e ${dracutsysrootdir}${_check} ]] && export "$_var"="$_val"
+            done
+        fi
+    fi
+}
 
-[[ -d $dracutsysrootdir$systemdutildir ]] \
-    || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null)
-
-if ! [[ -d $dracutsysrootdir$systemdutildir ]]; then
-    [[ -e $dracutsysrootdir/lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd
-    [[ -e $dracutsysrootdir/usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd
-fi
-
-[[ -d $dracutsysrootdir$systemdutilconfdir ]] \
-    || systemdutilconfdir=$(pkg-config systemd --variable=systemdutilconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$systemdutilconfdir ]] || systemdutilconfdir=/etc/systemd
+# dbus global variables
+set_global_var "dbus" "dbus" "/usr/share/dbus-1"
+set_global_var "dbus" "dbusconfdir" "/etc/dbus-1"
+set_global_var "dbus" "dbusinterfaces" "${dbus}/interfaces"
+set_global_var "dbus" "dbusinterfacesconfdir" "${dbusconfdir}/interfaces"
+set_global_var "dbus" "dbusservices" "${dbus}/services"
+set_global_var "dbus" "dbusservicesconfdir" "${dbusconfdir}/services"
+set_global_var "dbus" "dbussession" "${dbus}/session.d"
+set_global_var "dbus" "dbussessionconfdir" "${dbusconfdir}/session.d"
+set_global_var "dbus" "dbussystem" "${dbus}/system.d"
+set_global_var "dbus" "dbussystemconfdir" "${dbusconfdir}/system.d"
+set_global_var "dbus" "dbussystemservices" "${dbus}/system-services"
+set_global_var "dbus" "dbussystemservicesconfdir" "${dbusconfdir}/system-services"
+
+# udev global variables
+set_global_var "udev" "udevdir" "/lib/udev:/lib/udev/ata_id" "/usr/lib/udev:/usr/lib/udev/ata_id"
+set_global_var "udev" "udevconfdir" "/etc/udev"
+set_global_var "udev" "udevrulesdir" "${udevdir}/rules.d"
+set_global_var "udev" "udevrulesconfdir" "${udevconfdir}/rules.d"
+
+# systemd global variables
+set_global_var "systemd" "prefix:systemdprefix" "/usr"
+set_global_var "systemd" "systemdutildir" "/lib/systemd:/lib/systemd/systemd-udevd" "/usr/lib/systemd:/usr/lib/systemd/systemd-udevd"
+set_global_var "systemd" "systemdutilconfdir" "/etc/systemd"
+set_global_var "systemd" "environment" "/usr/lib/environment.d"
+set_global_var "systemd" "environmentconfdir" "/etc/environment.d"
+set_global_var "systemd" "modulesload" "/usr/lib/modules-load.d"
+set_global_var "systemd" "modulesloadconfdir" "/etc/modules-load.d"
+set_global_var "systemd" "sysctld" "/usr/lib/sysctl.d"
+set_global_var "systemd" "sysctlconfdir" "/etc/sysctl.d"
+set_global_var "systemd" "systemdcatalog" "${systemdutildir}/catalog"
+set_global_var "systemd" "systemdnetwork" "${systemdutildir}/network"
+set_global_var "systemd" "systemdnetworkconfdir" "${systemdutilconfdir}/network"
+set_global_var "systemd" "systemdntpunits" "${systemdutildir}/ntp-units.d"
+set_global_var "systemd" "systemdntpunitsconfdir" "${systemdutilconfdir}/ntp-units.d"
+set_global_var "systemd" "systemdportable" "${systemdutildir}/portable"
+set_global_var "systemd" "systemdportableconfdir" "${systemdutilconfdir}/portable"
+set_global_var "systemd" "systemdsystemunitdir" "${systemdutildir}/system"
+set_global_var "systemd" "systemdsystemconfdir" "${systemdutilconfdir}/system"
+set_global_var "systemd" "systemduser" "${systemdutildir}/user"
+set_global_var "systemd" "systemduserconfdir" "${systemdutilconfdir}/user"
+set_global_var "systemd" "sysusers" "/usr/lib/sysusers.d"
+set_global_var "systemd" "sysusersconfdir" "/etc/sysusers.d"
+set_global_var "systemd" "tmpfilesdir" "/lib/tmpfiles.d" "/usr/lib/tmpfiles.d"
+set_global_var "systemd" "tmpfilesconfdir" "/etc/tmpfiles.d"
+
+# libkmod global variables
+set_global_var "libkmod" "depmodd" "/usr/lib/depmod.d"
+set_global_var "libkmod" "depmodconfdir" "/etc/depmod.d"
 
 if [[ $no_kernel != yes ]] && [[ -d $srcmods ]]; then
     if ! [[ -f $srcmods/modules.dep ]]; then
@@ -1138,22 +1479,6 @@ if [[ $no_kernel != yes ]] && [[ -d $srcmods ]]; then
         else
             dwarn "$srcmods/modules.dep is missing. Did you run depmod?"
         fi
-    elif ! ( command -v gzip &>/dev/null && command -v xz &>/dev/null); then
-        read -r _mod < "$srcmods"/modules.dep
-        _mod=${_mod%%:*}
-        if [[ -f $srcmods/"$_mod" ]]; then
-            # Check, if kernel modules are compressed, and if we can uncompress them
-            case "$_mod" in
-                *.ko.gz) kcompress=gzip;;
-                *.ko.xz) kcompress=xz;;
-            esac
-            if [[ $kcompress ]]; then
-                if ! command -v "$kcompress" &>/dev/null; then
-                    dfatal "Kernel modules are compressed with $kcompress, but $kcompress is not available."
-                    exit 1
-                fi
-            fi
-        fi
     fi
 fi
 
@@ -1166,13 +1491,13 @@ if [[ ! $print_cmdline ]]; then
     outdir=${outfile%/*}
     [[ $outdir ]] || outdir="/"
 
-    if [[ ! -d "$outdir" ]]; then
+    if [[ ! -d $outdir ]]; then
         dfatal "Can't write to $outdir: Directory $outdir does not exist or is not accessible."
         exit 1
-    elif [[ ! -w "$outdir" ]]; then
+    elif [[ ! -w $outdir ]]; then
         dfatal "No permission to write to $outdir."
         exit 1
-    elif [[ -f "$outfile" && ! -w "$outfile" ]]; then
+    elif [[ -f $outfile && ! -w $outfile ]]; then
         dfatal "No permission to write $outfile."
         exit 1
     fi
@@ -1185,31 +1510,32 @@ if [[ ! $print_cmdline ]]; then
         loginstall=$(readlink -f "$loginstall")
     fi
 
-    if [[ $uefi = yes ]]; then
-        if ! command -v objcopy &>/dev/null; then
+    if [[ $uefi == yes ]]; then
+        if ! command -v objcopy &> /dev/null; then
             dfatal "Need 'objcopy' to create a UEFI executable"
             exit 1
         fi
         unset EFI_MACHINE_TYPE_NAME
-        case $(uname -m) in
+        case "${DRACUT_ARCH:-$(uname -m)}" in
             x86_64)
-                EFI_MACHINE_TYPE_NAME=x64;;
+                EFI_MACHINE_TYPE_NAME=x64
+                ;;
             i?86)
-                EFI_MACHINE_TYPE_NAME=ia32;;
+                EFI_MACHINE_TYPE_NAME=ia32
+                ;;
+            aarch64)
+                EFI_MACHINE_TYPE_NAME=aa64
+                ;;
             *)
-                dfatal "Architecture '$(uname -m)' not supported to create a UEFI executable"
+                dfatal "Architecture '${DRACUT_ARCH:-$(uname -m)}' not supported to create a UEFI executable"
                 exit 1
                 ;;
         esac
 
         if ! [[ -s $uefi_stub ]]; then
-            for uefi_stub in \
-                "$dracutsysrootdir${systemdutildir}/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub" \
-                    "$dracutsysrootdir/usr/lib/gummiboot/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"; do
-                [[ -s $uefi_stub ]] || continue
-                break
-            done
+            uefi_stub="$dracutsysrootdir${systemdprefix}/lib/systemd/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
         fi
+
         if ! [[ -s $uefi_stub ]]; then
             dfatal "Can't find a uefi stub '$uefi_stub' to create a UEFI executable"
             exit 1
@@ -1217,7 +1543,7 @@ if [[ ! $print_cmdline ]]; then
 
         if ! [[ $kernel_image ]]; then
             for kernel_image in "$dracutsysrootdir/lib/modules/$kernel/vmlinuz" "$dracutsysrootdir/boot/vmlinuz-$kernel"; do
-                [[ -s "$kernel_image" ]] || continue
+                [[ -s $kernel_image ]] || continue
                 break
             done
         fi
@@ -1228,30 +1554,27 @@ if [[ ! $print_cmdline ]]; then
     fi
 fi
 
-if [[ $acpi_override = yes ]] && ! ( check_kernel_config CONFIG_ACPI_TABLE_UPGRADE ||  check_kernel_config CONFIG_ACPI_INITRD_TABLE_OVERRIDE ); then
+if [[ $acpi_override == yes ]] && ! (check_kernel_config CONFIG_ACPI_TABLE_UPGRADE || check_kernel_config CONFIG_ACPI_INITRD_TABLE_OVERRIDE); then
     dwarn "Disabling ACPI override, because kernel does not support it. CONFIG_ACPI_INITRD_TABLE_OVERRIDE!=y or CONFIG_ACPI_TABLE_UPGRADE!=y"
     unset acpi_override
 fi
 
-if [[ $early_microcode = yes ]]; then
+if [[ $early_microcode == yes ]]; then
     if [[ $hostonly ]]; then
-        if [[ $(get_cpu_vendor) == "AMD" ]]; then
-            check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
-        elif [[ $(get_cpu_vendor) == "Intel" ]]; then
-            check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
+        if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then
+            check_kernel_config CONFIG_MICROCODE || unset early_microcode
         else
             unset early_microcode
         fi
     else
-        ! check_kernel_config CONFIG_MICROCODE_AMD \
-            && ! check_kernel_config CONFIG_MICROCODE_INTEL \
+        ! check_kernel_config CONFIG_MICROCODE \
             && unset early_microcode
     fi
     # Do not complain on non-x86 architectures as it makes no sense
-    case $(uname -m) in
-        x86_64|i?86)
+    case "${DRACUT_ARCH:-$(uname -m)}" in
+        x86_64 | i?86)
             [[ $early_microcode != yes ]] \
-                && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
+                && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y"
             ;;
         *) ;;
     esac
@@ -1262,7 +1585,7 @@ chmod 755 "$initdir"
 
 if [[ $hostonly ]]; then
     for i in /sys /proc /run /dev; do
-        if ! findmnt --target "$i" &>/dev/null; then
+        if ! findmnt --target "$i" &> /dev/null; then
             dwarning "Turning off host-only mode: '$i' is not mounted!"
             unset hostonly
         fi
@@ -1291,9 +1614,15 @@ for line in "${fstab_lines[@]}"; do
             ;;
     esac
     [ -z "$dev" ] && dwarn "Bad fstab entry $*" && continue
-    if [[ "$3" == btrfs ]]; then
-        for i in $(btrfs_devs "$2"); do
-            push_host_devs "$i"
+    if [[ $3 == btrfs ]]; then
+        for mp in $(findmnt --source "$1" -o TARGET -n); do
+            for i in $(btrfs_devs "$mp"); do
+                push_host_devs "$i"
+            done
+        done
+    elif [[ $3 == zfs ]]; then
+        for mp in $(zfs_devs "$1"); do
+            push_host_devs "$mp"
         done
     fi
     push_host_devs "$dev"
@@ -1311,12 +1640,12 @@ for dev in $add_device; do
     push_host_devs "$dev"
 done
 
-if (( ${#add_device_l[@]} )); then
+if ((${#add_device_l[@]})); then
     add_device+=" ${add_device_l[*]} "
     push_host_devs "${add_device_l[@]}"
 fi
 
-if [[ $hostonly ]] && [[ "$hostonly_default_device" != "no" ]]; then
+if [[ $hostonly ]] && [[ $hostonly_default_device != "no" ]]; then
     # in hostonly mode, determine all devices, which have to be accessed
     # and examine them for filesystem types
 
@@ -1334,46 +1663,50 @@ if [[ $hostonly ]] && [[ "$hostonly_default_device" != "no" ]]; then
         "/usr/lib64" \
         "/boot" \
         "/boot/efi" \
-        "/boot/zipl" \
-        ;
-    do
+        "/boot/zipl"; do
         mp=$(readlink -f "$dracutsysrootdir$mp")
-        mountpoint "$mp" >/dev/null 2>&1 || continue
+        mountpoint "$mp" > /dev/null 2>&1 || continue
         _dev=$(find_block_device "$mp")
         _bdev=$(readlink -f "/dev/block/$_dev")
         [[ -b $_bdev ]] && _dev=$_bdev
-        [[ "$mp" == "/" ]] && root_devs+=("$_dev")
+        [[ $mp == "/" ]] && root_devs+=("$_dev")
         push_host_devs "$_dev"
         if [[ $(find_mp_fstype "$mp") == btrfs ]]; then
             for i in $(btrfs_devs "$mp"); do
-                [[ "$mp" == "/" ]] && root_devs+=("$i")
+                [[ $mp == "/" ]] && root_devs+=("$i")
+                push_host_devs "$i"
+            done
+        elif [[ $(find_mp_fstype "$mp") == zfs ]]; then
+            for i in $(zfs_devs "$(findmnt -n -o SOURCE "$mp")"); do
+                [[ $mp == "/" ]] && root_devs+=("$i")
                 push_host_devs "$i"
             done
         fi
+
     done
 
     # TODO - with sysroot, /proc/swaps is not relevant
     if [[ -f /proc/swaps ]] && [[ -f $dracutsysrootdir/etc/fstab ]]; then
         while read -r dev type rest || [ -n "$dev" ]; do
             [[ -b $dev ]] || continue
-            [[ "$type" == "partition" ]] || continue
+            [[ $type == "partition" ]] || continue
 
             while read -r _d _m _t _o _ || [ -n "$_d" ]; do
-                [[ "$_d" == \#* ]] && continue
+                [[ $_d == \#* ]] && continue
                 [[ $_d ]] || continue
                 [[ $_t != "swap" ]] && continue
                 [[ $_m != "swap" ]] && [[ $_m != "none" ]] && continue
-                [[ "$_o" == *noauto* ]] && continue
+                [[ $_o == *noauto* ]] && continue
                 _d=$(expand_persistent_dev "$_d")
-                [[ "$_d" -ef "$dev" ]] || continue
+                [[ $_d -ef $dev ]] || continue
 
                 if [[ -f $dracutsysrootdir/etc/crypttab ]]; then
                     while read -r _mapper _ _p _o || [ -n "$_mapper" ]; do
-                        [[ $_mapper = \#* ]] && continue
-                        [[ "$_d" -ef /dev/mapper/"$_mapper" ]] || continue
+                        [[ $_mapper == \#* ]] && continue
+                        [[ $_d -ef /dev/mapper/"$_mapper" ]] || continue
                         [[ "$_o" ]] || _o="$_p"
                         # skip entries with password files
-                        [[ "$_p" == /* ]] && [[ -f $_p ]] && continue 2
+                        [[ $_p == /* ]] && [[ -f $_p ]] && continue 2
                         # skip mkswap swap
                         [[ $_o == *swap* ]] && continue 2
                     done < "$dracutsysrootdir"/etc/crypttab
@@ -1390,18 +1723,22 @@ if [[ $hostonly ]] && [[ "$hostonly_default_device" != "no" ]]; then
     # collect all "x-initrd.mount" entries from /etc/fstab
     if [[ -f $dracutsysrootdir/etc/fstab ]]; then
         while read -r _d _m _t _o _ || [ -n "$_d" ]; do
-            [[ "$_d" == \#* ]] && continue
+            [[ $_d == \#* ]] && continue
             [[ $_d ]] || continue
-            [[ "$_o" != *x-initrd.mount* ]] && continue
+            [[ $_o != *x-initrd.mount* ]] && continue
             _dev=$(expand_persistent_dev "$_d")
             _dev="$(readlink -f "$_dev")"
             [[ -b $_dev ]] || continue
 
             push_host_devs "$_dev"
-            if [[ "$_t" == btrfs ]]; then
+            if [[ $_t == btrfs ]]; then
                 for i in $(btrfs_devs "$_m"); do
                     push_host_devs "$i"
                 done
+            elif [[ $_t == zfs ]]; then
+                for i in $(zfs_devs "$_d"); do
+                    push_host_devs "$i"
+                done
             fi
         done < "$dracutsysrootdir"/etc/fstab
     fi
@@ -1433,11 +1770,11 @@ for dev in "${host_devs[@]}"; do
 done
 
 for dev in "${!host_fs_types[@]}"; do
-    [[ ${host_fs_types[$dev]} = "reiserfs" ]] || [[ ${host_fs_types[$dev]} = "xfs" ]] || continue
+    [[ ${host_fs_types[$dev]} == "reiserfs" ]] || [[ ${host_fs_types[$dev]} == "xfs" ]] || continue
     rootopts=$(find_dev_fsopts "$dev")
-    if [[ ${host_fs_types[$dev]} = "reiserfs" ]]; then
+    if [[ ${host_fs_types[$dev]} == "reiserfs" ]]; then
         journaldev=$(fs_get_option "$rootopts" "jdev")
-    elif [[ ${host_fs_types[$dev]} = "xfs" ]]; then
+    elif [[ ${host_fs_types[$dev]} == "xfs" ]]; then
         journaldev=$(fs_get_option "$rootopts" "logdev")
     fi
     if [[ $journaldev ]]; then
@@ -1448,166 +1785,6 @@ for dev in "${!host_fs_types[@]}"; do
     fi
 done
 
-[[ -d $dracutsysrootdir$dbus ]] \
-         || dbus=$(pkg-config dbus --variable=dbus 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbus ]] || dbus=/usr/share/dbus-1
-
-[[ -d $dracutsysrootdir$dbusconfdir ]] \
-         || dbusconfdir=$(pkg-config dbus --variable=dbusconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbusconfdir ]] || dbusconfdir=/etc/dbus-1
-
-[[ -d $dracutsysrootdir$dbusinterfaces ]] \
-          || dbusinterfaces=$(pkg-config dbus --variable=dbusinterfaces 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbusinterfaces ]] || dbusinterfaces=${dbus}/interfaces
-
-[[ -d $dracutsysrootdir$dbusinterfacesconfdir ]] \
-          || dbusinterfacesconfdir=$(pkg-config dbus --variable=dbusinterfacesconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbusinterfacesconfdir ]] || dbusinterfacesconfdir=${dbusconfdir}/interfaces
-
-[[ -d $dracutsysrootdir$dbusservices ]] \
-          || dbusservices=$(pkg-config dbus --variable=dbusservices 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbusservices ]] || dbusservices=${dbus}/services
-
-[[ -d $dracutsysrootdir$dbusservicesconfdir ]] \
-          || dbusservicesconfdir=$(pkg-config dbus --variable=dbusservicesconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbusservicesconfdir ]] || dbusservicesconfdir=${dbusconfdir}/services
-
-[[ -d $dracutsysrootdir$dbussession ]] \
-          || dbussession=$(pkg-config dbus --variable=dbussession 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbussession ]] || dbussession=${dbus}/session.d
-
-[[ -d $dracutsysrootdir$dbussessionconfdir ]] \
-          || dbussessionconfdir=$(pkg-config dbus --variable=dbussessionconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbussessionconfdir ]] || dbussessionconfdir=${dbusconfdir}/session.d
-
-[[ -d $dracutsysrootdir$dbussystem ]] \
-          || dbussystem=$(pkg-config dbus --variable=dbussystem 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbussystem ]] || dbussystem=${dbus}/system.d
-
-[[ -d $dracutsysrootdir$dbussystemconfdir ]] \
-          || dbussystemconfdir=$(pkg-config dbus --variable=dbussystemconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbussystemconfdir ]] || dbussystemconfdir=${dbusconfdir}/system.d
-
-[[ -d $dracutsysrootdir$dbussystemservices ]] \
-          || dbussystemservices=$(pkg-config dbus --variable=dbussystemservices 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbussystemservices ]] || dbussystemservices=${dbus}/system-services
-
-[[ -d $dracutsysrootdir$dbussystemservicesconfdir ]] \
-           || dbussystemservicesconfdir=$(pkg-config dbus --variable=dbussystemservicesconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$dbussystemservicesconfdir ]] || dbussystemservicesconfdir=${dbusconfdir}/system-services
-
-[[ -d $dracutsysrootdir$udevdir ]] \
-    || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)"
-if ! [[ -d $dracutsysrootdir$udevdir ]]; then
-    [[ -e $dracutsysrootdir/lib/udev/ata_id ]] && udevdir=/lib/udev
-    [[ -e $dracutsysrootdir/usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev
-fi
-
-[[ -d $dracutsysrootdir$sysctl ]] \
-      || sysctl=$(pkg-config systemd --variable=sysctl 2>/dev/null)
-
-[[ -d $dracutsysrootdir$sysctl ]] || sysctl=/usr/lib/sysctl.d
-
-[[ -d $dracutsysrootdir$sysctlconfdir ]] \
-      || sysctlconfdir=$(pkg-config systemd --variable=sysctlconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$sysctlconfdir ]] || sysctlconfdir=/etc/sysctl.d
-
-[[ -d $dracutsysrootdir$environment ]] \
-      || environment=$(pkg-config systemd --variable=environment 2>/dev/null)
-
-[[ -d $dracutsysrootdir$environment ]] || environment=/usr/lib/environment.d
-
-[[ -d $dracutsysrootdir$environmentconfdir ]] \
-      || environmentconfdir=$(pkg-config systemd --variable=environmentconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$environmentconfdir ]] || environmentconfdir=/etc/environment.d
-
-[[ -d $dracutsysrootdir$systemdcatalog ]] \
-      || systemdcatalog=$(pkg-config systemd --variable=systemdcatalog 2>/dev/null)
-
-[[ -d $dracutsysrootdir$systemdcatalog ]] || systemdcatalog=${systemdutildir}/catalog
-
-[[ -d $dracutsysrootdir$systemdnetwork ]] \
-      || systemdnetwork=$(pkg-config systemd --variable=systemdnetwork 2>/dev/null)
-
-[[ -d $dracutsysrootdir$systemdnetwork ]] || systemdnetwork=${systemdutildir}/network
-
-[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] \
-       || systemdnetworkconfdir=$(pkg-config systemd --variable=systemdnetworkconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] || systemdnetworkconfdir=${systemdsystemconfdir}/network
-
-[[ -d $dracutsysrootdir$systemdntpunits ]] \
-      || systemdntpunits=$(pkg-config systemd --variable=systemdntpunits 2>/dev/null)
-
-[[ -d $dracutsysrootdir$systemdntpunits ]] || systemdntpunits=${systemdutildir}/ntp-units.d
-
-[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] \
-      || systemdntpunitsconfdir=$(pkg-config systemd --variable=systemdntpunitsconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] || systemdntpunitsconfdir=${systemdsystemconfdir}/ntp-units.d
-
-[[ -d $dracutsysrootdir$systemdportable ]] \
-      || systemdportable=$(pkg-config systemd --variable=systemdportable 2>/dev/null)
-
-[[ -d $dracutsysrootdir$systemdportable ]] || systemdportable=${systemdutildir}/portable
-
-[[ -d $dracutsysrootdir$systemdportableconfdir ]] \
-      || systemdportableconfdir=$(pkg-config systemd --variable=systemdportableconfdir 2>/dev/null)
-
-[[ -d "$dracutsysrootdir$systemdportableconfdir" ]] || systemdportableconfdir=${systemdsystemconfdir}/portable
-
-[[ -d $dracutsysrootdir$systemdsystemunitdir ]] \
-    || systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir 2>/dev/null)
-
-[[ -d "$dracutsysrootdir$systemdsystemunitdir" ]] || systemdsystemunitdir=${systemdutildir}/system
-
-[[ -d $dracutsysrootdir$systemduser ]] \
-      || systemduser=$(pkg-config systemd --variable=systemduser 2>/dev/null)
-
-[[ -d $dracutsysrootdir$systemduser ]] || systemduser=${systemdutildir}/user
-
-[[ -d $dracutsysrootdir$systemduserconfdir ]] \
-       || systemduserconfdir=$(pkg-config systemd --variable=systemduserconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$systemduserconfdir ]] || systemduserconfdir=${systemdsystemconfdir}/user
-
-[[ -d $dracutsysrootdir$systemdsystemconfdir ]] \
-    || systemdsystemconfdir=$(pkg-config systemd --variable=systemdsystemconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$systemdsystemconfdir ]] || systemdsystemconfdir=/etc/systemd/system
-
-[[ -d $dracutsysrootdir$sysusers ]] \
-       || sysusers=$(pkg-config systemd --variable=sysusers 2>/dev/null)
-
-[[ -d $dracutsysrootdir$sysusers ]] || sysusers=/usr/lib/sysusers.d
-
-[[ -d $dracutsysrootdir$sysusersconfdir ]] \
-       || sysusersconfdir=$(pkg-config systemd --variable=sysusersconfdir 2>/dev/null)
-
-[[ -d $dracutsysrootdir$sysusersconfdir ]] || sysusersconfdir=/etc/sysusers.d
-
-[[ -d $dracutsysrootdir$tmpfilesdir ]] \
-    || tmpfilesdir=$(pkg-config systemd --variable=tmpfilesdir 2>/dev/null)
-
-if ! [[ -d $dracutsysrootdir$tmpfilesdir ]]; then
-    [[ -d $dracutsysrootdir/lib/tmpfiles.d ]] && tmpfilesdir=/lib/tmpfiles.d
-    [[ -d $dracutsysrootdir/usr/lib/tmpfiles.d ]] && tmpfilesdir=/usr/lib/tmpfiles.d
-fi
-
 export initdir dracutbasedir \
     dracutmodules force_add_dracutmodules add_dracutmodules omit_dracutmodules \
     mods_to_load \
@@ -1615,16 +1792,10 @@ export initdir dracutbasedir \
     omit_drivers mdadmconf lvmconf root_devs \
     use_fstab fstab_lines libdirs fscks nofscks ro_mnt \
     stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
-    debug host_fs_types host_devs swap_devs sshkey add_fstab \
-    DRACUT_VERSION udevdir prefix filesystems drivers \
-    dbus dbusconfdir dbusinterfaces dbusinterfacesconfdir \
-    dbusservices dbusservicesconfdir dbussession dbussessionconfdir \
-    dbussystem dbussystemconfdir dbussystemservices dbussystemservicesconfdir \
-    environment environmentconfdir sysctl sysctlconfdir sysusers sysusersconfdir \
-    systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \
-    systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \
-    hostonly_cmdline loginstall \
-    tmpfilesdir
+    host_fs_types host_devs swap_devs sshkey add_fstab \
+    DRACUT_VERSION \
+    prefix filesystems drivers \
+    hostonly_cmdline loginstall
 
 mods_to_load=""
 # check all our modules to see if they should be sourced.
@@ -1634,8 +1805,7 @@ for_each_module_dir check_mount
 
 dracut_module_included "fips" && export DRACUT_FIPS_MODE=1
 
-do_print_cmdline()
-{
+do_print_cmdline() {
     local -A _mods_to_print
     for i in $modules_loaded $mods_to_load; do
         _mods_to_print[$i]=1
@@ -1643,7 +1813,8 @@ do_print_cmdline()
 
     # source our modules.
     for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
-        _d_mod=${moddir##*/}; _d_mod=${_d_mod#[0-9][0-9]}
+        _d_mod=${moddir##*/}
+        _d_mod=${_d_mod#[0-9][0-9]}
         [[ ${_mods_to_print[$_d_mod]} ]] || continue
         module_cmdline "$_d_mod" "$moddir"
     done
@@ -1661,18 +1832,20 @@ fi
 [[ $prefix ]] && mkdir -m 0755 -p "${initdir}${prefix}"
 
 # shellcheck disable=SC2174
-[[ -h $dracutsysrootdir/lib ]] || mkdir -m 0755 -p "${initdir}${prefix}/lib"
+[[ -L $dracutsysrootdir/lib ]] || mkdir -m 0755 -p "${initdir}${prefix}/lib"
 [[ $prefix ]] && ln -sfn "${prefix#/}/lib" "$initdir/lib"
 
 if [[ $prefix ]]; then
     for d in bin etc lib sbin tmp usr var $libdirs; do
-        [[ "$d" == */* ]] && continue
+        d=${d#/}
+        [[ $d == */* ]] && continue
         ln -sfn "${prefix#/}/${d#/}" "$initdir/$d"
     done
 fi
 
 if [[ $kernel_only != yes ]]; then
     for d in usr usr/bin usr/sbin bin etc lib sbin tmp var var/tmp $libdirs; do
+        d=${d#/}
         [[ -e "${initdir}${prefix}/$d" ]] && continue
         if [ -L "/$d" ]; then
             inst_symlink "/$d" "${prefix}/$d"
@@ -1705,16 +1878,16 @@ else
     done
 fi
 
+mkdir -p "${initdir}"/lib/dracut
+
 if [[ $kernel_only != yes ]]; then
     mkdir -p "${initdir}/etc/cmdline.d"
-    # shellcheck disable=SC2174
-    mkdir -m 0755 -p "${initdir}"/lib "${initdir}"/lib/dracut "${initdir}"/lib/dracut/hooks
-    # shellcheck disable=SC2154
+    mkdir -m 0755 "${initdir}"/lib/dracut/hooks
     for _d in $hookdirs; do
         # shellcheck disable=SC2174
         mkdir -m 0755 -p "${initdir}/lib/dracut/hooks/$_d"
     done
-    if [[ "$EUID" = "0" ]]; then
+    if [[ $EUID == "0" ]] && ! [[ $DRACUT_NO_MKNOD ]]; then
         [[ -c ${initdir}/dev/null ]] || mknod "${initdir}"/dev/null c 1 3
         [[ -c ${initdir}/dev/kmsg ]] || mknod "${initdir}"/dev/kmsg c 1 11
         [[ -c ${initdir}/dev/console ]] || mknod "${initdir}"/dev/console c 5 1
@@ -1727,9 +1900,10 @@ _isize=0 #initramfs size
 modules_loaded=" "
 # source our modules.
 for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
-    _d_mod=${moddir##*/}; _d_mod=${_d_mod#[0-9][0-9]}
-    [[ "$mods_to_load" == *\ $_d_mod\ * ]] || continue
-    if [[ $show_modules = yes ]]; then
+    _d_mod=${moddir##*/}
+    _d_mod=${_d_mod#[0-9][0-9]}
+    [[ $mods_to_load == *\ $_d_mod\ * ]] || continue
+    if [[ $show_modules == yes ]]; then
         printf "%s\n" "$_d_mod"
     else
         dinfo "*** Including module: $_d_mod ***"
@@ -1753,7 +1927,10 @@ for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
 
     #print the module install size
     if [ -n "$printsize" ]; then
-        _isize_new=$(du -sk "${initdir}" | { read -r a _; echo -n "$a"; })
+        _isize_new=$(du -sk "${initdir}" | {
+            read -r a _
+            echo -n "$a"
+        })
         _isize_delta=$((_isize_new - _isize))
         printf "%s\n" "$_d_mod install size: ${_isize_delta}k"
         _isize=$_isize_new
@@ -1762,7 +1939,6 @@ done
 unset moddir
 
 for i in $modules_loaded; do
-    mkdir -p "$initdir"/lib/dracut
     printf "%s\n" "$i" >> "$initdir"/lib/dracut/modules.txt
 done
 
@@ -1770,7 +1946,7 @@ dinfo "*** Including modules done ***"
 
 ## final stuff that has to happen
 if [[ $no_kernel != yes ]]; then
-    if [[ $hostonly_mode = "strict" ]]; then
+    if [[ $hostonly_mode == "strict" ]]; then
         cp "$DRACUT_KERNEL_MODALIASES" "$initdir"/lib/dracut/hostonly-kernel-modules.txt
     fi
 
@@ -1779,7 +1955,7 @@ if [[ $no_kernel != yes ]]; then
         hostonly='' instmods $drivers
     fi
 
-    if [[ -n "${add_drivers// }" ]]; then
+    if [[ -n ${add_drivers// /} ]]; then
         # shellcheck disable=SC2086
         hostonly='' instmods -c $add_drivers
     fi
@@ -1788,7 +1964,7 @@ if [[ $no_kernel != yes ]]; then
         hostonly='' instmods -c $force_drivers
         rm -f "$initdir"/etc/cmdline.d/20-force_driver.conf
         for mod in $force_drivers; do
-            echo "rd.driver.pre=$mod" >>"$initdir"/etc/cmdline.d/20-force_drivers.conf
+            echo "rd.driver.pre=$mod" >> "$initdir"/etc/cmdline.d/20-force_drivers.conf
         done
     fi
     if [[ $filesystems ]]; then
@@ -1801,8 +1977,8 @@ if [[ $no_kernel != yes ]]; then
     dinfo "*** Installing kernel module dependencies done ***"
 
     if [[ $noimageifnotneeded == yes ]] && [[ $hostonly ]]; then
-        if [[ ! -f "$initdir/lib/dracut/need-initqueue" ]] && \
-            [[ -f ${initdir}/lib/modules/$kernel/modules.dep && ! -s ${initdir}/lib/modules/$kernel/modules.dep ]]; then
+        if [[ ! -f "$initdir/lib/dracut/need-initqueue" ]] \
+            && [[ -f ${initdir}/lib/modules/$kernel/modules.dep && ! -s ${initdir}/lib/modules/$kernel/modules.dep ]]; then
             for i in "${initdir}"/etc/cmdline.d/*.conf; do
                 # We need no initramfs image and do not generate one.
                 [[ $i == "${initdir}/etc/cmdline.d/*.conf" ]] && exit 0
@@ -1814,9 +1990,9 @@ fi
 if [[ $kernel_only != yes ]]; then
     # FIXME: handle legacy item split
     # shellcheck disable=SC2068
-    (( ${#install_items[@]} > 0 )) && inst_multiple ${install_items[@]}
+    ((${#install_items[@]} > 0)) && inst_multiple ${install_items[@]}
     # shellcheck disable=SC2068
-    (( ${#install_optional_items[@]} > 0 )) && inst_multiple -o ${install_optional_items[@]}
+    ((${#install_optional_items[@]} > 0)) && inst_multiple -o ${install_optional_items[@]}
 
     if [[ $kernel_cmdline ]] && [[ $uefi != yes ]]; then
         printf "%s\n" "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf"
@@ -1827,7 +2003,7 @@ if [[ $kernel_only != yes ]]; then
         if [ -z "${fstab_field[1]}" ]; then
             # Determine device and mount options from current system
             mountpoint -q "${fstab_field[0]}" || derror "${fstab_field[0]} is not a mount point!"
-            read -r -a fstab_field <<< "$(findmnt --raw -n --target "${fstab_field[0]}" --output=source,target,fstype,options)"
+            read -r -a fstab_field < <(findmnt --raw -n --target "${fstab_field[0]}" --output=source,target,fstype,options)
             dinfo "Line for ${fstab_field[1]}: ${fstab_field[*]}"
         else
             # Use default options
@@ -1859,9 +2035,16 @@ if [[ $kernel_only != yes ]]; then
 
     if [[ $DRACUT_RESOLVE_LAZY ]] && [[ $DRACUT_INSTALL ]]; then
         dinfo "*** Resolving executable dependencies ***"
+        # shellcheck disable=SC2086
         find "$initdir" -type f -perm /0111 -not -path '*.ko' -print0 \
-        | xargs -r -0 "$DRACUT_INSTALL" ${initdir:+-D "$initdir"} ${dracutsysrootdir:+-r "$dracutsysrootdir"} -R ${DRACUT_FIPS_MODE:+-f} --
-        dinfo "*** Resolving executable dependencies done ***"
+            | xargs -r -0 $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${dracutsysrootdir:+-r "$dracutsysrootdir"} -R ${DRACUT_FIPS_MODE:+-f} --
+        # shellcheck disable=SC2181
+        if (($? == 0)); then
+            dinfo "*** Resolving executable dependencies done ***"
+        else
+            dfatal "Resolving executable dependencies failed"
+            exit 1
+        fi
     fi
 
     # Now we are done with lazy resolving, always install dependencies
@@ -1869,7 +2052,7 @@ if [[ $kernel_only != yes ]]; then
     export DRACUT_RESOLVE_DEPS=1
 fi
 
-for ((i=0; i < ${#include_src[@]}; i++)); do
+for ((i = 0; i < ${#include_src[@]}; i++)); do
     src="${include_src[$i]}"
     target="${include_target[$i]}"
     if [[ $src && $target ]]; then
@@ -1882,21 +2065,24 @@ for ((i=0; i < ${#include_src[@]}; i++)); do
             # check for preexisting symlinks, so we can cope with the
             # symlinks to $prefix
             # Objectname is a file or a directory
+            reset_dotglob="$(shopt -p dotglob)"
+            shopt -q -s dotglob
             for objectname in "$src"/*; do
-                [[ -e "$objectname" || -h "$objectname" ]] || continue
-                if [[ -d "$objectname" ]]; then
+                [[ -e $objectname || -L $objectname ]] || continue
+                if [[ -d $objectname ]] && [[ ! -L $objectname ]]; then
                     # objectname is a directory, let's compute the final directory name
-                    object_destdir=${destdir}/${objectname#$src/}
-                    if ! [[ -e "$object_destdir" ]]; then
+                    object_destdir=${destdir}/${objectname#"$src"/}
+                    if ! [[ -e $object_destdir ]]; then
                         # shellcheck disable=SC2174
                         mkdir -m 0755 -p "$object_destdir"
                         chmod --reference="$objectname" "$object_destdir"
                     fi
-                    $DRACUT_CP -t "$object_destdir" "$dracutsysrootdir$objectname"/*
+                    $DRACUT_CP -t "$object_destdir" "$dracutsysrootdir$objectname"/.
                 else
                     $DRACUT_CP -t "$destdir" "$dracutsysrootdir$objectname"
                 fi
             done
+            eval "$reset_dotglob"
         elif [[ -e $src ]]; then
             derror "$src is neither a directory nor a regular file"
         else
@@ -1905,33 +2091,40 @@ for ((i=0; i < ${#include_src[@]}; i++)); do
     fi
 done
 
-if [[ $do_hardlink = yes ]] && command -v hardlink >/dev/null; then
+if [[ $do_hardlink == yes ]] && command -v hardlink > /dev/null; then
     dinfo "*** Hardlinking files ***"
-    hardlink "$initdir" 2>&1
+    hardlink "$initdir" 2>&1 | ddebug
     dinfo "*** Hardlinking files done ***"
 fi
 
 # strip binaries
-if [[ $do_strip = yes ]] ; then
+if [[ $do_strip == yes ]]; then
     # Prefer strip from elfutils for package size
     declare strip_cmd
     strip_cmd=$(command -v eu-strip)
     [ -z "$strip_cmd" ] && strip_cmd="strip"
 
     for p in $strip_cmd xargs find; do
-        if ! type -P $p >/dev/null; then
+        if ! type -P $p > /dev/null; then
             dinfo "Could not find '$p'. Not stripping the initramfs."
             do_strip=no
         fi
     done
+
+    if [[ $aggressive_strip == yes ]]; then
+        # `eu-strip` and `strip` both strips all unneeded parts by default
+        strip_args=(-p)
+    else
+        strip_args=(-g -p)
+    fi
 fi
 
 # cleanup empty ldconfig_paths directories
 for d in $(ldconfig_paths); do
-    rmdir -p --ignore-fail-on-non-empty "$initdir/$d" >/dev/null 2>&1
+    rmdir -p --ignore-fail-on-non-empty "$initdir/$d" > /dev/null 2>&1
 done
 
-if [[ $early_microcode = yes ]]; then
+if [[ $early_microcode == yes ]]; then
     dinfo "*** Generating early-microcode cpio image ***"
     ucode_dir=(amd-ucode intel-ucode)
     ucode_dest=(AuthenticAMD.bin GenuineIntel.bin)
@@ -1960,7 +2153,7 @@ if [[ $early_microcode = yes ]]; then
                     break 2
                 done
                 for i in $_fwdir/$_fw/$_src; do
-                    [[ -e "$i" ]] || continue
+                    [[ -e $i ]] || continue
                     # skip gpg files
                     str_ends "$i" ".asc" && continue
                     cat "$i" >> "$_dest_dir/${ucode_dest[$idx]}"
@@ -1972,9 +2165,9 @@ if [[ $early_microcode = yes ]]; then
             if cd "$early_cpio_dir/d"; then
                 for _ucodedir in "${early_microcode_image_dir[@]}"; do
                     for _ucodename in "${early_microcode_image_name[@]}"; do
-                        [[ -e "$_ucodedir/$_ucodename" ]] && \
-                        cpio --extract --file "$_ucodedir/$_ucodename" --quiet \
-                             "kernel/x86/microcode/${ucode_dest[$idx]}"
+                        [[ -e "$_ucodedir/$_ucodename" ]] \
+                            && cpio --extract --file "$_ucodedir/$_ucodename" --quiet \
+                                "kernel/x86/microcode/${ucode_dest[$idx]}"
                         if [[ -e "$_dest_dir/${ucode_dest[$idx]}" ]]; then
                             dinfo "*** Using microcode found in '$_ucodedir/$_ucodename' ***"
                             create_early_cpio="yes"
@@ -1987,7 +2180,7 @@ if [[ $early_microcode = yes ]]; then
     done
 fi
 
-if [[ $acpi_override = yes ]] && [[ -d $acpi_table_dir ]]; then
+if [[ $acpi_override == yes ]] && [[ -d $acpi_table_dir ]]; then
     dinfo "*** Packaging ACPI tables to override BIOS provided ones ***"
     _dest_dir="$early_cpio_dir/d/kernel/firmware/acpi"
     mkdir -p "$_dest_dir"
@@ -1999,16 +2192,16 @@ if [[ $acpi_override = yes ]] && [[ -d $acpi_table_dir ]]; then
 fi
 
 dinfo "*** Store current command line parameters ***"
-if ! ( echo "$PARMS_TO_STORE" > "$initdir"/lib/dracut/build-parameter.txt ); then
+if ! (echo "$PARMS_TO_STORE" > "$initdir"/lib/dracut/build-parameter.txt); then
     dfatal "Could not store the current command line parameters"
     exit 1
 fi
 
-if [[ $hostonly_cmdline == "yes" ]] ; then
+if [[ $hostonly_cmdline == "yes" ]]; then
     unset _stored_cmdline
-    if [[ -d $initdir/etc/cmdline.d ]];then
+    if [[ -d $initdir/etc/cmdline.d ]]; then
         dinfo "Stored kernel commandline:"
-        for conf in "$initdir"/etc/cmdline.d/*.conf ; do
+        for conf in "$initdir"/etc/cmdline.d/*.conf; do
             [ -e "$conf" ] || continue
             dinfo "$(< "$conf")"
             _stored_cmdline=1
@@ -2019,57 +2212,11 @@ if [[ $hostonly_cmdline == "yes" ]] ; then
     fi
 fi
 
-if dracut_module_included "squash"; then
-    dinfo "*** Install squash loader ***"
-    readonly squash_dir="$initdir/squash/root"
-    readonly squash_img="$initdir/squash/root.img"
-    readonly squash_candidate=( "usr" "etc" )
-
-    # shellcheck disable=SC2174
-    mkdir -m 0755 -p "$squash_dir"
-    for folder in "${squash_candidate[@]}"; do
-        mv "$initdir/$folder" "$squash_dir/$folder"
-    done
-
-    # Move some files out side of the squash image, including:
-    # - Files required to boot and mount the squashfs image
-    # - Files need to be accessible without mounting the squash image
-    # - Initramfs marker
-    for file in \
-        "$squash_dir"/usr/lib/modules/*/modules.* \
-        "$squash_dir"/usr/lib/dracut/* \
-        "$squash_dir"/etc/initrd-release
-    do
-        [[ -f $file ]] || continue
-        DRACUT_RESOLVE_DEPS=1 dracutsysrootdir="$squash_dir" inst "${file#$squash_dir}"
-        rm "$file"
-    done
-
-    mv "$initdir"/init "$initdir"/init.stock
-    ln -s squash/init.sh "$initdir"/init
-
-    # Reinstall required files for the squash image setup script.
-    # We have moved them inside the squashed image, but they need to be
-    # accessible before mounting the image.
-    inst_multiple "echo" "sh" "mount" "modprobe" "mkdir"
-    hostonly="" instmods "loop" "squashfs" "overlay"
-    # Only keep systemctl outsite if we need switch root
-    if [[ ! -f "$initdir/lib/dracut/no-switch-root" ]]; then
-      inst "systemctl"
-    fi
-
-    # Remove duplicated files
-    for folder in "${squash_candidate[@]}"; do
-        find "$initdir/$folder/" -not -type d \
-            -exec bash -c 'mv -f "$squash_dir${1#$initdir}" "$1"' -- "{}" \;
-    done
-fi
-
 if [[ $kernel_only != yes ]]; then
     # libpthread workaround: pthread_cancel wants to dlopen libgcc_s.so
     for _dir in $libdirs; do
         for _f in "$dracutsysrootdir$_dir/libpthread.so"*; do
-            [[ -e "$_f" ]] || continue
+            [[ -e $_f ]] || continue
             inst_libdir_file "libgcc_s.so*"
             break 2
         done
@@ -2077,62 +2224,76 @@ if [[ $kernel_only != yes ]]; then
 
     # FIPS workaround for Fedora/RHEL: libcrypto needs libssl when FIPS is enabled
     if [[ $DRACUT_FIPS_MODE ]]; then
-      for _dir in $libdirs; do
-          for _f in "$dracutsysrootdir$_dir/libcrypto.so"*; do
-              [[ -e "$_f" ]] || continue
-              inst_libdir_file -o "libssl.so*"
-              break 2
-          done
-      done
+        for _dir in $libdirs; do
+            for _f in "$dracutsysrootdir$_dir/libcrypto.so"*; do
+                [[ -e $_f ]] || continue
+                inst_libdir_file -o "libssl.so*"
+                break 2
+            done
+        done
     fi
 fi
 
 if [[ $kernel_only != yes ]]; then
     # make sure that library links are correct and up to date
-    for f in "$dracutsysrootdir"/etc/ld.so.conf "$dracutsysrootdir"/etc/ld.so.conf.d/*; do
-        [[ -f $f ]] && inst_simple "${f#$dracutsysrootdir}"
-    done
-    if ! $DRACUT_LDCONFIG -r "$initdir" -f /etc/ld.so.conf; then
-        if [[ $EUID = 0 ]]; then
-            derror "ldconfig exited ungracefully"
-        else
-            derror "ldconfig might need uid=0 (root) for chroot()"
-        fi
-    fi
+    build_ld_cache
+fi
+
+if dracut_module_included "squash"; then
+    readonly squash_dir="$initdir/squash/root"
+    readonly squash_img="$initdir/squash-root.img"
+    mkdir -p "$squash_dir"
+    dinfo "*** Install squash loader ***"
+    DRACUT_SQUASH_POST_INST=1 module_install "squash"
 fi
 
-if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
+if [[ $do_strip == yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
+    # stripping files negates (dedup) benefits of using reflink
+    [[ -n $enhanced_cpio ]] && ddebug "strip is enabled alongside cpio reflink"
     dinfo "*** Stripping files ***"
     find "$initdir" -type f \
         -executable -not -path '*/lib/modules/*.ko' -print0 \
-        | xargs -r -0 $strip_cmd -g -p 2>/dev/null
+        | xargs -r -0 $strip_cmd "${strip_args[@]}" 2> /dev/null
 
     # strip kernel modules, but do not touch signed modules
     find "$initdir" -type f -path '*/lib/modules/*.ko' -print0 \
         | while read -r -d $'\0' f || [ -n "$f" ]; do
-        SIG=$(tail -c 28 "$f" | tr -d '\000')
-        [[ $SIG == '~Module signature appended~' ]] || { printf "%s\000" "$f"; }
-    done | xargs -r -0 $strip_cmd -g -p
+            SIG=$(tail -c 28 "$f" | tr -d '\000')
+            [[ $SIG == '~Module signature appended~' ]] || { printf "%s\000" "$f"; }
+        done | xargs -r -0 $strip_cmd "${strip_args[@]}"
     dinfo "*** Stripping files done ***"
 fi
 
 if dracut_module_included "squash"; then
     dinfo "*** Squashing the files inside the initramfs ***"
+    declare squash_compress_arg
+    # shellcheck disable=SC2086
+    if [[ $squash_compress ]]; then
+        if ! mksquashfs /dev/null "$DRACUT_TMPDIR"/.squash-test.img -no-progress -comp $squash_compress &> /dev/null; then
+            dwarn "mksquashfs doesn't support compressor '$squash_compress', failing back to default compressor."
+        else
+            squash_compress_arg="$squash_compress"
+        fi
+    fi
+
+    # shellcheck disable=SC2086
     if ! mksquashfs "$squash_dir" "$squash_img" \
-        -no-xattrs -no-exports -noappend -always-use-fragments \
-        -comp xz -Xdict-size 100% -no-progress \
-        > /dev/null; then
-        dfatal "dracut: Failed making squash image"
+        -no-xattrs -no-exports -noappend -no-recovery -always-use-fragments \
+        -no-progress ${squash_compress_arg:+-comp $squash_compress_arg} 1> /dev/null; then
+        dfatal "Failed making squash image"
         exit 1
     fi
 
     rm -rf "$squash_dir"
     dinfo "*** Squashing the files inside the initramfs done ***"
+
+    # Skip initramfs compress
+    compress="cat"
 fi
 
 dinfo "*** Creating image file '$outfile' ***"
 
-if [[ $uefi = yes ]]; then
+if [[ $uefi == yes ]]; then
     readonly uefi_outdir="$DRACUT_TMPDIR/uefi"
     mkdir -p "$uefi_outdir"
 fi
@@ -2148,9 +2309,9 @@ if [[ $DRACUT_REPRODUCIBLE ]]; then
     fi
 fi
 
-[[ "$EUID" != 0 ]] && cpio_owner="0:0"
+[[ $EUID != 0 ]] && cpio_owner="0:0"
 
-if [[ $create_early_cpio = yes ]]; then
+if [[ $create_early_cpio == yes ]]; then
     echo 1 > "$early_cpio_dir/d/early_cpio"
 
     if [[ $DRACUT_REPRODUCIBLE ]]; then
@@ -2159,85 +2320,273 @@ if [[ $create_early_cpio = yes ]]; then
     fi
 
     # The microcode blob is _before_ the initramfs blob, not after
-    if ! (
-            umask 077; cd "$early_cpio_dir/d"
+    if [[ -n $enhanced_cpio ]]; then
+        if ! (
+            umask 077
+            cd "$early_cpio_dir/d"
+            find . -print0 | sort -z \
+                | $enhanced_cpio --null ${cpio_owner:+--owner "$cpio_owner"} \
+                    --mtime 0 --data-align "$cpio_align" --truncate-existing \
+                    "${DRACUT_TMPDIR}/initramfs.img"
+        ); then
+            dfatal "dracut-cpio: creation of $outfile failed"
+            exit 1
+        fi
+    else
+        if ! (
+            umask 077
+            cd "$early_cpio_dir/d"
             find . -print0 | sort -z \
                 | cpio ${CPIO_REPRODUCIBLE:+--reproducible} --null \
                     ${cpio_owner:+-R "$cpio_owner"} -H newc -o --quiet > "${DRACUT_TMPDIR}/initramfs.img"
         ); then
-        dfatal "dracut: creation of $outfile failed"
-        exit 1
+            dfatal "Creation of $outfile failed"
+            exit 1
+        fi
+    fi
+fi
+
+if check_kernel_config CONFIG_RD_ZSTD; then
+    DRACUT_KERNEL_RD_ZSTD=yes
+else
+    DRACUT_KERNEL_RD_ZSTD=
+fi
+
+if [[ $compress == $DRACUT_COMPRESS_ZSTD* && ! $DRACUT_KERNEL_RD_ZSTD ]]; then
+    dwarn "Kernel has no zstd support compiled in."
+    compress=
+fi
+
+if [[ $compress && $compress != cat ]]; then
+    if ! command -v "${compress%% *}" &> /dev/null; then
+        derror "Cannot execute compression command '$compress', falling back to default"
+        compress=
+    fi
+fi
+
+if ! [[ $compress ]]; then
+    # check all known compressors, if none specified
+    for i in $DRACUT_COMPRESS_PIGZ $DRACUT_COMPRESS_GZIP $DRACUT_COMPRESS_LZ4 $DRACUT_COMPRESS_LZOP $DRACUT_COMPRESS_ZSTD $DRACUT_COMPRESS_LZMA $DRACUT_COMPRESS_XZ $DRACUT_COMPRESS_LBZIP2 $DRACUT_COMPRESS_BZIP2 $DRACUT_COMPRESS_CAT; do
+        [[ $i != "$DRACUT_COMPRESS_ZSTD" || $DRACUT_KERNEL_RD_ZSTD ]] || continue
+        command -v "$i" &> /dev/null || continue
+        compress="$i"
+        break
+    done
+    if [[ $compress == cat ]]; then
+        dwarn "No compression tool available. Initramfs image is going to be big."
+    else
+        dinfo "Using auto-determined compression method '$compress'"
     fi
 fi
 
-if ! (
-        umask 077; cd "$initdir"
+# choose the right arguments for the compressor
+case $compress in
+    bzip2 | lbzip2)
+        if [[ $compress == lbzip2 ]] || command -v "$DRACUT_COMPRESS_LBZIP2" &> /dev/null; then
+            compress="$DRACUT_COMPRESS_LBZIP2 -9"
+        else
+            compress="$DRACUT_COMPRESS_BZIP2 -9"
+        fi
+        ;;
+    lzma)
+        compress="$DRACUT_COMPRESS_LZMA -9 -T0"
+        ;;
+    xz)
+        compress="$DRACUT_COMPRESS_XZ --check=crc32 --lzma2=dict=1MiB -T0"
+        ;;
+    gzip | pigz)
+        if [[ $compress == pigz ]] || command -v "$DRACUT_COMPRESS_PIGZ" &> /dev/null; then
+            compress="$DRACUT_COMPRESS_PIGZ -9 -n -T -R"
+        elif command -v gzip &> /dev/null && $DRACUT_COMPRESS_GZIP --help 2>&1 | grep -q rsyncable; then
+            compress="$DRACUT_COMPRESS_GZIP -n -9 --rsyncable"
+        else
+            compress="$DRACUT_COMPRESS_GZIP -n -9"
+        fi
+        ;;
+    lzo | lzop)
+        compress="$DRACUT_COMPRESS_LZOP -9"
+        ;;
+    lz4)
+        compress="$DRACUT_COMPRESS_LZ4 -l -9"
+        ;;
+    zstd)
+        compress="$DRACUT_COMPRESS_ZSTD -15 -q -T0"
+        ;;
+esac
+
+if [[ -n $enhanced_cpio ]]; then
+    if [[ $compress == "cat" ]]; then
+        # dracut-cpio appends by default, so any ucode remains
+        cpio_outfile="${DRACUT_TMPDIR}/initramfs.img"
+    else
+        ddebug "$compress compression enabled alongside cpio reflink"
+        # dracut-cpio doesn't output to stdout, so stage for compression
+        cpio_outfile="${DRACUT_TMPDIR}/initramfs.img.uncompressed"
+    fi
+
+    if ! (
+        umask 077
+        cd "$initdir"
+        find . -print0 | sort -z \
+            | $enhanced_cpio --null ${cpio_owner:+--owner "$cpio_owner"} \
+                --mtime 0 --data-align "$cpio_align" "$cpio_outfile" || exit 1
+        [[ $compress == "cat" ]] && exit 0
+        $compress < "$cpio_outfile" >> "${DRACUT_TMPDIR}/initramfs.img" \
+            && rm "$cpio_outfile"
+    ); then
+        dfatal "dracut-cpio: creation of $outfile failed"
+        exit 1
+    fi
+    unset cpio_outfile
+else
+    if ! (
+        umask 077
+        cd "$initdir"
         find . -print0 | sort -z \
             | cpio ${CPIO_REPRODUCIBLE:+--reproducible} --null ${cpio_owner:+-R "$cpio_owner"} -H newc -o --quiet \
             | $compress >> "${DRACUT_TMPDIR}/initramfs.img"
     ); then
-    dfatal "dracut: creation of $outfile failed"
-    exit 1
+        dfatal "Creation of $outfile failed"
+        exit 1
+    fi
 fi
 
-# shellcheck disable=SC2154
-if (( maxloglvl >= 5 )) && (( verbosity_mod_l >= 0 )); then
+if ((maxloglvl >= 5)) && ((verbosity_mod_l >= 0)); then
     if [[ $allowlocal ]]; then
-        "$dracutbasedir/lsinitrd.sh" "${DRACUT_TMPDIR}/initramfs.img"| ddebug
+        "$dracutbasedir/lsinitrd.sh" "${DRACUT_TMPDIR}/initramfs.img" | ddebug
     else
-        lsinitrd "${DRACUT_TMPDIR}/initramfs.img"| ddebug
+        lsinitrd "${DRACUT_TMPDIR}/initramfs.img" | ddebug
     fi
 fi
 
 umask 077
 
-if [[ $uefi = yes ]]; then
+SBAT_DEFAULT="sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md"
+sbat_out=$uefi_outdir/uki.sbat
+
+clean_sbat_string() {
+    local inp=$1
+    local temp=$uefi_outdir/temp.sbat
+    sed "/${SBAT_DEFAULT//\//\\/}/d" "$inp" > "$temp"
+    [[ -s $temp ]] && cat "$temp" >> "$sbat_out"
+    rm "$temp"
+}
+
+get_sbat_string() {
+    local inp=$1
+    local out=$uefi_outdir/$2
+    objcopy -O binary --only-section=.sbat "$inp" "$out"
+    clean_sbat_string "$out"
+}
+
+if [[ $uefi == yes ]]; then
     if [[ $kernel_cmdline ]]; then
         echo -n "$kernel_cmdline" > "$uefi_outdir/cmdline.txt"
-    elif [[ $hostonly_cmdline = yes ]] && [ -d "$initdir/etc/cmdline.d" ];then
-        for conf in "$initdir"/etc/cmdline.d/*.conf ; do
-            [ -e "$conf" ] || continue
-            printf "%s " "$(< "$conf")" >> "$uefi_outdir/cmdline.txt"
-        done
+    elif [[ $hostonly_cmdline == yes ]]; then
+        if [ -d "$initdir/etc/cmdline.d" ]; then
+            for conf in "$initdir"/etc/cmdline.d/*.conf; do
+                [ -e "$conf" ] || continue
+                printf "%s " "$(< "$conf")" >> "$uefi_outdir/cmdline.txt"
+            done
+        elif [ -e "/proc/cmdline" ]; then
+            printf "%s " "$(< "/proc/cmdline")" > "$uefi_outdir/cmdline.txt"
+        fi
     fi
 
-    if [[ $kernel_cmdline ]] || [[ $hostonly_cmdline = yes && -d "$initdir/etc/cmdline.d" ]]; then
+    offs=$(objdump -h "$uefi_stub" 2> /dev/null | gawk 'NF==7 {size=strtonum("0x"$3);
+                offset=strtonum("0x"$4)} END {print size + offset}')
+    if [[ $offs -eq 0 ]]; then
+        dfatal "Failed to get the size of $uefi_stub to create UEFI image file"
+        exit 1
+    fi
+    align=$(pe_get_section_align "$uefi_stub")
+    if [[ $? -eq 1 ]]; then
+        dfatal "Failed to get the SectionAlignment of the stub PE header to create the UEFI image file"
+        exit 1
+    fi
+    offs=$((offs + "$align" - offs % "$align"))
+    [[ -s $dracutsysrootdir/usr/lib/os-release ]] && uefi_osrelease="$dracutsysrootdir/usr/lib/os-release"
+    [[ -s $dracutsysrootdir/etc/os-release ]] && uefi_osrelease="$dracutsysrootdir/etc/os-release"
+    [[ -s $uefi_osrelease ]] \
+        && uefi_osrelease_offs=${offs} \
+        && offs=$((offs + $(stat -Lc%s "$uefi_osrelease"))) \
+        && offs=$((offs + "$align" - offs % "$align"))
+
+    if [[ $kernel_cmdline ]] || [[ $hostonly_cmdline == yes && -e "${uefi_outdir}/cmdline.txt" ]]; then
         echo -ne "\x00" >> "$uefi_outdir/cmdline.txt"
         dinfo "Using UEFI kernel cmdline:"
         dinfo "$(tr -d '\000' < "$uefi_outdir/cmdline.txt")"
         uefi_cmdline="${uefi_outdir}/cmdline.txt"
+        uefi_cmdline_offs=${offs}
+        offs=$((offs + $(stat -Lc%s "$uefi_cmdline")))
+        offs=$((offs + "$align" - offs % "$align"))
     else
         unset uefi_cmdline
     fi
 
-    [[ -s $dracutsysrootdir/usr/lib/os-release ]] && uefi_osrelease="$dracutsysrootdir/usr/lib/os-release"
-    [[ -s $dracutsysrootdir/etc/os-release ]] && uefi_osrelease="$dracutsysrootdir/etc/os-release"
     if [[ -s ${dracutsysrootdir}${uefi_splash_image} ]]; then
         uefi_splash_image="${dracutsysrootdir}${uefi_splash_image}"
+        uefi_splash_offs=${offs}
+        offs=$((offs + $(stat -Lc%s "$uefi_splash_image")))
+        offs=$((offs + "$align" - offs % "$align"))
     else
         unset uefi_splash_image
     fi
 
+    echo "$SBAT_DEFAULT" > "$sbat_out"
+    if [[ -n $sbat ]]; then
+        echo "$sbat" | sed "/${SBAT_DEFAULT//\//\\/}/d" >> "$sbat_out"
+    fi
+    get_sbat_string "$kernel_image" kernel.sbat
+    get_sbat_string "$uefi_stub" stub.sbat
+
+    uefi_sbat_offs="${offs}"
+    offs=$((offs + $(stat -Lc%s "$sbat_out")))
+    offs=$((offs + "$align" - offs % "$align"))
+    uefi_linux_offs="${offs}"
+    offs=$((offs + $(stat -Lc%s "$kernel_image")))
+    offs=$((offs + "$align" - offs % "$align"))
+    uefi_initrd_offs="${offs}"
+
+    base_image=$(pe_get_image_base "$uefi_stub")
+    if [[ $? -eq 1 ]]; then
+        dfatal "Failed to get ImageBase data of $uefi_stub to create UEFI image file"
+        exit 1
+    fi
+
+    tmp_uefi_stub=$uefi_outdir/elf.stub
+    cp "$uefi_stub" "$tmp_uefi_stub"
+    objcopy --remove-section .sbat "$tmp_uefi_stub" &> /dev/null
+
     if objcopy \
-           ${uefi_osrelease:+--add-section .osrel="$uefi_osrelease" --change-section-vma .osrel=0x20000} \
-           ${uefi_cmdline:+--add-section .cmdline="$uefi_cmdline" --change-section-vma .cmdline=0x30000} \
-           ${uefi_splash_image:+--add-section .splash="$uefi_splash_image" --change-section-vma .splash=0x40000} \
-           --add-section .linux="$kernel_image" --change-section-vma .linux=0x2000000 \
-           --add-section .initrd="${DRACUT_TMPDIR}/initramfs.img" --change-section-vma .initrd=0x3000000 \
-           "$uefi_stub" "${uefi_outdir}/linux.efi"; then
-        if [[ -n "${uefi_secureboot_key}" && -n "${uefi_secureboot_cert}" ]]; then \
+        ${uefi_osrelease:+--add-section .osrel="$uefi_osrelease" --change-section-vma .osrel=$(printf 0x%x "$uefi_osrelease_offs")} \
+        ${uefi_cmdline:+--add-section .cmdline="$uefi_cmdline" --change-section-vma .cmdline=$(printf 0x%x "$uefi_cmdline_offs")} \
+        ${uefi_splash_image:+--add-section .splash="$uefi_splash_image" --change-section-vma .splash=$(printf 0x%x "$uefi_splash_offs")} \
+        --add-section .sbat="$sbat_out" --change-section-vma .sbat="$(printf 0x%x "$uefi_sbat_offs")" \
+        --add-section .linux="$kernel_image" --change-section-vma .linux="$(printf 0x%x "$uefi_linux_offs")" \
+        --add-section .initrd="${DRACUT_TMPDIR}/initramfs.img" --change-section-vma .initrd="$(printf 0x%x "$uefi_initrd_offs")" \
+        --image-base="$(printf 0x%x "$base_image")" \
+        "$tmp_uefi_stub" "${uefi_outdir}/linux.efi"; then
+        if [[ -n ${uefi_secureboot_key} && -n ${uefi_secureboot_cert} ]]; then
             if sbsign \
-                    --key "${uefi_secureboot_key}" \
-                    --cert "${uefi_secureboot_cert}" \
-                    --output "$outfile" "${uefi_outdir}/linux.efi"; then
+                ${uefi_secureboot_engine:+--engine "$uefi_secureboot_engine"} \
+                --key "${uefi_secureboot_key}" \
+                --cert "${uefi_secureboot_cert}" \
+                --output "$outfile" "${uefi_outdir}/linux.efi" \
+                && sbverify --cert "${uefi_secureboot_cert}" "$outfile" > /dev/null 2>&1; then
                 dinfo "*** Creating signed UEFI image file '$outfile' done ***"
             else
+                rm -f -- "$outfile"
                 dfatal "*** Creating signed UEFI image file '$outfile' failed ***"
                 exit 1
             fi
         else
             if cp --reflink=auto "${uefi_outdir}/linux.efi" "$outfile"; then
                 dinfo "*** Creating UEFI image file '$outfile' done ***"
+            else
+                rm -f -- "$outfile"
+                dfatal "Creation of $outfile failed"
+                exit 1
             fi
         fi
     else
@@ -2250,13 +2599,11 @@ else
         dinfo "*** Creating initramfs image file '$outfile' done ***"
     else
         rm -f -- "$outfile"
-        dfatal "dracut: creation of $outfile failed"
+        dfatal "Creation of $outfile failed"
         exit 1
     fi
 fi
 
-command -v restorecon &>/dev/null && restorecon -- "$outfile"
-
 btrfs_uuid() {
     btrfs filesystem show "$1" | sed -n '1s/^.*uuid: //p'
 }
@@ -2272,7 +2619,7 @@ freeze_ok_for_btrfs() {
     mnt=$(stat -c %m -- "$1")
     uuid1=$(btrfs_uuid "$mnt")
     uuid2=$(btrfs_uuid "/")
-    [[ "$uuid1" && "$uuid2" && "$uuid1" != "$uuid2" ]]
+    [[ $uuid1 && $uuid2 && $uuid1 != "$uuid2" ]]
 }
 
 freeze_ok_for_fstype() {
@@ -2283,11 +2630,20 @@ freeze_ok_for_fstype() {
     fstype=$(stat -f -c %T -- "$outfile")
     case $fstype in
         msdos)
-            return 1;;
+            return 1
+            ;;
+        zfs)
+            return 1
+            ;;
+        tmpfs)
+            return 1
+            ;;
         btrfs)
-            freeze_ok_for_btrfs "$outfile";;
+            freeze_ok_for_btrfs "$outfile"
+            ;;
         *)
-            return 0;;
+            return 0
+            ;;
     esac
 }
 
@@ -2298,15 +2654,15 @@ freeze_ok_for_fstype() {
 # globally.  See e.g. https://github.com/ostreedev/ostree/commit/8642ef5ab3fec3ac8eb8f193054852f83a8bc4d0
 if [[ -d $dracutsysrootdir/run/systemd/system ]]; then
     if ! sync "$outfile" 2> /dev/null; then
-        dinfo "dracut: sync operation on newly created initramfs $outfile failed"
+        dinfo "sync operation on newly created initramfs $outfile failed"
         exit 1
     fi
 
     # use fsfreeze only if we're not writing to /
     if [[ "$(stat -c %m -- "$outfile")" != "/" ]] && freeze_ok_for_fstype "$outfile"; then
         FSFROZEN="$(dirname "$outfile")"
-        if ! (fsfreeze -f "${FSFROZEN}" 2>/dev/null && fsfreeze -u "${FSFROZEN}" 2>/dev/null); then
-            dinfo "dracut: warning: could not fsfreeze $(dirname "$outfile")"
+        if ! (fsfreeze -f "${FSFROZEN}" 2> /dev/null && fsfreeze -u "${FSFROZEN}" 2> /dev/null); then
+            dwarn "Could not fsfreeze $(dirname "$outfile")"
         fi
         unset FSFROZEN
     fi