From 5634a31156070487210a8e362e8f088c5c4dc615 Mon Sep 17 00:00:00 2001 From: Xunlei Pang Date: Fri, 18 Aug 2017 10:40:27 +0800 Subject: [PATCH] rootfs-block/module-setup.sh: check root_devs in cmdline_rootfs() In case of "--no-hostonly-default-device", we do not need the root device, thus add this check. Also fixed the stale "root_dev" export. Signed-off-by: Xunlei Pang --- dracut.sh | 2 +- modules.d/95rootfs-block/module-setup.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh index 8d7ee70ae..681a6b7ac 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1307,7 +1307,7 @@ export initdir dracutbasedir \ dracutmodules force_add_dracutmodules add_dracutmodules omit_dracutmodules \ mods_to_load \ fw_dir drivers_dir debug no_kernel kernel_only \ - omit_drivers mdadmconf lvmconf root_dev \ + 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 \ diff --git a/modules.d/95rootfs-block/module-setup.sh b/modules.d/95rootfs-block/module-setup.sh index 2b06bac23..987373b4f 100755 --- a/modules.d/95rootfs-block/module-setup.sh +++ b/modules.d/95rootfs-block/module-setup.sh @@ -32,6 +32,12 @@ cmdline_journal() { cmdline_rootfs() { local _dev=/dev/block/$(find_root_block_device) local _fstype _flags _subvol + + # "--no-hostonly-default-device" can result in empty root_devs + if [ "${#root_devs[@]}" -eq 0 ]; then + return + fi + if [ -e $_dev ]; then printf " root=%s" "$(shorten_persistent_dev "$(get_persistent_dev "$_dev")")" _fstype="$(find_mp_fstype /)" -- 2.47.2