diff options
| author | zsdc <taras@vyos.io> | 2023-10-10 13:25:41 +0300 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2023-10-11 17:02:01 +0300 |
| commit | 58c09bf858ab354dbadd890dfee53c5c933f70f4 (patch) | |
| tree | 785aedf522d149760d2668436ea69f7a9c2ea7eb /cloudinit | |
| parent | 5e86cd5768b5ac85a189d9df856ee7c0b0f65c7d (diff) | |
| download | vyos-cloud-init-58c09bf858ab354dbadd890dfee53c5c933f70f4.tar.gz vyos-cloud-init-58c09bf858ab354dbadd890dfee53c5c933f70f4.zip | |
vyos_install: T5220: Fixed GRUB template
Without at least one space at the beginning of the line with `linux`, it cannot
be parsed by the `show system image` command.
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/config/cc_vyos_install.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cloudinit/config/cc_vyos_install.py b/cloudinit/config/cc_vyos_install.py index b41403c3..c544c336 100644 --- a/cloudinit/config/cc_vyos_install.py +++ b/cloudinit/config/cc_vyos_install.py @@ -264,23 +264,23 @@ def grub_configure(grub_dir: str, vyos_version: str, terminal_input --append serial console menuentry "VyOS { vyos_version } (KVM console)" {{ - linux /boot/{ vyos_version }/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{ vyos_version } console=tty0 - initrd /boot/{ vyos_version }/initrd.img + linux /boot/{ vyos_version }/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{ vyos_version } console=tty0 + initrd /boot/{ vyos_version }/initrd.img }} menuentry "VyOS { vyos_version } (Serial console)" {{ - linux /boot/{ vyos_version }/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{ vyos_version } console=ttyS{boot_params['serial_console_num']},{boot_params['serial_console_speed']} - initrd /boot/{ vyos_version }/initrd.img + linux /boot/{ vyos_version }/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{ vyos_version } console=ttyS{boot_params['serial_console_num']},{boot_params['serial_console_speed']} + initrd /boot/{ vyos_version }/initrd.img }} menuentry "VyOS { vyos_version } - password reset (KVM console)" {{ - linux /boot/{ vyos_version }/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{ vyos_version } console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset - initrd /boot/{ vyos_version }/initrd.img + linux /boot/{ vyos_version }/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{ vyos_version } console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset + initrd /boot/{ vyos_version }/initrd.img }} menuentry "VyOS { vyos_version } - password reset (Serial console)" {{ - linux /boot/{ vyos_version }/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{ vyos_version } console=ttyS{boot_params['serial_console_num']},{boot_params['serial_console_speed']} init=/opt/vyatta/sbin/standalone_root_pw_reset - initrd /boot/{ vyos_version }/initrd.img + linux /boot/{ vyos_version }/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{ vyos_version } console=ttyS{boot_params['serial_console_num']},{boot_params['serial_console_speed']} init=/opt/vyatta/sbin/standalone_root_pw_reset + initrd /boot/{ vyos_version }/initrd.img }} ''') |