diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/default/Makefile | 41 | ||||
| -rw-r--r-- | configs/default/overlay/boot/grub/menu.lst | 4 | ||||
| -rw-r--r-- | configs/default/overlay/etc/rc.conf | 2 | ||||
| -rw-r--r-- | configs/install-iso/Makefile | 12 | ||||
| -rw-r--r-- | configs/install-iso/overlay/boot/grub/menu.lst | 8 | ||||
| -rw-r--r-- | configs/install-iso/overlay/etc/rc.conf | 2 | ||||
| -rw-r--r-- | configs/xfce4/overlay/boot/grub/menu.lst | 4 | ||||
| -rw-r--r-- | configs/xfce4/overlay/etc/rc.conf | 2 |
8 files changed, 58 insertions, 17 deletions
diff --git a/configs/default/Makefile b/configs/default/Makefile new file mode 100644 index 0000000..38d0533 --- /dev/null +++ b/configs/default/Makefile @@ -0,0 +1,41 @@ +ver=2008.09 +kver=2.6.26-ARCH +carch=i686 +FTPname=$(PWD)/archlinux-$(ver)-ftp-$(carch) +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/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/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/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/archiso-ide.img + mkarchiso -v -t iso -i initcpio-pata img .work-ftp $(FTPname).iso + +.work-ftp: + chmod 0440 overlay/etc/sudoers + mkarchiso -v -P packages.list-$(carch) install .work-ftp + mkarchiso -v squash .work-ftp + +.work-core: addons/core-pkgs + chmod 0440 overlay/etc/sudoers + mkarchiso -v -a addons -P packages.list-$(carch) install .work-core + mkarchiso -v squash .work-core + +# hacky way to always pull +.PHONY: addons/core-pkgs +addons/core-pkgs: + wget --mirror -P addons/core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(carch) + +clean: + rm -fr .work-ftp .work-core diff --git a/configs/default/overlay/boot/grub/menu.lst b/configs/default/overlay/boot/grub/menu.lst index 4885944..6755d09 100644 --- a/configs/default/overlay/boot/grub/menu.lst +++ b/configs/default/overlay/boot/grub/menu.lst @@ -3,9 +3,9 @@ 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 Tools... configfile /boot/grub/tools.lst diff --git a/configs/default/overlay/etc/rc.conf b/configs/default/overlay/etc/rc.conf index 5335ff8..6dec7d2 100644 --- a/configs/default/overlay/etc/rc.conf +++ b/configs/default/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) 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) diff --git a/configs/xfce4/overlay/boot/grub/menu.lst b/configs/xfce4/overlay/boot/grub/menu.lst index 4885944..6755d09 100644 --- a/configs/xfce4/overlay/boot/grub/menu.lst +++ b/configs/xfce4/overlay/boot/grub/menu.lst @@ -3,9 +3,9 @@ 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 Tools... configfile /boot/grub/tools.lst diff --git a/configs/xfce4/overlay/etc/rc.conf b/configs/xfce4/overlay/etc/rc.conf index 45ff03e..aa83e1b 100644 --- a/configs/xfce4/overlay/etc/rc.conf +++ b/configs/xfce4/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 @xfce4) |