summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjnqnfe <jnqnfe@gmail.com>2015-01-28 04:19:36 +0000
committerLyndon Brown <jnqnfe@gmail.com>2020-03-22 19:43:56 +0000
commita25b77e0998ac455b48c8c523a08bd282229fb49 (patch)
treed37975cec81d2e71499bed9ffca2ca4b1bf827dc
parent49047f05636b3aa95faf70b537ae96fa580f8194 (diff)
downloadvyos-live-build-a25b77e0998ac455b48c8c523a08bd282229fb49.tar.gz
vyos-live-build-a25b77e0998ac455b48c8c523a08bd282229fb49.zip
bootloaders: remove old "video=vesa:ywrap,mtrr" kernel param, as done in d-i
d-i removed this in commit 0917b2dde3ff73a204d27dd2f2fffc8a41175ddd Note: There was inconsistency between grub and syslinux in use of this, with syslinux not having it on graphical rescue and auto modes while grub entries did. The patch to fix that has been dropped since we're removing it everywhere anyway. (#395040) Gbp-Dch: Short
Diffstat
-rwxr-xr-xscripts/build/binary_grub-legacy2
-rwxr-xr-xscripts/build/binary_loopback_cfg2
-rw-r--r--share/bootloaders/extlinux/install_gui.cfg8
-rw-r--r--share/bootloaders/isolinux/install_gui.cfg8
-rw-r--r--share/bootloaders/pxelinux/install_gui.cfg8
-rw-r--r--share/bootloaders/syslinux/install_gui.cfg8
6 files changed, 18 insertions, 18 deletions
diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy
index 80d81e83b..7d801b5fc 100755
--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@@ -178,7 +178,7 @@ then
VMLINUZ_GI="install/gtk/vmlinuz"
INITRD_GI="install/gtk/initrd.gz"
- APPEND_GI="video=vesa:ywrap,mtrr vga=788"
+ APPEND_GI="vga=788"
if [ -f "binary/${VMLINUZ_GI}" ] && [ -f "binary/${INITRD_GI}" ]
then
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg
index 13a15d6fe..51ef82fd7 100755
--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@@ -237,7 +237,7 @@ then
KERNEL_GI="/install/gtk/vmlinuz"
INITRD_GI="/install/gtk/initrd.gz"
- APPEND_GI="video=vesa:ywrap,mtrr vga=788 ${LB_BOOTAPPEND_INSTALL} --- quiet"
+ APPEND_GI="vga=788 ${LB_BOOTAPPEND_INSTALL} --- quiet"
if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]; then
Grub_install_entry "Start installer" "installgui" "${KERNEL_GI}" "${INITRD_GI}" "${APPEND_GI}"
diff --git a/share/bootloaders/extlinux/install_gui.cfg b/share/bootloaders/extlinux/install_gui.cfg
index 4fabe0587..9c660200a 100644
--- a/share/bootloaders/extlinux/install_gui.cfg
+++ b/share/bootloaders/extlinux/install_gui.cfg
@@ -12,7 +12,7 @@ menu begin install
menu title Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append vga=788 @APPEND_INSTALL@ --- quiet
label install
menu label ^Install
@@ -35,21 +35,21 @@ menu begin install
menu title Graphical expert install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append priority=low video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@
+ append priority=low vga=788 @APPEND_INSTALL@
label rescuegui
menu label Graphical ^rescue mode
menu title Graphical rescue mode
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append rescue/enable=true video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label autogui
menu label Graphical ^automated install
menu title Graphical automated install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append auto=true priority=critical video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label expert
menu label Expert install
diff --git a/share/bootloaders/isolinux/install_gui.cfg b/share/bootloaders/isolinux/install_gui.cfg
index 4fabe0587..9c660200a 100644
--- a/share/bootloaders/isolinux/install_gui.cfg
+++ b/share/bootloaders/isolinux/install_gui.cfg
@@ -12,7 +12,7 @@ menu begin install
menu title Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append vga=788 @APPEND_INSTALL@ --- quiet
label install
menu label ^Install
@@ -35,21 +35,21 @@ menu begin install
menu title Graphical expert install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append priority=low video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@
+ append priority=low vga=788 @APPEND_INSTALL@
label rescuegui
menu label Graphical ^rescue mode
menu title Graphical rescue mode
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append rescue/enable=true video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label autogui
menu label Graphical ^automated install
menu title Graphical automated install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append auto=true priority=critical video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label expert
menu label Expert install
diff --git a/share/bootloaders/pxelinux/install_gui.cfg b/share/bootloaders/pxelinux/install_gui.cfg
index 4fabe0587..9c660200a 100644
--- a/share/bootloaders/pxelinux/install_gui.cfg
+++ b/share/bootloaders/pxelinux/install_gui.cfg
@@ -12,7 +12,7 @@ menu begin install
menu title Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append vga=788 @APPEND_INSTALL@ --- quiet
label install
menu label ^Install
@@ -35,21 +35,21 @@ menu begin install
menu title Graphical expert install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append priority=low video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@
+ append priority=low vga=788 @APPEND_INSTALL@
label rescuegui
menu label Graphical ^rescue mode
menu title Graphical rescue mode
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append rescue/enable=true video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label autogui
menu label Graphical ^automated install
menu title Graphical automated install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append auto=true priority=critical video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label expert
menu label Expert install
diff --git a/share/bootloaders/syslinux/install_gui.cfg b/share/bootloaders/syslinux/install_gui.cfg
index 4fabe0587..9c660200a 100644
--- a/share/bootloaders/syslinux/install_gui.cfg
+++ b/share/bootloaders/syslinux/install_gui.cfg
@@ -12,7 +12,7 @@ menu begin install
menu title Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append vga=788 @APPEND_INSTALL@ --- quiet
label install
menu label ^Install
@@ -35,21 +35,21 @@ menu begin install
menu title Graphical expert install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append priority=low video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@
+ append priority=low vga=788 @APPEND_INSTALL@
label rescuegui
menu label Graphical ^rescue mode
menu title Graphical rescue mode
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append rescue/enable=true video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
label autogui
menu label Graphical ^automated install
menu title Graphical automated install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
- append auto=true priority=critical video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label expert
menu label Expert install
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 16:13:26 +0000