Update splash screen and minor cleanups.

Note: Resolved merge conflict

Split from commit 31296c60 from Svenstaro branch

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>

3 files changed, 27 insertions, 23 deletions

diff --git a/configs/syslinux-iso/boot-files/isolinux/background.png b/configs/syslinux-iso/boot-files/isolinux/background.png
deleted file mode 100644
index f7acd7c..0000000
--- a/configs/syslinux-iso/boot-files/isolinux/background.png
+++ /dev/null
diff --git a/configs/syslinux-iso/boot-files/isolinux/help.msg b/configs/syslinux-iso/boot-files/isolinux/help.msg
deleted file mode 100644
index d2e749c..0000000
--- a/configs/syslinux-iso/boot-files/isolinux/help.msg
+++ /dev/null
@@ -1,16 +0,0 @@
-splashsmall.rle
-                         0e2009.0107
-
-Troubleshooting, Help:
-----------------------------------
-Problem with your IDE drives? Try booting the 0earchide07 image.
-
-Usefull kernelparameters in case of trouble:
-0eacpi=off07
-0enoapic07
-0epci=routeirq07
-Append these to the available flavors, ex. arch noapic
-
-
-0eF107 -> Start screen, 0eF207 -> Boot options
-
diff --git a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg
index 821dd5b..51b52ae 100644
--- a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg
+++ b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg
@@ -1,6 +1,6 @@
 DEFAULT vesamenu.c32
 PROMPT 0
-MENU TITLE Arch Linux YYY XXX
+MENU TITLE Arch Linux
 MENU BACKGROUND /boot/splash.png
 TIMEOUT 3000
 
@@ -11,10 +11,13 @@ F3 help.txt
 
 MENU WIDTH 78
 MENU MARGIN 4
-MENU ROWS 5
-MENU VSHIFT 2
-MENU HELPMSGROW 22
-MENU HELPMSGENDROW 24
+MENU ROWS 6
+MENU VSHIFT 10
+MENU TIMEOUTROW 13
+MENU TABMSGROW 11
+MENU CMDLINEROW 11
+MENU HELPMSGROW 16
+MENU HELPMSGENDROW 29
 
 # Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu
 
@@ -30,11 +33,28 @@ MENU COLOR tabmsg       31;40   #30ffffff #00000000 std
 
 LABEL arch
 TEXT HELP
-Put some silly text in here will you
+Boot the Arch Linux live medium. It allows you to install Arch Linux or
+perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux
 KERNEL /boot/vmlinuz26
-APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX tmpfs_size=75% initrd=/boot/archiso.img radeon.modeset=0
+APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX tmpfs_size=75% initrd=/boot/archiso.img
+
+LABEL normal
+TEXT HELP
+Continue normal booting procedure.
+ENDTEXT
+MENU LABEL Boot normally
+LOCALBOOT
+
+LABEL existing
+TEXT HELP
+Boot an existing operating system. Press TAB to edit the disk and partition
+number to boot.
+ENDTEXT
+MENU LABEL Boot existing OS
+KERNEL chain.c32
+APPEND hd0 0
 
 # http://www.memtest.org/
 LABEL memtest