diff options
| author | zdc <zdc@users.noreply.github.com> | 2021-03-18 17:53:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 17:53:11 +0200 |
| commit | 9567e74b856331e24149158eda302b0bf1cbc47a (patch) | |
| tree | 577c07b3d85f531ce6704e367c4a29f6e9a2427e /roles/install-grub/templates | |
| parent | c084415cff751d488d1460e58203ade538aea754 (diff) | |
| parent | c3cd4a20671b5a1313b5eb8e534fd8d1cf67db9f (diff) | |
| download | vyos-vm-images-9567e74b856331e24149158eda302b0bf1cbc47a.tar.gz vyos-vm-images-9567e74b856331e24149158eda302b0bf1cbc47a.zip | |
Merge pull request #13 from zdc/current
Multiple build improvements
Diffstat (limited to 'roles/install-grub/templates')
| -rw-r--r-- | roles/install-grub/templates/boot/grub/device.map.j2 | 1 | ||||
| -rw-r--r-- | roles/install-grub/templates/boot/grub/grub.cfg.j2 | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/roles/install-grub/templates/boot/grub/device.map.j2 b/roles/install-grub/templates/boot/grub/device.map.j2 deleted file mode 100644 index e14205e..0000000 --- a/roles/install-grub/templates/boot/grub/device.map.j2 +++ /dev/null @@ -1 +0,0 @@ -(hd0) /dev/sda diff --git a/roles/install-grub/templates/boot/grub/grub.cfg.j2 b/roles/install-grub/templates/boot/grub/grub.cfg.j2 index 45aec3b..e16194d 100644 --- a/roles/install-grub/templates/boot/grub/grub.cfg.j2 +++ b/roles/install-grub/templates/boot/grub/grub.cfg.j2 @@ -11,21 +11,21 @@ insmod efi_gop insmod efi_uga menuentry "VyOS {{ vyos_version }} for {{ vyos_platform }} (KVM console)" { - linux /boot/{{ vyos_version }}/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{{ vyos_version }} console=ttyS0 console=tty0 + 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 }} for {{ vyos_platform }} (Serial console)" { - linux /boot/{{ vyos_version }}/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{{ vyos_version }} console=tty0 console=ttyS0 + linux /boot/{{ vyos_version }}/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{{ vyos_version }} console=ttyS0 initrd /boot/{{ vyos_version }}/initrd.img } menuentry "VyOS {{ vyos_version }} for {{ vyos_platform }} - 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=ttyS0 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset + 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 }} for {{ vyos_platform }} - 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=tty0 console=ttyS0 init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot/{{ vyos_version }}/vmlinuz boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/{{ vyos_version }} console=ttyS0 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot/{{ vyos_version }}/initrd.img } |