diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:33:11 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:33:11 +0000 |
| commit | 203af7302854f453fa4a05ecefd4403b6c8a4f8d (patch) | |
| tree | 967fdacafe332baabd12b57725505c138d0f3bbf /modules.d/95rootfs-block | |
| parent | Adding upstream version 102. (diff) | |
| download | dracut-upstream.tar.xz dracut-upstream.zip | |
Adding upstream version 103.upstream/103upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'modules.d/95rootfs-block')
| -rwxr-xr-x | modules.d/95rootfs-block/module-setup.sh | 2 | ||||
| -rwxr-xr-x | modules.d/95rootfs-block/mount-root.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules.d/95rootfs-block/module-setup.sh b/modules.d/95rootfs-block/module-setup.sh index 396fb11..943db48 100755 --- a/modules.d/95rootfs-block/module-setup.sh +++ b/modules.d/95rootfs-block/module-setup.sh @@ -40,7 +40,7 @@ cmdline_rootfs() { return fi - if [ -n "$_block" -a -b "$_dev" ]; then + if [ -n "$_block" ] && [ -b "$_dev" ]; then printf " root=%s" "$(shorten_persistent_dev "$(get_persistent_dev "$_dev")")" fi _fstype="$(find_mp_fstype /)" diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh index 973069b..5bb6f0f 100755 --- a/modules.d/95rootfs-block/mount-root.sh +++ b/modules.d/95rootfs-block/mount-root.sh @@ -98,7 +98,7 @@ mount_root() { # printf '%s %s %s %s 1 1 \n' "$esc_root" "$NEWROOT" "$rootfs" "$rflags" >/etc/fstab if ! getargbool 0 ro && fsck_able "$rootfs" \ - && [ "$rootfsck" != "0" -a -z "$fastboot" ] \ + && [ "$rootfsck" != "0" ] && [ -z "$fastboot" ] \ && ! strstr "${rflags}" _netdev \ && ! getargbool 0 rd.skipfsck; then umount "$NEWROOT" @@ -121,6 +121,6 @@ mount_root() { fi } -if [ -n "$root" -a -z "${root%%block:*}" ]; then +if [ -n "$root" ] && [ -z "${root%%block:*}" ]; then mount_root fi |