Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/install-iso
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-10-19 15:49:55 -0500
committerAaron Griffin <aaronmgriffin@gmail.com>2008-10-19 15:49:55 -0500
commitc2ffda39f9c400945ca0283eccfeda2afc40891b (patch)
tree572abd0052adb55026e5646f4b1c7bf02e60dcf2 /configs/install-iso
parentf3c061b5413fcb7ed7ea75036054ea14115b8f41 (diff)
Rename all uses of 'archlive' to 'archiso'
Additionally change grub prompts to use "ArchLinux LiveCD" as the boot item name Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
Diffstat (limited to 'configs/install-iso')
-rw-r--r--configs/install-iso/Makefile12
-rw-r--r--configs/install-iso/overlay/boot/grub/menu.lst8
-rw-r--r--configs/install-iso/overlay/etc/rc.conf2
3 files changed, 11 insertions, 11 deletions
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index 72de257..0a99075 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -1,5 +1,5 @@
-ver=2008.09
-kver=2.6.26-ARCH
+ver=2008.10
+kver=2.6.27-ARCH
carch=i686
FTPname=$(PWD)/archlinux-$(ver)-ftp-$(carch)
COREname=$(PWD)/archlinux-$(ver)-core-$(carch)
@@ -7,19 +7,19 @@ COREname=$(PWD)/archlinux-$(ver)-core-$(carch)
all: core-iso core-usb ftp-iso ftp-usb
core-usb: .work-core
- mkinitcpio -c initcpio-ide -b .work-core/install -k $(kver) -g .work-core/img/boot/archlive-ide.img
+ mkinitcpio -c initcpio-ide -b .work-core/install -k $(kver) -g .work-core/img/boot/archiso-ide.img
mkarchiso -v -t disk -i initcpio-pata img .work-core $(COREname).img
core-iso: .work-core
- mkinitcpio -c initcpio-ide -b .work-core/install -k $(kver) -g .work-core/img/boot/archlive-ide.img
+ mkinitcpio -c initcpio-ide -b .work-core/install -k $(kver) -g .work-core/img/boot/archiso-ide.img
mkarchiso -v -t iso -i initcpio-pata img .work-core $(COREname).iso
ftp-usb: .work-ftp
- mkinitcpio -c initcpio-ide -b .work-ftp/install -k $(kver) -g .work-ftp/img/boot/archlive-ide.img
+ mkinitcpio -c initcpio-ide -b .work-ftp/install -k $(kver) -g .work-ftp/img/boot/archiso-ide.img
mkarchiso -v -t disk -i initcpio-pata img .work-ftp $(FTPname).img
ftp-iso: .work-ftp
- mkinitcpio -c initcpio-ide -b .work-ftp/install -k $(kver) -g .work-ftp/img/boot/archlive-ide.img
+ mkinitcpio -c initcpio-ide -b .work-ftp/install -k $(kver) -g .work-ftp/img/boot/archiso-ide.img
mkarchiso -v -t iso -i initcpio-pata img .work-ftp $(FTPname).iso
.work-ftp:
diff --git a/configs/install-iso/overlay/boot/grub/menu.lst b/configs/install-iso/overlay/boot/grub/menu.lst
index 410e9d3..7d47842 100644
--- a/configs/install-iso/overlay/boot/grub/menu.lst
+++ b/configs/install-iso/overlay/boot/grub/menu.lst
@@ -3,13 +3,13 @@ default 0
color light-blue/blue black/light-grey
splashimage=/boot/splash.xpm.gz
-title Boot ArchLive
+title Boot ArchLinux LiveCD
kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75%
-initrd /boot/archlive.img
+initrd /boot/archiso.img
-title Boot ArchLive [legacy IDE]
+title Boot ArchLinux LiveCD [legacy IDE]
kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75% ide-legacy
-initrd /boot/archlive-ide.img
+initrd /boot/archiso-ide.img
title Tools...
configfile /boot/grub/tools.lst
diff --git a/configs/install-iso/overlay/etc/rc.conf b/configs/install-iso/overlay/etc/rc.conf
index 5335ff8..6dec7d2 100644
--- a/configs/install-iso/overlay/etc/rc.conf
+++ b/configs/install-iso/overlay/etc/rc.conf
@@ -18,7 +18,7 @@ USECOLOR="yes"
MOD_AUTOLOAD="yes"
-HOSTNAME="archlive"
+HOSTNAME="archiso"
#TODO add more auto-daemons here, especially the live-cd specific stuff
DAEMONS=(syslog-ng network crond)