From 2416f963adb4ff8dadbbc734e7ade07ff093cb53 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 13 Nov 2024 14:27:55 -0600 Subject: image-tools: T6864: keep file necessary for compat add image Revert "T1416: remove deprecated default-union-grub-entry" This reverts commit d50707bb295dbd4bc50e3d0301fc8be605448429. The file grub/default-union-grub-entry and its companion install-image/postinst are needed for 'compatibility-mode' upgrades: when upgrading from a system with legacy image-tools, those two files are expected to exist in the mounted image of the target iso. --- .../opt/vyatta/etc/grub/default-union-grub-entry | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry (limited to 'data') diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry new file mode 100644 index 00000000..49f4afc4 --- /dev/null +++ b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry @@ -0,0 +1,20 @@ +menuentry "VyOS (KVM console)" { + linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=ttyS0,115200 console=tty0 + initrd /boot//initrd.img +} + +menuentry "VyOS (Serial console)" { + linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=tty0 console=ttyS0,115200 + initrd /boot//initrd.img +} + +menuentry "Lost password change (KVM console)" { + linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=ttyS0,115200 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset + initrd /boot//initrd.img +} + +menuentry "Lost password change (Serial console)" { + linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=tty0 console=ttyS0,115200 init=/opt/vyatta/sbin/standalone_root_pw_reset + initrd /boot//initrd.img +} + -- cgit v1.2.3