Cleanup the install-iso Makefile

Also do some tidying of the config and set the
default timezone to nothing, to prevent hiccups on
rc.shutdown

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

7 files changed, 21 insertions, 63 deletions

diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index 63dabc5..1cf261c 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -1,15 +1,16 @@
 ver=2008.12
 kver=2.6.27-ARCH
 
-#Define outside of 'make' for other arches
-ARCH=i686
-
 WORKDIR=work
-BOOTLOADER=grub-gfx
 
-PWD=`pwd`
-FTPname=$(PWD)/archlinux-$(ver)-ftp-$(ARCH)
-COREname=$(PWD)/archlinux-$(ver)-core-$(ARCH)
+ARCH?=i686
+BOOTLOADER?=grub-gfx
+
+PWD:=`pwd`
+FTPname:=$(PWD)/archlinux-$(ver)-ftp-$(ARCH)
+COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH)
+
+PACKAGES="`cat packages.list` $(BOOTLOADER)"
 
 all: core-iso core-usb ftp-iso ftp-usb
 all-iso: core-iso ftp-iso 
@@ -31,15 +32,21 @@ overlay: base-iso
 	cp -r overlay $(WORKDIR)/
 
 root-image:
-	mkarchiso -p "`cat packages.list-$(ARCH)` $(BOOTLOADER)" create $(WORKDIR)
+	mkarchiso -p "$(PACKAGES)" create $(WORKDIR)
 	
 base-iso: root-image
 	mv $(WORKDIR)/root-image/boot $(WORKDIR)/iso/
 	cp -r boot-files/* $(WORKDIR)/iso/boot/
+	cp isomounts $(WORKDIR)
 	
-	mkinitcpio -c initcpio-ide -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso-ide.img
-	mkinitcpio -c initcpio-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso-pata.img
+	mkinitcpio -c initcpio-ide -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_ide.img
+	mkinitcpio -c initcpio-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_pata.img
 
+core-pkgs: base-iso
+	mkdir $(WORKDIR)/core-pkgs/
+	wget --mirror -P $(WORKDIR)/core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(ARCH)
+
+# Bootloaders
 grub-gfx:
 	cp -r $(WORKDIR)/root-image/usr/lib/grub/i386-pc/* $(WORKDIR)/iso/boot/grub
 
@@ -49,9 +56,5 @@ grub:
 isolinux:
 	cp -r $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux
 
-core-pkgs: base-iso
-	mkdir $(WORKDIR)/core-pkgs/
-	wget --mirror -P $(WORKDIR)/core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(ARCH)
-
 clean:
 	rm -rf $(WORKDIR) $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso
diff --git a/configs/install-iso/overlay/etc/arch-release b/configs/install-iso/overlay/etc/arch-release
index a064d1f..153f8b2 100644
--- a/configs/install-iso/overlay/etc/arch-release
+++ b/configs/install-iso/overlay/etc/arch-release
@@ -1 +1 @@
-Arch Linux Live Installer 2008.06 (Overlord)
+Arch Linux Live ISO
diff --git a/configs/install-iso/overlay/etc/fstab b/configs/install-iso/overlay/etc/fstab
index 0d5a001..377ae56 100644
--- a/configs/install-iso/overlay/etc/fstab
+++ b/configs/install-iso/overlay/etc/fstab
@@ -1,6 +1,4 @@
-# 
 # /etc/fstab: static file system information
-#
 # <file system>        <dir>         <type>    <options>          <dump> <pass>
 unionfs                /             unionfs   noauto              0      0
 none                   /dev/pts      devpts    defaults            0      0
diff --git a/configs/install-iso/overlay/etc/issue b/configs/install-iso/overlay/etc/issue
index db70a8b..682564f 100644
--- a/configs/install-iso/overlay/etc/issue
+++ b/configs/install-iso/overlay/etc/issue
@@ -1,5 +1,5 @@
 
-Arch Linux Live Installer 2008.06 (Overlord) (\l)
+Arch Linux Live ISO(\l)
 \s-\r \m.
 Default logins "root" and "arch" have no password.
 To begin installation, login as root.
diff --git a/configs/install-iso/overlay/etc/rc.conf b/configs/install-iso/overlay/etc/rc.conf
index 6dec7d2..43b672f 100644
--- a/configs/install-iso/overlay/etc/rc.conf
+++ b/configs/install-iso/overlay/etc/rc.conf
@@ -5,7 +5,7 @@
 
 LOCALE_DEFAULT="en_US.UTF-8"
 CLOCK_DEFAULT="localtime"
-TIMEZONE_DEFAULT="America/Chicago"
+TIMEZONE_DEFAULT=""
 KEYMAP_DEFAULT="us"
 
 LOCALE="$(cmdline_param locale ${LOCALE_DEFAULT})"
@@ -21,5 +21,5 @@ MOD_AUTOLOAD="yes"
 HOSTNAME="archiso"
 
 #TODO add more auto-daemons here, especially the live-cd specific stuff
-DAEMONS=(syslog-ng network crond)
+DAEMONS=(syslog-ng network)
 #TODO: auto-network find-disks find-user-home
diff --git a/configs/install-iso/packages.list-i686 b/configs/install-iso/packages.list
index 287de78..287de78 100644
--- a/configs/install-iso/packages.list-i686
+++ b/configs/install-iso/packages.list
diff --git a/configs/install-iso/packages.list-x86_64 b/configs/install-iso/packages.list-x86_64
deleted file mode 100644
index a82830e..0000000
--- a/configs/install-iso/packages.list-x86_64
+++ /dev/null
@@ -1,43 +0,0 @@
-archlinux-installer
-atl2
-base
-dnsutils
-dosfstools
-elinks
-gnu-netcat
-grub-gfx
-ipw2100-fw
-ipw2200-fw
-iwlwifi-3945-ucode
-iwlwifi-4965-ucode
-iwlwifi-5000-ucode
-lftp
-lilo
-lshwd
-madwifi
-madwifi-utils
-memtest86+
-ndiswrapper
-ndiswrapper-utils
-netkit-telnet
-nfs-utils
-nmap
-ntfs-3g
-ntfsprogs
-openssh
-openvpn
-parted
-pptpclient
-rt2500
-rt2x00-rt61-fw
-rt2x00-rt71w-fw
-speedtouch
-squashfs-tools
-tcpdump
-tiacx
-tiacx-firmware
-unionfs-utils
-wireless_tools
-wlan-ng26
-wlan-ng26-utils
-zd1211-firmware