X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-iank;h=b0392278c97b34e6976d5323805926e8207583ea;hp=485175fb7c370cb0670257606ae6b861ea8147ff;hb=45a2a286083772abc0688e663a6ecc68af0a8d0e;hpb=cf3b64c21818d0033ffe5447d30e45141c81ee1b diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank index 485175f..b039227 100755 --- a/fai/config/scripts/GRUB_PC/11-iank +++ b/fai/config/scripts/GRUB_PC/11-iank @@ -138,14 +138,12 @@ if [[ $FAI_ACTION != dirinstall ]]; then # luks options, see man systemd-cryptsetup-generator # all i know is that with luks.crypttab=no, swap still timed out on boot. # and with rd.luks.crypttab=no, it works. - cmdline="rd.luks.crypttab=no console=ttyS0 net.ifnames=0" if ifclass LINODE; then speed=19200 - cmdline+=",${speed}n8" - cmdline="rd.luks.crypttab=no console=ttyS0,${speed}n8" + cmdline="rd.luks.crypttab=no net.ifnames=0 console=ttyS0,${speed}n8" else speed=115200 - cmdline+=",${speed}n8 console=tty0" + cmdline="rd.luks.crypttab=no net.ifnames=0 console=ttyS0,${speed}n8 console=tty0" fi cat >$FAI_ROOT/etc/grub.d/40_custom <