From fa050ae95aa8f2a2c8052e42119ca938b4137981 Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 31 May 2021 16:29:02 +0200 Subject: [PATCH] Proper spacing in cmdline; no root= needed for zfs --- scripts/main.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/main.sh b/scripts/main.sh index 8e57ffd..4dfbd25 100644 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -146,14 +146,14 @@ function generate_initramfs() { } function get_cmdline() { - local root_line - if [[ $USED_ZFS == "true" ]]; then - root_line="root=zfs:AUTO" - else - root_line="root=UUID=$(get_blkid_uuid_for_id "$DISK_ID_ROOT")" + local cmdline=("rd.vconsole.keymap=$KEYMAP_INITRAMFS") + cmdline+=("${DISK_DRACUT_CMDLINE[@]}") + + if [[ $USED_ZFS != "true" ]]; then + cmdline+=("root=UUID=$(get_blkid_uuid_for_id "$DISK_ID_ROOT")") fi - echo -n "rd.vconsole.keymap=$KEYMAP_INITRAMFS ${DISK_DRACUT_CMDLINE[*]} $root_line" + echo -n "${cmdline[*]}" } function install_kernel_efi() {