[arch-releng] [PATCH 2/4] [configs/*] syslinux: Use UI instead of DEFAULT for *menu.c32

Gerardo Exequiel Pozzi vmlinuz386 at yahoo.com.ar
Thu Dec 1 22:45:20 EST 2011


* UI is more correct than DEFAULT for simple menu system.
* Use DEFAULT instead of ONTIMEOUT
* Remove PROMPT 0, this is the default value.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
 configs/baseline/syslinux/syslinux.cfg        |    6 ++----
 configs/releng/syslinux.dual/archiso_head.cfg |    4 ++--
 configs/releng/syslinux.dual/archiso_tail.cfg |    2 --
 configs/releng/syslinux/archiso_head.cfg      |    4 ++--
 configs/releng/syslinux/archiso_tail.cfg      |    2 --
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index 5ae9823..c9632d8 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -1,5 +1,5 @@
-DEFAULT menu.c32
-PROMPT 0
+UI menu.c32
+DEFAULT arch
 MENU TITLE Arch Linux
 TIMEOUT 300
 
@@ -8,5 +8,3 @@ MENU LABEL Arch Linux
 LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz
 INITRD /%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
-
-ONTIMEOUT arch
diff --git a/configs/releng/syslinux.dual/archiso_head.cfg b/configs/releng/syslinux.dual/archiso_head.cfg
index 929872e..6e8710e 100644
--- a/configs/releng/syslinux.dual/archiso_head.cfg
+++ b/configs/releng/syslinux.dual/archiso_head.cfg
@@ -1,6 +1,6 @@
 SERIAL 0 38400
-DEFAULT boot/syslinux/vesamenu.c32
-PROMPT 0
+UI boot/syslinux/vesamenu.c32
+DEFAULT arch32
 MENU TITLE Arch Linux
 MENU BACKGROUND boot/syslinux/splash.png
 TIMEOUT 3000
diff --git a/configs/releng/syslinux.dual/archiso_tail.cfg b/configs/releng/syslinux.dual/archiso_tail.cfg
index a2040d1..a55548c 100644
--- a/configs/releng/syslinux.dual/archiso_tail.cfg
+++ b/configs/releng/syslinux.dual/archiso_tail.cfg
@@ -25,5 +25,3 @@ COM32 boot/syslinux/reboot.c32
 LABEL poweroff
 MENU LABEL Power Off
 COMBOOT boot/syslinux/poweroff.com
-
-ONTIMEOUT arch32
diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg
index d9dee2e..f9b871d 100644
--- a/configs/releng/syslinux/archiso_head.cfg
+++ b/configs/releng/syslinux/archiso_head.cfg
@@ -1,6 +1,6 @@
 SERIAL 0 38400
-DEFAULT boot/syslinux/vesamenu.c32
-PROMPT 0
+UI boot/syslinux/vesamenu.c32
+DEFAULT arch
 MENU TITLE Arch Linux
 MENU BACKGROUND boot/syslinux/splash.png
 TIMEOUT 3000
diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg
index 984aace..a55548c 100644
--- a/configs/releng/syslinux/archiso_tail.cfg
+++ b/configs/releng/syslinux/archiso_tail.cfg
@@ -25,5 +25,3 @@ COM32 boot/syslinux/reboot.c32
 LABEL poweroff
 MENU LABEL Power Off
 COMBOOT boot/syslinux/poweroff.com
-
-ONTIMEOUT arch
-- 
1.7.7.4



More information about the arch-releng mailing list