summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-12-02 00:44:02 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-12-02 14:12:11 -0300
commit7cb67d42fa7784e97648d7eb81f1947c82e8024d (patch)
tree77daa75652a5f8305ab2ce1aaaa05820aed098cb
parent7c83ce219a8e27cbe46319bce6a608b60cfe53db (diff)
[configs/*] syslinux: Use UI instead of DEFAULT for *menu.c32
* UI is more correct than DEFAULT for simple menu system. * Remove TIMEOUT * Remove PROMPT 0, this is the default value. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rw-r--r--configs/baseline/syslinux/syslinux.cfg6
-rw-r--r--configs/releng/syslinux.dual/archiso_head.cfg5
-rw-r--r--configs/releng/syslinux.dual/archiso_tail.cfg2
-rw-r--r--configs/releng/syslinux/archiso_head.cfg5
-rw-r--r--configs/releng/syslinux/archiso_tail.cfg2
5 files changed, 3 insertions, 17 deletions
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index 5ae9823..df63af6 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -1,12 +1,8 @@
-DEFAULT menu.c32
-PROMPT 0
+UI menu.c32
MENU TITLE Arch Linux
-TIMEOUT 300
LABEL arch
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..91d6e21 100644
--- a/configs/releng/syslinux.dual/archiso_head.cfg
+++ b/configs/releng/syslinux.dual/archiso_head.cfg
@@ -1,15 +1,12 @@
SERIAL 0 38400
-DEFAULT boot/syslinux/vesamenu.c32
-PROMPT 0
+UI boot/syslinux/vesamenu.c32
MENU TITLE Arch Linux
MENU BACKGROUND boot/syslinux/splash.png
-TIMEOUT 3000
MENU WIDTH 78
MENU MARGIN 4
MENU ROWS 7
MENU VSHIFT 10
-MENU TIMEOUTROW 13
MENU TABMSGROW 11
MENU CMDLINEROW 11
MENU HELPMSGROW 16
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..508373d 100644
--- a/configs/releng/syslinux/archiso_head.cfg
+++ b/configs/releng/syslinux/archiso_head.cfg
@@ -1,15 +1,12 @@
SERIAL 0 38400
-DEFAULT boot/syslinux/vesamenu.c32
-PROMPT 0
+UI boot/syslinux/vesamenu.c32
MENU TITLE Arch Linux
MENU BACKGROUND boot/syslinux/splash.png
-TIMEOUT 3000
MENU WIDTH 78
MENU MARGIN 4
MENU ROWS 6
MENU VSHIFT 10
-MENU TIMEOUTROW 13
MENU TABMSGROW 11
MENU CMDLINEROW 11
MENU HELPMSGROW 16
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