summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-12-03 18:20:43 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-12-04 17:18:06 -0300
commitdceb5a029fa1146d4b8030de9d589e4a258eb80a (patch)
treebed289d919cad68b04909e5d449443fad9939a85 /configs
parent9ca157c14073f672effb6e13f9f2c0413fe42008 (diff)
downloadarchiso32-dceb5a029fa1146d4b8030de9d589e4a258eb80a.tar.xz
[archiso] Rename archiso_curl_url= to archiso_http_srv=
Also rename curlspace_size= to archiso_http_spc= Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'configs')
-rw-r--r--configs/releng/syslinux.dual/archiso_head.cfg2
-rw-r--r--configs/releng/syslinux.dual/archiso_pxe32.cfg13
-rw-r--r--configs/releng/syslinux.dual/archiso_pxe64.cfg13
-rw-r--r--configs/releng/syslinux/archiso_head.cfg2
-rw-r--r--configs/releng/syslinux/archiso_pxe.cfg13
5 files changed, 5 insertions, 38 deletions
diff --git a/configs/releng/syslinux.dual/archiso_head.cfg b/configs/releng/syslinux.dual/archiso_head.cfg
index 6514c42..81ad26e 100644
--- a/configs/releng/syslinux.dual/archiso_head.cfg
+++ b/configs/releng/syslinux.dual/archiso_head.cfg
@@ -5,7 +5,7 @@ MENU BACKGROUND boot/syslinux/splash.png
MENU WIDTH 78
MENU MARGIN 4
-MENU ROWS 8
+MENU ROWS 7
MENU VSHIFT 10
MENU TABMSGROW 14
MENU CMDLINEROW 14
diff --git a/configs/releng/syslinux.dual/archiso_pxe32.cfg b/configs/releng/syslinux.dual/archiso_pxe32.cfg
index 56820d9..4bdeefa 100644
--- a/configs/releng/syslinux.dual/archiso_pxe32.cfg
+++ b/configs/releng/syslinux.dual/archiso_pxe32.cfg
@@ -28,16 +28,5 @@ ENDTEXT
MENU LABEL Boot Arch Linux (i686) (HTTP)
LINUX boot/i686/vmlinuz
INITRD boot/i686/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=http://${pxeserver}/
-IPAPPEND 3
-
-LABEL arch32_ftp
-TEXT HELP
-Boot the Arch Linux (i686) live medium (Using FTP). It allows you to install Arch Linux or
-perform system maintenance.
-ENDTEXT
-MENU LABEL Boot Arch Linux (i686) (FTP)
-LINUX boot/i686/vmlinuz
-INITRD boot/i686/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=ftp://${pxeserver}/
+APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
IPAPPEND 3
diff --git a/configs/releng/syslinux.dual/archiso_pxe64.cfg b/configs/releng/syslinux.dual/archiso_pxe64.cfg
index 762fbc1..1676236 100644
--- a/configs/releng/syslinux.dual/archiso_pxe64.cfg
+++ b/configs/releng/syslinux.dual/archiso_pxe64.cfg
@@ -28,16 +28,5 @@ ENDTEXT
MENU LABEL Boot Arch Linux (x86_64) (HTTP)
LINUX boot/x86_64/vmlinuz
INITRD boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=http://${pxeserver}/
-IPAPPEND 3
-
-LABEL arch64_ftp
-TEXT HELP
-Boot the Arch Linux (x86_64) live medium (Using FTP). It allows you to install Arch Linux or
-perform system maintenance.
-ENDTEXT
-MENU LABEL Boot Arch Linux (x86_64) (FTP)
-LINUX boot/x86_64/vmlinuz
-INITRD boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=ftp://${pxeserver}/
+APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
IPAPPEND 3
diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg
index 6514c42..faa2588 100644
--- a/configs/releng/syslinux/archiso_head.cfg
+++ b/configs/releng/syslinux/archiso_head.cfg
@@ -5,7 +5,7 @@ MENU BACKGROUND boot/syslinux/splash.png
MENU WIDTH 78
MENU MARGIN 4
-MENU ROWS 8
+MENU ROWS 6
MENU VSHIFT 10
MENU TABMSGROW 14
MENU CMDLINEROW 14
diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg
index 78e494d..8bb60ed 100644
--- a/configs/releng/syslinux/archiso_pxe.cfg
+++ b/configs/releng/syslinux/archiso_pxe.cfg
@@ -28,16 +28,5 @@ ENDTEXT
MENU LABEL Boot Arch Linux (HTTP)
LINUX boot/%ARCH%/vmlinuz
INITRD boot/%ARCH%/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=http://${pxeserver}/
-IPAPPEND 3
-
-LABEL arch_ftp
-TEXT HELP
-Boot the Arch Linux live medium (Using FTP). It allows you to install Arch Linux or
-perform system maintenance.
-ENDTEXT
-MENU LABEL Boot Arch Linux (FTP)
-LINUX boot/%ARCH%/vmlinuz
-INITRD boot/%ARCH%/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=ftp://${pxeserver}/
+APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
IPAPPEND 3