'checked in all latest changes'

allinone/config/boot.msg

@@ -1,24 +0,0 @@
-Arch Linux
-http://www.archlinux.org
-Copyright 2002 - 2007 Judd Vinet <jvinet@zeroflux.org>
-Copyright 2007 - 2008 Aaron Griffin <aaron@archlinux.org>
-Distributed under the GNU General Public License (GPL)
-
-ISOLINUX BOOT
-Creation Tool: 'archboot' written by Tobias Powalowski <tpowa@archlinux.org>
-
-INSTALLATION / RESCUEBOOT SYSTEM
-Arch Linux @@RELEASENAME@@
-Kernel: @@KERNEL@@
-Architecture: i686/x86_64
-Creation Date: @@DATE@@
-
-Available boot options (no input will boot the 32bit install/rescue system):
-- For 64bit environment, please use arch64 or lowmem64.
-- 'arch <any_other_boot_option>' to boot the install/rescue system.
-- 'arch root=/dev/??? <any_other_boot_option>' to boot into an existing system.
-- 'lowmem <any_other_boot_option>' to boot the 64MB RAM install system.
-- 'lowmem root=/dev/??? <any_other_boot_option>' to boot into an existing
-  64MB RAM system.
-- 'memtest' to start the memory test program memtest86+.
-- For troubleshooting and other options press the F2 key.

allinone/config/isolinux.cfg

@@ -1,18 +0,0 @@
-prompt 1
-timeout 300
-display boot.msg
-F1 boot.msg
-F2 options.msg
-default arch
-label arch
-kernel vmlinuz
-append initrd=initrd.img rootdelay=5
-label arch64
-kernel vm64
-append initrd=initrd64.img rootdelay=5
-label lowmem
-kernel vmlinuz
-append initrd=lowmem.img rootdelay=5
-label lowmem64
-kernel vm64
-append initrd=lowmem64.img rootdelay=5

allinone/config/options.msg

@@ -1,24 +0,0 @@
-Arch Linux options and troubleshooting:
-- If you have trouble with IDE drives, use the "ide-legacy" boot option
-- If your system hangs during the boot process, any combinations of the
-  boot options noapic acpi=off pci=routeirq nosmp may be useful.
-
-- ARCH_INTEL_WIRELESS USAGE:
-  In order to use those drivers, you have to agree to the firmware licenses
-  by appending intel-wireless to boot prompt.
-
-- ARCH_ADDONS USAGE:
-  In order to load external addon packages or configs
-  into the install environment, please append arch-addons to boot prompt.
-  Place external addon packages in /packages directory.
-  Place external configs in /config directory.
-
-- ARCH_TIACX_WIRELESS USAGE:
-  Please identify the correct file(s) for your device in /usr/share/tiacx 
-  and copy them to /lib/firmware and reload your kernel module.
-  See http://acx100.sourceforge.net/wiki/Firmware for details.
-
-- For returning to start screen press F1 key.
-
-
-

config/placeholder

@@ -1 +0,0 @@
-This is a placeholder file :)

etc/append-message-syslinux-tarball

@@ -1,8 +0,0 @@
-Available boot options (no input will boot the install/rescue system):
-- 'arch <any_other_boot_option>' to boot the install/rescue system.
-- 'arch root=/dev/??? <any_other_boot_option>' to boot into an existing system.
-- 'lowmem <any_other_boot_option>' to boot the 64MB RAM install system.
-- 'lowmem root=/dev/??? <any_other_boot_option>' to boot into an existing
-  64MB RAM system.
-- 'memtest' to start the memory test program memtest86+.
-- For troubleshooting and other options press the F2 key.

etc/archboot/allinone-lowmem.conf

@@ -0,0 +1,33 @@
+# vim:set ft=sh:
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+# For more information on how using mkinitcpio please refer to the main config file
+# or check the wiki.
+MODULES=""
+BINARIES=""
+FILES=""
+# SETUP
+#
+# Please change the other hooks only if you know what you are doing.
+# hooks for lowmem image
+HOOKS="arch_core_install arch_installer arch_bootmessage_allinone arch_acpi arch_motd arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata usb arch_cdrom usbinput arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses"
+
+### NETWORK SETUP
+# the default install media creating process, uses latest files from svn!
+#
+# SVN SERVER
+SVNSETUP="svn://archlinux.org/srv/svn-packages/"
+
+# name of the release
+ARCHVERSION="Nepal"
+
+###### LOCAL SETUP
+# - only needed if you want to build custom install media
+# - disabled by default you can ignore all these parameters below 
+#   if you don't set LOCALSETUP="yes"
+#
+# - Use archboot-svn.sh to checkout svn tree
+# - Set this switch to "yes" if you want a custom install media
+LOCALSETUP="no"
+
+# enter here your custom/modified svn tree
+SVNTREE=""

etc/archboot/allinone.conf

@@ -0,0 +1,32 @@
+# vim:set ft=sh:
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+# For more information on how using mkinitcpio please refer to the main config file
+# or check the wiki.
+MODULES=""
+BINARIES=""
+FILES=""
+# SETUP
+#
+# Please change the hooks only if you know what you are doing.
+HOOKS="arch_ftp_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap arch_acpi arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons"
+
+### NETWORK SETUP
+# the default install media creating process, uses latest files from svn!
+#
+# SVN SERVER
+SVNSETUP="svn://archlinux.org/srv/svn-packages/"
+
+# name of the release
+ARCHVERSION="Nepal"
+
+###### LOCAL SETUP
+# - only needed if you want to build custom install media
+# - disabled by default you can ignore all these parameters below 
+#   if you don't set LOCALSETUP="yes"
+#
+# - Use archboot-svn.sh to checkout svn tree
+# - Set this switch to "yes" if you want a custom install media
+LOCALSETUP="no"
+
+# enter here your custom/modified svn tree
+SVNTREE=""

etc/archboot/config/placeholder

@@ -0,0 +1 @@
+ 

etc/archboot/default-ftp-pxelinux.conf

@@ -0,0 +1,32 @@
+# vim:set ft=sh:
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+# For more information on how using mkinitcpio please refer to the main config file
+# or check the wiki.
+MODULES=""
+BINARIES=""
+FILES=""
+# SETUP
+#
+# Please change the hooks only if you know what you are doing.
+HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons arch_pxelinux"
+
+### NETWORK SETUP
+# the default install media creating process, uses latest files from svn!
+#
+# SVN SERVER
+SVNSETUP="svn://archlinux.org/srv/svn-packages/"
+
+# name of the release
+ARCHVERSION="Nepal"
+
+###### LOCAL SETUP
+# - only needed if you want to build custom install media
+# - disabled by default you can ignore all these parameters below 
+#   if you don't set LOCALSETUP="yes"
+#
+# - Use archboot-svn.sh to checkout svn tree
+# - Set this switch to "yes" if you want a custom install media
+LOCALSETUP="no"
+
+# enter here your custom/modified svn tree
+SVNTREE=""

etc/archboot/default-ftp.conf

@@ -0,0 +1,32 @@
+# vim:set ft=sh:
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+# For more information on how using mkinitcpio please refer to the main config file
+# or check the wiki.
+MODULES=""
+BINARIES=""
+FILES=""
+# SETUP
+#
+# Please change the hooks only if you know what you are doing.
+HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons"
+
+### NETWORK SETUP
+# the default install media creating process, uses latest files from svn!
+#
+# SVN SERVER
+SVNSETUP="svn://archlinux.org/srv/svn-packages/"
+
+# name of the release
+ARCHVERSION="Nepal"
+
+###### LOCAL SETUP
+# - only needed if you want to build custom install media
+# - disabled by default you can ignore all these parameters below 
+#   if you don't set LOCALSETUP="yes"
+#
+# - Use archboot-svn.sh to checkout svn tree
+# - Set this switch to "yes" if you want a custom install media
+LOCALSETUP="no"
+
+# enter here your custom/modified svn tree
+SVNTREE=""

etc/archboot/default-pxelinux.conf

@@ -0,0 +1,32 @@
+# vim:set ft=sh:
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+# For more information on how using mkinitcpio please refer to the main config file
+# or check the wiki.
+MODULES=""
+BINARIES=""
+FILES=""
+# SETUP
+#
+# Please change the hooks only if you know what you are doing.
+HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons arch_pxelinux"
+
+### NETWORK SETUP
+# the default install media creating process, uses latest files from svn!
+#
+# SVN SERVER
+SVNSETUP="svn://archlinux.org/srv/svn-packages/"
+
+# name of the release
+ARCHVERSION="Nepal"
+
+###### LOCAL SETUP
+# - only needed if you want to build custom install media
+# - disabled by default you can ignore all these parameters below 
+#   if you don't set LOCALSETUP="yes"
+#
+# - Use archboot-svn.sh to checkout svn tree
+# - Set this switch to "yes" if you want a custom install media
+LOCALSETUP="no"
+
+# enter here your custom/modified svn tree
+SVNTREE=""

etc/archboot/default.conf

@@ -0,0 +1,32 @@
+# vim:set ft=sh:
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+# For more information on how using mkinitcpio please refer to the main config file
+# or check the wiki.
+MODULES=""
+BINARIES=""
+FILES=""
+# SETUP
+#
+# Please change the hooks only if you know what you are doing.
+HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons"
+
+### NETWORK SETUP
+# the default install media creating process, uses latest files from svn!
+#
+# SVN SERVER
+SVNSETUP="svn://archlinux.org/srv/svn-packages/"
+
+# name of the release
+ARCHVERSION="Nepal"
+
+###### LOCAL SETUP
+# - only needed if you want to build custom install media
+# - disabled by default you can ignore all these parameters below 
+#   if you don't set LOCALSETUP="yes"
+#
+# - Use archboot-svn.sh to checkout svn tree
+# - Set this switch to "yes" if you want a custom install media
+LOCALSETUP="no"
+
+# enter here your custom/modified svn tree
+SVNTREE=""

etc/archboot/lowmem.conf

@@ -0,0 +1,33 @@
+# vim:set ft=sh:
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+# For more information on how using mkinitcpio please refer to the main config file
+# or check the wiki.
+MODULES=""
+BINARIES=""
+FILES=""
+# SETUP
+#
+# Please change the hooks only if you know what you are doing.
+# hooks for lowmem image
+HOOKS="arch_core_install arch_installer arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata usb arch_cdrom usbinput arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses"
+
+### NETWORK SETUP
+# the default install media creating process, uses latest files from svn!
+#
+# SVN SERVER
+SVNSETUP="svn://archlinux.org/srv/svn-packages/"
+
+# name of the release
+ARCHVERSION="Nepal"
+
+###### LOCAL SETUP
+# - only needed if you want to build custom install media
+# - disabled by default you can ignore all these parameters below 
+#   if you don't set LOCALSETUP="yes"
+#
+# - Use archboot-svn.sh to checkout svn tree
+# - Set this switch to "yes" if you want a custom install media
+LOCALSETUP="no"
+
+# enter here your custom/modified svn tree
+SVNTREE=""

etc/archboot/packages/placeholder

@@ -0,0 +1 @@
+ 

etc/archboot/presets/allinone

@@ -0,0 +1,31 @@
+# vim:set ft=sh:
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+# config file for mkisolinux
+
+# DEFAULT kernel boot options
+KERNEL_BOOT_OPTIONS="rootdelay=5"
+
+# mkinitcpio config file, defaulted to stock config file
+MKINITCPIO_CONFIG="/etc/archboot/allinone.conf"
+
+# kernel version, defaulted to build for runtime kernel
+VERSION="$(uname -r)"
+
+# kernel image, defaulted to stock arch kernel
+KERNEL="/boot/vmlinuz26"
+
+# boot message file
+# blank by default arch-bootmessage hook will create it by default
+APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/allinone"
+APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options"
+
+# isolinux.cfg files to use
+ISOLINUXCFG="/usr/share/archboot/bootloader/allinone.cfg"
+
+# Prompt on boot, 1=yes 0=no
+PROMPT="1"
+
+# Timeout, 30 seconds to fix usb keyboard issues
+# 0 means wait for prompt
+TIMEOUT="300"
+

etc/archboot/presets/allinone-lowmem

@@ -0,0 +1,31 @@
+# vim:set ft=sh:
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+# config file for mkisolinux
+
+# DEFAULT kernel boot options
+KERNEL_BOOT_OPTIONS="rootdelay=5"
+
+# mkinitcpio config file, defaulted to stock config file
+MKINITCPIO_CONFIG="/etc/archboot/allinone-lowmem.conf"
+
+# kernel version, defaulted to build for runtime kernel
+VERSION="$(uname -r)"
+
+# kernel image, defaulted to stock arch kernel
+KERNEL="/boot/vmlinuz26"
+
+# boot message file
+# blank by default arch-bootmessage hook will create it by default
+APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/allinone"
+APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options"
+
+# isolinux.cfg files to use
+ISOLINUXCFG="/usr/share/archboot/bootloader/allinone.cfg"
+
+# Prompt on boot, 1=yes 0=no
+PROMPT="1"
+
+# Timeout, 30 seconds to fix usb keyboard issues
+# 0 means wait for prompt
+TIMEOUT="300"
+

etc/archboot/presets/isolinux

@@ -1,12 +1,12 @@
 # vim:set ft=sh:
 # Created by Tobias Powalowski <tpowa@archlinux.org>
-# config file for mkbootcd
+# config file for mkisolinux
 
 # DEFAULT kernel boot options
 KERNEL_BOOT_OPTIONS="rootdelay=5"
 
 # mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/archboot/install.conf"
+MKINITCPIO_CONFIG="/etc/archboot/default.conf"
 
 # kernel version, defaulted to build for runtime kernel
 VERSION="$(uname -r)"
@@ -19,21 +19,19 @@ KERNEL="/boot/vmlinuz26"
 BOOTMESSAGE=""
 
 # append this file to the default bootmessage
-APPENDBOOTMESSAGE="/etc/archboot/etc/append-message"
+APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message"
-APPENDBOOTMESSAGE_SYSLINUX="/etc/archboot/etc/append-message-syslinux"
+APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options"
-APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options"
 
-# menu.lst or isolinux.cfg files to use
+# isolinux.cfg files to use
-ISOLINUXCFG="/etc/archboot/etc/isolinux.cfg"
+ISOLINUXCFG="/usr/share/archboot/bootloader/bootloader.cfg"
-MENULST="/etc/archboot/etc/menu.lst"
 
-# Prompt on CD boot, defaulted to yes, 1=yes 0=no
+# Prompt on boot, 1=yes 0=no
 PROMPT="1"
 
 # Name of the ISO, if empty Arch Linux is used if not set by a HOOK later
 ISONAME=""
 
-# Timeout in seconds on CD boot, defaulted to 30 to fix usb keyboard issues
+# Timeout, 30 seconds to fix usb keyboard issues
 # 0 means wait for prompt
 TIMEOUT="300"
 

etc/archboot/presets/isolinux-ftp

@@ -1,12 +1,12 @@
 # vim:set ft=sh:
 # Created by Tobias Powalowski <tpowa@archlinux.org>
-# config file for mkbootcd
+# config file for mkisolinux
 
 # DEFAULT kernel boot options
 KERNEL_BOOT_OPTIONS="rootdelay=5"
 
 # mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/archboot/install-lowmem.conf"
+MKINITCPIO_CONFIG="/etc/archboot/default-ftp.conf"
 
 # kernel version, defaulted to build for runtime kernel
 VERSION="$(uname -r)"
@@ -19,22 +19,19 @@ KERNEL="/boot/vmlinuz26"
 BOOTMESSAGE=""
 
 # append this file to the default bootmessage
-APPENDBOOTMESSAGE="/etc/archboot/etc/append-message"
+APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message"
-APPENDBOOTMESSAGE_SYSLINUX="/etc/archboot/etc/append-message-syslinux"
+APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options"
-APPENDBOOTMESSAGE_SYSLINUX_LOWMEM="/etc/archboot/etc/append-message-syslinux-lowmem"
-APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options"
 
-# menu.lst or isolinux.cfg files to use
+# isolinux.cfg files to use
-ISOLINUXCFG="/etc/archboot/etc/isolinux.cfg"
+ISOLINUXCFG="/usr/share/archboot/bootloader/bootloader.cfg"
-MENULST="/etc/archboot/etc/menu.lst"
 
-# Prompt on CD boot, defaulted to yes, 1=yes 0=no
+# Prompt on CD boot, 1=yes 0=no
 PROMPT="1"
 
 # Name of the ISO, if empty Arch Linux is used if not set by a HOOK later
 ISONAME=""
 
-# Timeout in seconds on CD boot, defaulted to 30 to fix usb keyboard issues
+# Timeout, 30 seconds to fix usb keyboard issues
 # 0 means wait for prompt
 TIMEOUT="300"
 

etc/archboot/presets/isolinux-lowmem

@@ -1,12 +1,12 @@
 # vim:set ft=sh:
 # Created by Tobias Powalowski <tpowa@archlinux.org>
-# config file for mkbootcd
+# config file for mkisolinux
 
 # DEFAULT kernel boot options
 KERNEL_BOOT_OPTIONS="rootdelay=5"
 
 # mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/archboot/install-lowmem.conf"
+MKINITCPIO_CONFIG="/etc/archboot/lowmem.conf"
 
 # kernel version, defaulted to build for runtime kernel
 VERSION="$(uname -r)"
@@ -19,22 +19,19 @@ KERNEL="/boot/vmlinuz26"
 BOOTMESSAGE=""
 
 # append this file to the default bootmessage
-APPENDBOOTMESSAGE="/etc/archboot/etc/append-message"
+APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message-lowmem"
-APPENDBOOTMESSAGE_SYSLINUX="/etc/archboot/etc/append-message-syslinux"
+APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options-lowmem"
-APPENDBOOTMESSAGE_SYSLINUX_LOWMEM="/etc/archboot/etc/append-message-syslinux-tarball"
-APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options"
 
-# menu.lst or isolinux.cfg files to use
+# isolinux.cfg files to use
-ISOLINUXCFG="/etc/archboot/etc/isolinux-tarball.cfg"
+ISOLINUXCFG="/usr/share/archboot/bootloader/bootloader.cfg"
-MENULST="/etc/archboot/etc/menu.lst"
 
-# Prompt on CD boot, defaulted to yes, 1=yes 0=no
+# Prompt on boot, 1=yes 0=no
 PROMPT="1"
 
 # Name of the ISO, if empty Arch Linux is used if not set by a HOOK later
 ISONAME=""
 
-# Timeout in seconds on CD boot, defaulted to 30 to fix usb keyboard issues
+# Timeout, 30 seconds to fix usb keyboard issues
 # 0 means wait for prompt
 TIMEOUT="300"
 

etc/archboot/presets/pxelinux

@@ -7,7 +7,7 @@
 KERNEL_BOOT_OPTIONS="rootdelay=5"
 
 # mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/archboot/install.conf"
+MKINITCPIO_CONFIG="/etc/archboot/default-pxelinux.conf"
 
 # kernel version, defaulted to build for runtime kernel
 VERSION="$(uname -r)"
@@ -20,19 +20,19 @@ KERNEL="/boot/vmlinuz26"
 BOOTMESSAGE=""
 
 # append this file to the default bootmessage
-APPENDBOOTMESSAGE="/etc/archboot/etc/append-message"
+APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message"
-APPENDBOOTMESSAGE_SYSLINUX="/etc/archboot/etc/append-message-syslinux"
+APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options"
-APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options"
 
-# Prompt on boot, defaulted to yes, 1=yes 0=no
+# Prompt on boot, 1=yes 0=no
 PROMPT="1"
 
-# Timeout in seconds on boot, defaulted to 0, because we prompt by default
+# Timeout, 30 seconds to fix usb keyboard issues
-TIMEOUT="0"
+# 0 means wait for prompt
+TIMEOUT="300"
 
 # Installdir of tftp, default location
 INSTALLDIR="/var/tftpboot"
 
-# Nfsrootdir, set this to the dir were the packages should go to
+# Nfsrootdir, set this to the directory, where the packages should go to
 # and which is exported as nfsroot
-NFSROOTDIR=""
+NFSROOTDIR="/srv/archboot"

etc/archboot/presets/pxelinux-ftp

@@ -0,0 +1,38 @@
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+# config file for mkpxelinux
+
+# DEFAULT kernel boot options like ip=:::::eth0:dhcp etc.
+# add your root= option, if you boot from a disk device
+# and don't want to add it by hand on each boot
+KERNEL_BOOT_OPTIONS="rootdelay=5"
+
+# mkinitcpio config file, defaulted to stock config file
+MKINITCPIO_CONFIG="/etc/archboot/default-ftp-pxelinux.conf"
+
+# kernel version, defaulted to build for runtime kernel
+VERSION="$(uname -r)"
+
+# kernel image, defaulted to stock arch kernel
+KERNEL="/boot/vmlinuz26"
+
+# boot message file
+# blank by default arch-bootmessage hook will create it by default
+BOOTMESSAGE=""
+
+# append this file to the default bootmessage
+APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message"
+APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options"
+
+# Prompt on boot, 1=yes 0=no
+PROMPT="1"
+
+# Timeout, 30 seconds to fix usb keyboard issues
+# 0 means wait for prompt
+TIMEOUT="300"
+
+# Installdir of tftp, default location
+INSTALLDIR="/var/tftpboot"
+
+# Nfsrootdir, set this to the directory, where the packages should go to
+# and which is exported as nfsroot
+NFSROOTDIR="/srv/archboot"

etc/archboot/presets/syslinux

@@ -7,7 +7,7 @@
 KERNEL_BOOT_OPTIONS="rootdelay=5"
 
 # mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/archboot/install.conf"
+MKINITCPIO_CONFIG="/etc/archboot/default.conf"
 
 # kernel version, defaulted to build for runtime kernel
 VERSION="$(uname -r)"
@@ -20,18 +20,18 @@ KERNEL="/boot/vmlinuz26"
 BOOTMESSAGE=""
 
 # append this file to the default bootmessage
-APPENDBOOTMESSAGE="/etc/archboot/etc/append-message"
+APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message"
-APPENDBOOTMESSAGE_SYSLINUX="/etc/archboot/etc/append-message-syslinux"
+APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options"
-APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options"
 
 # syslinux.cfg files to use
-SYSLINUXCFG="/etc/archboot/etc/syslinux.cfg"
+SYSLINUXCFG="/usr/share/archboot/bootloader/bootloader.cfg"
 
-# Prompt on boot, defaulted to yes, 1=yes 0=no
+# Prompt on boot, 1=yes 0=no
 PROMPT="1"
 
-# Timeout in seconds on boot, defaulted to 0, because we prompt by default
+# Timeout, 30 seconds to fix usb keyboard issues
-TIMEOUT="0"
+# 0 means wait for prompt
+TIMEOUT="300"
 
 # default MBR
 MBR="/usr/share/mksyslinux/mbr.bin"

etc/archboot/presets/syslinux-ftp

@@ -7,7 +7,7 @@
 KERNEL_BOOT_OPTIONS="rootdelay=5"
 
 # mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/archboot/install.conf"
+MKINITCPIO_CONFIG="/etc/archboot/default-ftp.conf"
 
 # kernel version, defaulted to build for runtime kernel
 VERSION="$(uname -r)"
@@ -20,15 +20,18 @@ KERNEL="/boot/vmlinuz26"
 BOOTMESSAGE=""
 
 # append this file to the default bootmessage
-APPENDBOOTMESSAGE="/etc/archboot/etc/append-message"
+APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message"
-APPENDBOOTMESSAGE_SYSLINUX="/etc/archboot/etc/append-message-syslinux"
+APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options"
-APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options"
 
-# Prompt on boot, defaulted to yes, 1=yes 0=no
+# syslinux.cfg files to use
+SYSLINUXCFG="/usr/share/archboot/bootloader/bootloader.cfg"
+
+# Prompt on boot, 1=yes 0=no
 PROMPT="1"
 
-# Timeout in seconds on boot, defaulted to 0, because we prompt by default
+# Timeout, 30 seconds to fix usb keyboard issues
-TIMEOUT="0"
+# 0 means wait for prompt
+TIMEOUT="300"
 
 # default MBR
 MBR="/usr/share/mksyslinux/mbr.bin"

etc/archboot/presets/syslinux-lowmem

@@ -7,7 +7,7 @@
 KERNEL_BOOT_OPTIONS="rootdelay=5"
 
 # mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/archboot/install-lowmem.conf"
+MKINITCPIO_CONFIG="/etc/archboot/lowmem.conf"
 
 # kernel version, defaulted to build for runtime kernel
 VERSION="$(uname -r)"
@@ -20,19 +20,18 @@ KERNEL="/boot/vmlinuz26"
 BOOTMESSAGE=""
 
 # append this file to the default bootmessage
-APPENDBOOTMESSAGE="/etc/archboot/etc/append-message"
+APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message-lowmem"
-APPENDBOOTMESSAGE_SYSLINUX="/etc/archboot/etc/append-message-syslinux"
+APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options-lowmem"
-APPENDBOOTMESSAGE_SYSLINUX_LOWMEM="/etc/archboot/etc/append-message-syslinux-lowmem"
-APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options"
 
 # syslinux.cfg files to use
-SYSLINUXCFG="/etc/archboot/etc/syslinux.cfg"
+SYSLINUXCFG="/usr/share/archboot/bootloader/bootloader.cfg"
 
-# Prompt on boot, defaulted to yes, 1=yes 0=no
+# Prompt on boot, 1=yes 0=no
 PROMPT="1"
 
-# Timeout in seconds on boot, defaulted to 0, because we prompt by default
+# Timeout, 30 seconds to fix usb keyboard issues
-TIMEOUT="0"
+# 0 means wait for prompt
+TIMEOUT="300"
 
 # default MBR
 MBR="/usr/share/mksyslinux/mbr.bin"

etc/syslinux-tarball.cfg

@@ -1,12 +0,0 @@
-prompt @@PROMPT@@
-timeout @@TIMEOUT@@
-display boot.msg
-F1 boot.msg
-F2 options.msg
-default arch
-label arch
-kernel vmlinuz
-append initrd=initrd.img @@KERNEL_BOOT_OPTIONS@@
-label lowmem
-kernel vmlinuz
-append initrd=lowmem.img @@KERNEL_BOOT_OPTIONS@@

etc/syslinux.cfg

@@ -1,9 +0,0 @@
-prompt @@PROMPT@@
-timeout @@TIMEOUT@@
-display boot.msg
-F1 boot.msg
-F2 options.msg
-default arch
-label arch
-kernel vmlinuz
-append initrd=initrd.img @@KERNEL_BOOT_OPTIONS@@

hooks/arch_pacman_lowmem

@@ -1,9 +0,0 @@
-run_hook ()
-{
-    # fix download source
-    for i in /etc/pacman.d/*; do
-	sed -i -e "s/i686/$(uname -m)/g" $i
-    done
-    # add pacman.static symlink
-    ln -s /usr/bin/pacman /usr/bin/pacman.static
-}

hooks/arch_udev

@@ -1,7 +0,0 @@
-# vim: set ft=sh:
-run_hook ()
-{
-    msg -n ":: Loading udev..."
-    /etc/start_udev
-    msg "done."
-}

install-lowmem.conf

@@ -1,73 +0,0 @@
-# vim:set ft=sh:
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# For more information on how using mkinitcpio please refer to the main config file
-# or check the wiki.
-MODULES=""
-BINARIES=""
-FILES=""
-# SETUP
-# You can choose between 2 types of install media:
-# arch_lowmem_install       --> creates lowmem install media
-# arch_ftp_install        --> needed for upload tarball!
-#
-# default is set to ftp install media
-#
-# Please change the other hooks only if you know what you are doing.
-# hooks for lowmem image
-HOOKS="arch_lowmem_install arch_installer arch_acpi arch_bootmessage_lowmem arch_motd_lowmem arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_hwdetect arch_udev ide pata scsi sata usb arch_cdrom usbinput arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses"
-#
-# adding pxelinux hook if mkpxelinux is used.
-if [ "${RUNPROGRAM}" = "mkpxelinux" ]; then
-	HOOKS="$HOOKS arch_pxelinux"
-fi
-#
-
-### NETWORK SETUP
-# the default install media creating process, uses latest files from svn!
-#
-# SVN SERVER
-SVNSETUP="svn://archlinux.org/home/svn-packages/"
-
-###### LOCAL SETUP
-# only needed if you want to build custom install media
-# disabled by default you can ignore all those parameters below 
-# if you don't set LOCALSETUP="yes"
-#
-# Set this switch to "yes" if you want a custom install media
-LOCALSETUP="no"
-
-#### NOTES:
-# To get the svn tree use these commands:
-# - change to your dir you want to hold the files and execute the script below
-# Example Script:
-# ---------------
-# #!/bin/sh
-# ### general setup stuff
-#	SVNSETUP="svn://archlinux.org/home/svn-packages/"
-#	# generate base
-#	BASE=""
-#	for i in $(pacman -Sg base | sed -e "s/base//g"); do 
-#		BASE="$BASE $(echo $i)"
-#	done
-#	# generate base-devel
-#	DEVEL=""
-#	for i in $(pacman -Sg base-devel | sed -e "s/base-devel//g"); do 
-#		DEVEL="$DEVEL $(echo $i)"
-#	done
-#	SUPPORT="$(echo -n $(pacman -Ss | grep -e ^core | grep -v '(' | sed -e 's/\ .*/ /g' -e 's#core/##g'))"
-#	for i in base devel support; do
-#	    mkdir $i
-#	    svn co -N ${SVNSETUP} $i
-#	done
-#	cd base; svn up $BASE; cd ..
-#	cd devel; svn up $DEVEL; cd ..
-#	cd support; svn up $SUPPORT; cd ..
-# ---------------
-# Now you can start to modify this tree to your needs.
-
-### GENERAL REMASTER PARAMETERS
-# enter here your custom/modified svn tree
-SVNTREE=""
-
-# name of the release
-ARCHVERSION="Nepal"

install.conf

@@ -1,72 +0,0 @@
-# vim:set ft=sh:
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# For more information on how using mkinitcpio please refer to the main config file
-# or check the wiki.
-MODULES=""
-BINARIES=""
-FILES=""
-# SETUP
-# You can choose between 2 types of install media:
-# arch_core_install       --> creates core install media
-# arch_ftp_install        --> creates ftp install media
-#
-# default is set to ftp install media
-#
-# Please change the other hooks only if you know what you are doing.
-HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_hwdetect arch_udev ide pata scsi sata arch_cdrom arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_naim arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons"
-#
-# adding pxelinux hook if mkpxelinux is used.
-if [ "${RUNPROGRAM}" = "mkpxelinux" ]; then
-	HOOKS="$HOOKS arch_pxelinux"
-fi
-#
-
-### NETWORK SETUP
-# the default install media creating process, uses latest files from svn!
-#
-# SVN SERVER
-SVNSETUP="svn://archlinux.org/home/svn-packages/"
-
-###### LOCAL SETUP
-# only needed if you want to build custom install media
-# disabled by default you can ignore all those parameters below 
-# if you don't set LOCALSETUP="yes"
-#
-# Set this switch to "yes" if you want a custom install media
-LOCALSETUP="no"
-
-#### NOTES:
-# To get the svn tree use these commands:
-# - change to your dir you want to hold the files and execute the script below
-# Example Script:
-# ---------------
-# #!/bin/sh
-# ### general setup stuff
-#	SVNSETUP="svn://archlinux.org/home/svn-packages/"
-#	# generate base
-#	BASE=""
-#	for i in $(pacman -Sg base | sed -e "s/base//g"); do 
-#		BASE="$BASE $(echo $i)"
-#	done
-#	# generate base-devel
-#	DEVEL=""
-#	for i in $(pacman -Sg base-devel | sed -e "s/base-devel//g"); do 
-#		DEVEL="$DEVEL $(echo $i)"
-#	done
-#	SUPPORT="$(echo -n $(pacman -Ss | grep -e ^core | grep -v '(' | sed -e 's/\ .*/ /g' -e 's#core/##g'))"
-#	for i in base devel support; do
-#	    mkdir $i
-#	    svn co -N ${SVNSETUP} $i
-#	done
-#	cd base; svn up $BASE; cd ..
-#	cd devel; svn up $DEVEL; cd ..
-#	cd support; svn up $SUPPORT; cd ..
-# ---------------
-# Now you can start to modify this tree to your needs.
-
-### GENERAL REMASTER PARAMETERS
-# enter here your custom/modified svn tree
-SVNTREE=""
-
-# name of the release
-ARCHVERSION="Nepal"

install/arch_bootmessage_lowmem

@@ -1,43 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-install ()
-{
-    ### generate boot.msg
-    [ "${RUNPROGRAM}" = "mkbootcd" ] && TITLEMSG="ISOLINUX"
-    [ "${RUNPROGRAM}" = "mkbootcd-grub" ] && TITLEMSG="GRUB"
-    [ "${RUNPROGRAM}" = "mksyslinux" ] && TITLEMSG="SYSLINUX"
-    [ "${RUNPROGRAM}" = "mkpxelinux" ] && TITLEMSG="PXELINUX"
-    # change to english locale!
-    export LANG=en_US
-    CONFIGMSG="INSTALLATION / RESCUEBOOT SYSTEM"
-    NAME=${ARCHVERSION}
-    echo "Arch Linux" >> ${BOOTMESSAGE}
-    echo "http://www.archlinux.org" >> ${BOOTMESSAGE}
-    echo "Copyright 2002 - 2007 Judd Vinet <jvinet@zeroflux.org>" >> ${BOOTMESSAGE}
-    echo "Copyright 2007 - 2008 Aaron Griffin <aaron@archlinux.org>" >> ${BOOTMESSAGE}
-    echo "Distributed under the GNU General Public License (GPL)" >> ${BOOTMESSAGE}
-    echo "" >> ${BOOTMESSAGE}
-    echo "${TITLEMSG} BOOT" >> ${BOOTMESSAGE}
-    echo "Creation Tool: '$(echo ${RUNPROGRAM} | sed 's|-grub||')' written by Tobias Powalowski <tpowa@archlinux.org>" >> ${BOOTMESSAGE}
-    echo "" >> ${BOOTMESSAGE}
-    echo "${CONFIGMSG}" >> ${BOOTMESSAGE} 
-    echo "Arch Linux ${NAME}" >> ${BOOTMESSAGE}
-    echo "Kernel: ${USEKERNEL}" >> ${BOOTMESSAGE}
-    echo "Architecture: $(uname -m)" >> ${BOOTMESSAGE}
-    echo "Creation Date: $(date)" >> ${BOOTMESSAGE}
-    echo "" >> ${BOOTMESSAGE}
-    if [ "${RUNPROGRAM}" = "mkbootcd-grub" ]; then
-    	[ -s "${APPENDBOOTMESSAGE}" ] && cat ${APPENDBOOTMESSAGE} >> ${BOOTMESSAGE}
-    else
-    	[ -s "${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM}" ] && cat ${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM} >> ${BOOTMESSAGE}
-    	[ -s "${APPENDOPTIONSBOOTMESSAGE}" ] && cat ${APPENDOPTIONSBOOTMESSAGE} >> ${OPTIONSBOOTMESSAGE}
-    fi
-}
-
-help ()
-{
-cat <<HELPEOF
-  This hook sets up dynamically the lowmem boot message, depending on
-  your system.
-HELPEOF
-}

install/arch_isdn

@@ -1,23 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-install ()
-{
-    MODULES=" $(checked_modules "/drivers/isdn/") "
-
-    BINARIES="hisaxctrl icnctrl imon imontty ipppd ipppstats isdnctrl isdnlog mkzonedb pcbitctl isdnconf isdnrate isdnrep"
-    FILES=""
-    SCRIPT=""
-    add_file "/etc/archboot/isdn/etc/isdn/callerid.conf" "/etc/isdn/callerid.conf"
-    add_file "/etc/archboot/isdn/etc/isdn/isdn.conf" "/etc/isdn/isdn.conf"
-    add_file "/etc/archboot/isdn/etc/isdn/isdnlog.isdnctrl0.options" "/etc/isdn/isdnlog.isdnctrl0.options"
-    add_file "/etc/archboot/isdn/etc/isdn/isdnlog.users" "/etc/isdn/isdnlog.users"
-    add_file "/etc/archboot/isdn/etc/isdn/rate.conf" "/etc/isdn/rate.conf"
-    add_file "/etc/archboot/isdn/etc/isdn/stop" "/etc/isdn/stop"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook includes the isdn subsystem on an arch boot image.
-HELPEOF
-}

install/arch_lowmem_install

@@ -1,89 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-install ()
-{
-### check for root
-    if ! [ $UID -eq 0 ]; then 
-	echo "ERROR: Please run as root user!"
-	exit 1
-    fi
-
-    ### check for TEMPDIR
-    if [ $TEMPDIR = "" ]; then
-	 echo "ERROR: No TEMPDIR was set, please set TEMPDIR first!"
-	 exit 1
-    fi
-
-    ### check for activated testing repository
-    if ! [ "$(grep '^\[testing\]' /etc/pacman.conf)" = "" ]; then 
-	echo "WARNING: TESTING REPOSITORY ACTIVATED"
-	echo "-------------------------------------"
-	echo "POSSIBILITY OF BROKEN BINARY PACKAGES ON INSTALL MEDIA!"
-	echo "Use a chroot instead to avoid those problems."
-	echo "5 seconds time to cancel with CTRL+C"
-	sleep 5
-    fi
-    ### setting up directories
-    if ! [ "${LOCALSETUP}" = "yes" ]; then 
-    	SVNTREE=$(mktemp /tmp/svntree.XXXX)
-    	rm ${SVNTREE}
-    	mkdir -p ${SVNTREE}
-    else
-    	SVNTREE=${SVNTREE}
-    fi
-    cd ${SVNTREE}
-    if ! [ "${LOCALSETUP}" = "yes" ]; then
-	# generate base
-	BASE=""
-	for i in $(pacman -Sg base | sed -e "s/base//g"); do 
-		BASE="$BASE $(echo $i)"
-	done
-	# generate base-devel
-	DEVEL=""
-	for i in $(pacman -Sg base-devel | sed -e "s/base-devel//g"); do 
-		DEVEL="$DEVEL $(echo $i)"
-	done
-	SUPPORT=""
-	SUPPORT="$(echo -n $(pacman -Ss | grep -e ^core | grep -v '(' | sed -e 's/\ .*/ /g' -e 's#core/##g'))"
-	for i in base devel lib support; do
-	    mkdir $i
-	    svn co -N ${SVNSETUP} $i
-	done
-	cd base; svn up $BASE; cd ..
-	cd devel; svn up $DEVEL; cd ..
-	cd support; svn up $SUPPORT; cd ..
-	cd  ${SVNTREE}
-	SEARCHSVN=$(find ./ -type d -name *"$(uname -m)" ! -name "testing*")
-    else
-    	cd ${SVNTREE}
-	SEARCHSVN=$(find ./ -type d -name *"$(uname -m)" ! -name "testing*")
-    fi
-    # Download all packages
-    PACKAGES=$(for i in ${SEARCHSVN};do ! [ "$(echo $i | awk -F/ '{print $3}')" = "" ] && echo -n "$(echo $i|  awk -F/ '{print $3}') ";done)
-    pacman -Sy
-    pacman -Sw --noconfirm ${PACKAGES}
-    # collect the packages
-    mkdir -p ${TEMPDIR}/core-$(uname -m)/pkg/
-    for COPY in ${SEARCHSVN};do
-    	if ! [ "$(echo ${COPY} | awk -F/ '{print $3}')" = "" ]; then
-	    source "${COPY}/PKGBUILD"
-	    cp /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz ${TEMPDIR}/core-$(uname -m)/pkg/
-	    echo "$(echo ${COPY}| awk -F/ '{print $2}')/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz" >> ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt
-	    repo-add ${TEMPDIR}/core-$(uname -m)/pkg/core.db.tar.gz /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz
-	fi
-    done
-    # generate packages.txt
-    sort -u ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt -o ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt 
-    SCRIPT=
-    BINARIES=
-
-    # generate iso title name
-    [ "${RUNPROGRAM}" = "mkbootcd" -o "${RUNPROGRAM}" = "mkbootcd-grub" ] && echo "Arch Linux Archboot CORE lowmem $(uname -m)" >> ${ISONAME}
-}
-
-help ()
-{
-cat <<HELPEOF
-  This hook sets up all you need for a lowmem arch install image.
-HELPEOF
-}

install/arch_motd

@@ -1,46 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-install ()
-{
-    ### generate motd
-    MOTD=$(mktemp /tmp/motd.XXXX)
-    echo "Virtual consoles 1-6 are active." >> ${MOTD}
-    echo "--------------------------------" >> ${MOTD}
-    echo "To change virtual console use ALT + F(1-7 or 12)" >> ${MOTD}
-    echo "" >> ${MOTD}
-    echo "Logging:" >> ${MOTD}
-    echo "  - vc7 is used for setup logging." >> ${MOTD}
-    echo "  - vc12 is used for kernel logging." >> ${MOTD}
-    echo "Documentation:" >> ${MOTD}
-    echo "  - Documentation can be read by executing:" >> ${MOTD}
-    echo "    zcat /arch/archdoc.txt.gz | less" >> ${MOTD}
-    echo "Keymap:" >> ${MOTD}
-    echo "  - To change to a non-US keymap, type 'km' at the console." >> ${MOTD}
-    echo "Timesetting:" >> ${MOTD}
-    echo "  - To change your clock, type 'tz' at the console." >> ${MOTD}
-    if [ "${RUNPROGRAM}" = "mksyslinux" ]; then
-    	echo "Installation Hints:" >> ${MOTD}
-    	echo "  - If you don't use 'FTP INSTALL', mount your install source under '/src/'"  >> ${MOTD}
-    	echo "    choose --> 'CD INSTALL' and on menu 'Select Packages' --> choose 'SRC'." >> ${MOTD}
-    	echo "  - If you booted from an USB-DEVICE, it's possible that you need to unplug" >> ${MOTD}
-    	echo "    and replug your device to get the correct node in /dev/." >> ${MOTD}
-    fi
-    if [ "${RUNPROGRAM}" = "mkpxelinux" ]; then
-    	echo "Installation Hints:" >> ${MOTD}
-    	echo "  - choose --> 'CD INSTALL' and on menu 'Select Packages' --> choose 'SRC'." >> ${MOTD}
-    fi
-    	echo "Normal Setup:" >> ${MOTD}
-    	echo "  - When you are ready, please run '/arch/setup' to install Arch Linux." >> ${MOTD}
-    	echo "For Experts:" >> ${MOTD}
-        echo "  - Use '/arch/quickinst' to install and bypass the setup routine." >> ${MOTD}
-    chmod 644 ${MOTD}
-    add_file "${MOTD}" "/etc/motd"
-}
-
-help ()
-{
-cat <<HELPEOF
-  This hook sets up dynamically the motd message, depending on
-  your system.
-HELPEOF
-}

install/arch_motd_lowmem

@@ -1,39 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-install ()
-{
-    ### generate motd
-    MOTD=$(mktemp /tmp/motd.XXXX)
-    echo "Virtual consoles 1-6 are active." >> ${MOTD}
-    echo "--------------------------------" >> ${MOTD}
-    echo "To change virtual console use ALT + F(1-7 or 12)" >> ${MOTD}
-    echo "" >> ${MOTD}
-    echo "Logging:" >> ${MOTD}
-    echo "  - vc7 is used for setup logging." >> ${MOTD}
-    echo "  - vc12 is used for kernel logging." >> ${MOTD}
-    if [ "${RUNPROGRAM}" = "mksyslinux" ]; then
-    	echo "Installation Hints:" >> ${MOTD}
-    	echo "  - Mount your install source under '/src/'"  >> ${MOTD}
-    	echo "    choose --> 'CD INSTALL' and on menu 'Select Packages' --> choose 'SRC'." >> ${MOTD}
-    	echo "  - If you booted from an USB-DEVICE, it's possible that you need to unplug" >> ${MOTD}
-    	echo "    and replug your device to get the correct node in /dev/." >> ${MOTD}
-    fi
-    if [ "${RUNPROGRAM}" = "mkpxelinux" ]; then
-    	echo "Installation Hints:" >> ${MOTD}
-    	echo "  - choose --> 'CD INSTALL' and on menu 'Select Packages' --> choose 'SRC'." >> ${MOTD}
-    fi
-    	echo "Normal Setup:" >> ${MOTD}
-    	echo "  - When you are ready, please run '/arch/setup' to install Arch Linux." >> ${MOTD}
-    	echo "For Experts:" >> ${MOTD}
-        echo "  - Use '/arch/quickinst' to install and bypass the setup routine." >> ${MOTD}
-    chmod 644 ${MOTD}
-    add_file "${MOTD}" "/etc/motd"
-}
-
-help ()
-{
-cat <<HELPEOF
-  This hook sets up dynamically the lowmem motd message, depending on
-  your system.
-HELPEOF
-}

install/arch_naim

@@ -1,17 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-install ()
-{
-    MODULES=""
-    BINARIES="naim"
-    FILES=""
-    SCRIPT="arch_naim"
-    add_file "/etc/archboot/naim/root/nircrc" "/root/.nircrc"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook includes the naim on an arch boot image.
-HELPEOF
-} 

install/arch_remote

@@ -1,49 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-install ()
-{
-    MODULES=" $(checked_modules "/drivers/net/") "
-
-    BINARIES="$(basename $(find /usr/bin/screen-*)) telnet tcpd findssl.sh scp sftp ssh ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan sshd pmap_set pmap_dump portmap xinetd in.telnetd rsync exportfs nfsstat rpc.idmapd rpc.mountd rpc.nfsd rpc.statd rpcdebug showmount sm-notify start-statd"
-    FILES=""
-    SCRIPT="arch_remote"
-    add_file "/etc/archboot/remote/etc/hosts.allow" "/etc/hosts.allow"
-    add_file "/etc/archboot/remote/etc/hosts.deny" "/etc/hosts.deny"
-    add_file "/etc/archboot/remote/etc/screenrc" "/etc/screenrc"
-    add_file "/etc/archboot/remote/etc/xinetd.conf" "/etc/xinetd.conf"
-    add_file "/etc/archboot/remote/etc/xinetd.d/servers" "/etc/xinetd.d/servers"
-    add_file "/etc/archboot/remote/etc/xinetd.d/services" "/etc/xinetd.d/services"
-    add_file "/etc/archboot/remote/etc/xinetd.d/telnet" "/etc/xinetd.d/telnet"
-    add_file "/etc/archboot/remote/etc/ssh/ssh_config" "/etc/ssh/ssh_config"
-    add_file "/etc/archboot/remote/etc/ssh/sshd_config" "/etc/ssh/sshd_config"
-    add_file "/etc/archboot/remote/etc/conf.d/sshd" "/etc/conf.d/sshd"
-    add_file "/etc/archboot/remote/etc/ssh/moduli" "/etc/ssh/moduli"
-    add_file "/etc/archboot/remote/etc/pam.d/sshd" "/etc/pam.d/sshd"
-    add_file "/etc/archboot/remote/etc/pam.d/screen" "/etc/pam.d/screen"
-    add_file "/etc/archboot/remote/etc/rsyncd.conf" "/etc/rsyncd.conf"
-    add_file "/etc/archboot/remote/etc/xinetd.d/rsync" "/etc/xinetd.d/rsync"
-    add_file "/etc/archboot/remote/etc/exports" "/etc/exports"
-    for i in $(find /usr/share/terminfo/ ! -type d); do
-    	add_file "$i"
-    done
-    add_file "/usr/lib/ssh/sftp-server"
-    add_file "/usr/lib/ssh/ssh-keysign"
-    add_file "/etc/rc.d/portmap"
-    add_file "/etc/rc.d/sshd"
-    add_file "/etc/rc.d/xinetd"
-    add_file "/etc/rc.d/rsyncd"
-    add_dir  "/var/empty"
-    add_file "/etc/rc.d/nfsd"
-    add_file "/etc/rc.d/nfslock"
-    add_file "/etc/archboot/remote/etc/conf.d/nfs" "/etc/conf.d/nfs"
-    add_dir "/var/lib/nfs/sm"
-    add_dir "/var/lib/nfs/sm.bak"
-    add_dir "/var/lib/nfs/v4recovery"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook includes remote tools on an arch boot image.
-HELPEOF
-} 

install/arch_shadow_lowmem

@@ -1,22 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-install ()
-{
-    MODULES=""
-    BINARIES="login"
-    FILES=""
-    SCRIPT=""
-    for i in $(echo /etc/archboot/shadow/etc/*/*); do
-    	add_file "$i" "$(echo $i | sed -e 's|/etc/archboot/shadow/etc|/etc|g')"
-    done
-    for i in $(echo /etc/archboot/shadow/etc/*.defs); do
-    	add_file "$i" "$(echo $i | sed -e 's|/etc/archboot/shadow/etc|/etc|g')"
-    done
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook includes the shadow on a lowmem arch boot image.
-HELPEOF
-} 

lib/initcpio/hooks/arch_dmraid

@@ -9,10 +9,11 @@ run_hook ()
 	    read dev_t < /sys/class/misc/device-mapper/dev
 	    /bin/mknod "/dev/mapper/control" c $(/bin/replace "${dev_t}" ':')
 	fi
-
+	msg ":: Activating dmraid arrays..."
-        [ "${quiet}" = "y" ] && DMRAIDQUIET=">/dev/null"
+        if [ "${quiet}" = "y" ]; then
-
+	    /usr/sbin/dmraid -ay >/dev/null
-        msg ":: Activating dmraid arrays..."
+	else
-        /usr/sbin/dmraid -ay $DMRAIDQUIET
+	     /usr/sbin/dmraid
+	fi
     fi
 }

lib/initcpio/hooks/arch_intel_wireless

@@ -11,13 +11,6 @@ run_hook ()
 	echo "Intel wireless drivers are now available."
 	! [ -d /lib/firmware/ ] && mkdir -p /lib/firmware
 	mv /intel-firmware/* /lib/firmware/
-	#echo "Unloading already loaded intel wireless modules ..."
-	#modprobe -r ipw2100 > /dev/null 2>&1
-	#modprobe -r ipw2200 > /dev/null 2>&1
-	#modprobe -r iwl3945 > /dev/null 2>&1
-	#modprobe -r iwl4965 > /dev/null 2>&1 
-     	#echo "Retrigger udev uevents ..."
-     	#/etc/start_udev uevents
     else
 	echo "ARCH_INTEL_WIRELESS USAGE:"
 	echo "--------------------"

lib/initcpio/hooks/arch_lvm2

@@ -1,5 +1,10 @@
 run_hook ()
 {
+    # fix symlinks
+    LVMSYMLINKS="vgcfgbackup vgcfgrestore vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan vgsplit pvchange pvck pvcreate pvdisplay pvmove pvremove pvresize pvs pvscan lvchange lvconvert lvcreate lvdisplay lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove lvrename lvresize lvs lvscan"
+    for i in $LVMSYMLINKS; do
+        ln -sf /sbin/lvm /sbin/$i
+    done
     /sbin/modprobe -q dm-mod >/dev/null 2>&1
     # fix if udev initialises /dev/mapper/control
     sleep 0.5

lib/initcpio/hooks/arch_pacman

@@ -2,6 +2,6 @@ run_hook ()
 {
     # fix download source
     for i in /etc/pacman.d/*; do
-	sed -i -e "s/i686/$(uname -m)/g" $i
+	sed -i -e "s/x86_64/$(uname -m)/g" $i
     done
 }

lib/initcpio/hooks/arch_pacman_lowmem

@@ -0,0 +1,7 @@
+run_hook ()
+{
+    # fix download source
+    for i in /etc/pacman.d/*; do
+	sed -i -e "s/x86_64/$(uname -m)/g" $i
+    done
+}

lib/initcpio/hooks/arch_remote

@@ -4,6 +4,11 @@ run_hook ()
     ln -s /usr/bin/ssh /usr/bin/slogin
     # fix screen
     ln -s $(find /usr/bin/screen-*) /usr/bin/screen
+    # fix nfs
+    touch /var/lib/nfs/xtab
+    touch /var/lib/nfs/state
+    touch /var/lib/nfs/rmtab
+    touch /var/lib/nfs/etab
     # fix daemons
     sed -i -e 's|^DAEMONS=(@syslog-ng)|DAEMONS=(@syslog-ng network portmap sshd xinetd)|g' /etc/rc.conf
     # fix serial console

lib/initcpio/hooks/arch_udev

@@ -0,0 +1,20 @@
+# vim: set ft=sh:
+run_hook ()
+{
+    # mount ramfs, else autodetection will fail!
+    mount -t ramfs none /dev
+    #create missing nodes
+    mknod /dev/null c 1 3
+    mknod /dev/zero c 1 5
+    mknod /dev/console c 5 1
+    # make extra nodes
+    ln -sf /proc/self/fd /dev/fd
+    ln -sf /proc/self/fd/0 /dev/stdin
+    ln -sf /proc/self/fd/1 /dev/stdout
+    ln -sf /proc/self/fd/2 /dev/stderr
+    ln -sf /proc/kcore /dev/core
+    echo > /proc/sys/kernel/hotplug
+    msg -n ":: Starting udevd..."
+    /sbin/udevd --daemon
+    msg "done."
+}

lib/initcpio/hooks/arch_udevtrigger

@@ -0,0 +1,8 @@
+# vim: set ft=sh:
+run_hook ()
+{
+    msg -n ":: Loading UDev uevents ..."
+    /sbin/udevadm trigger
+    /sbin/udevadm settle
+    msg "done."
+}

lib/initcpio/install/arch_addons

@@ -11,6 +11,7 @@ install ()
     echo "  into the install environment, please append arch-addons to boot prompt." >> ${OPTIONSBOOTMESSAGE}
     echo "  Place external addon packages in /packages directory." >> ${OPTIONSBOOTMESSAGE}
     echo "  Place external configs in /config directory." >> ${OPTIONSBOOTMESSAGE}
+    echo "" >> ${OPTIONSBOOTMESSAGE}
     ! [ -d ${TEMPDIR}/packages ] && mkdir ${TEMPDIR}/packages
     ! [ -d ${TEMPDIR}/config ] && mkdir ${TEMPDIR}/config
     cp -r /etc/archboot/packages/* ${TEMPDIR}/packages

lib/initcpio/install/arch_base

@@ -27,14 +27,14 @@ install ()
     done
 
     ### adding klibc binaries
-    for f in $(find /usr/lib/klibc/bin/ ! -name "mount" ! -name "umount" ! -name "reboot" ! -name "halt" ! -name "chroot" ! -name "sh" ! -name "modprobe" ! -name "cat" ! -name "cpio" ! -name "dd" ! -name "gunzip" ! -name "gzip" ! -name "insmod" ! -name "zcat" ! -name "lsmod" ! -name "mv" ! -name "kill" ! -name "ln" ! -name "losetup" ! -name "mkdir" ! -name "mkfifo" ! -name "mknod" ! -name "poweroff" ! -name "dmesg" ! -name "sync" ! -type d); do
+    for f in $(find /usr/lib/klibc/bin/ ! -name "mount" ! -name "umount" ! -name "reboot" ! -name "halt" ! -name "chroot" ! -name "sh" ! -name "modprobe" ! -name "cat" ! -name "cpio" ! -name "dd" ! -name "gunzip" ! -name "gzip" ! -name "insmod" ! -name "zcat" ! -name "lsmod" ! -name "mv" ! -name "kill" ! -name "ln" ! -name "losetup" ! -name "mkdir" ! -name "mkfifo" ! -name "mknod" ! -name "poweroff" ! -name "readlink" ! -name "dmesg" ! -name "sync" ! -type d); do
         add_file $f /bin/$(basename $f)
     done
 
     ### adding needed programs from running system
     add_file "${CONFIG}" "/config"
     SCRIPT="arch_base"
-    BINARIES="init agetty mount modprobe modinfo umount basename du clear env head id md5sum nano netcat printf tail tee test tr tty uptime wc which whoami xargs yes syslog-ng bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk parted gawk cp mv shutdown free ls rm sed test less chgrp chmod chown date df dialog dmesg egrep fgrep grep hostname kill killall killall5 more ps pwd rmdir stty sync tar touch uname vi lsmod modinfo rmmod hdparm true mktemp chroot dirname expr bzip2 hwclock depmod su cat cpio dd gzip wget top sdparm tput ifconfig ln losetup mkdir mkfifo mknod"
+    BINARIES="init agetty mount modprobe modinfo umount basename du clear env head id md5sum nano netcat printf tail tee test tr tty uptime wc which whoami xargs yes syslog-ng bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk parted gawk cp mv shutdown free ls rm sed test less chgrp chmod chown date df dialog dmesg egrep fgrep grep hostname kill killall killall5 more ps pwd rmdir stty sync tar touch uname vi lsmod modinfo rmmod hdparm true mktemp chroot dirname expr bzip2 hwclock depmod su cat cpio dd gzip wget top sdparm tput ifconfig ln losetup mkdir mkfifo mknod readlink"
     add_file "/bin/echo"
     add_file "/bin/gunzip"
     add_file "/bin/zcat"
@@ -43,7 +43,7 @@ install ()
     add_file "/sbin/halt"
     add_file "/sbin/telinit"
     add_file "/bin/awk"
-    add_file "/etc/archboot/base/init" "/init"
+    add_file "/usr/share/archboot/base/init" "/init"
     add_file "/usr/bin/vi"
     add_file "/bin/dir"
     add_file "/usr/share/terminfo/l/linux"
@@ -63,11 +63,11 @@ install ()
     add_file "/usr/share/vim/syntax/fstab.vim"
     add_file "/usr/share/vim/filetype.vim"
     add_file "/etc/rc.d/functions"
-    add_file "/etc/archboot/base/etc/rc.conf" "/etc/rc.conf"
+    add_file "/usr/share/archboot/base/etc/rc.conf" "/etc/rc.conf"
     add_file "/etc/rc.d/syslog-ng"
 
     ### adding config files of installation system
-    for i in $(find /etc/archboot/base/etc/*); do
+    for i in $(find /usr/share/archboot/base/etc/*); do
         add_file "$i" "/etc/$(basename $i)"
     done
     

lib/initcpio/install/arch_base_lowmem

@@ -27,14 +27,14 @@ install ()
     done
 
     ### adding klibc binaries
-    for f in $(find /usr/lib/klibc/bin/ ! -name "mount" ! -name "umount" ! -name "reboot" ! -name "halt" ! -name "chroot" ! -name "sh" ! -name "modprobe" ! -name "cat" ! -name "cpio" ! -name "dd" ! -name "gunzip" ! -name "gzip" ! -name "insmod" ! -name "zcat" ! -name "lsmod" ! -name "mv" ! -name "kill" ! -name "ln" ! -name "losetup" ! -name "mkdir" ! -name "mkfifo" ! -name "mknod" ! -name "poweroff" ! -name "sync" ! -name "dmesg" ! -type d); do
+    for f in $(find /usr/lib/klibc/bin/ ! -name "mount" ! -name "umount" ! -name "reboot" ! -name "halt" ! -name "chroot" ! -name "sh" ! -name "modprobe" ! -name "cat" ! -name "cpio" ! -name "dd" ! -name "gunzip" ! -name "gzip" ! -name "insmod" ! -name "zcat" ! -name "lsmod" ! -name "mv" ! -name "kill" ! -name "ln" ! -name "losetup" ! -name "mkdir" ! -name "mkfifo" ! -name "mknod" ! -name "poweroff" ! -name "readlink" ! -name "sync" ! -name "dmesg" ! -type d); do
         add_file $f /bin/$(basename $f)
     done
 
     ### adding needed programs from running system
     add_file "${CONFIG}" "/config"
     SCRIPT="arch_base_lowmem"
-    BINARIES="init agetty mount modprobe umount head basename clear nano printf tail test tty wc which xargs yes syslog-ng bash swapon uniq cut seq find sort fdisk sfdisk cfdisk parted gawk cp mv shutdown ls rm sed less chgrp chmod chown df dialog dmesg egrep fgrep grep kill killall killall5 more ps pwd rmdir stty sync tar touch uname hdparm true mktemp chroot dirname bzip2 date hwclock depmod cat gzip tr sdparm expr tput ifconfig ln losetup mkdir mkfifo mknod"
+    BINARIES="init agetty mount modprobe umount head basename clear nano printf tail test tty wc which xargs yes syslog-ng bash swapon uniq cut seq find sort fdisk sfdisk cfdisk parted gawk cp mv shutdown ls rm sed less chgrp chmod chown df dialog dmesg egrep fgrep grep kill killall killall5 more ps pwd rmdir stty sync tar touch uname hdparm true mktemp chroot dirname bzip2 date hwclock depmod cat gzip tr sdparm expr tput ifconfig ln losetup mkdir mkfifo mknod readlink"
     add_file "/bin/echo"
     add_file "/bin/gunzip"
     add_file "/bin/zcat"
@@ -43,15 +43,15 @@ install ()
     add_file "/sbin/halt"
     add_file "/sbin/telinit"
     add_file "/bin/awk"
-    add_file "/etc/archboot/base/init" "/init"
+    add_file "/usr/share/archboot/base/init" "/init"
     add_file "/bin/dir"
     add_file "/usr/share/terminfo/l/linux"
     add_file "/etc/rc.d/functions"
-    add_file "/etc/archboot/base/etc/rc.conf" "/etc/rc.conf"
+    add_file "/usr/share/archboot/base/etc/rc.conf" "/etc/rc.conf"
     add_file "/etc/rc.d/syslog-ng"
 
     ### adding config files of installation system
-    for i in $(find /etc/archboot/base/etc/*); do
+    for i in $(find /usr/share/archboot/base/etc/*); do
         add_file "$i" "/etc/$(basename $i)"
     done
     

lib/initcpio/install/arch_bootmessage

@@ -3,8 +3,7 @@
 install ()
 {
     ### generate boot.msg
-    [ "${RUNPROGRAM}" = "mkbootcd" ] && TITLEMSG="ISOLINUX"
+    [ "${RUNPROGRAM}" = "mkisolinux" ] && TITLEMSG="ISOLINUX"
-    [ "${RUNPROGRAM}" = "mkbootcd-grub" ] && TITLEMSG="GRUB"
     [ "${RUNPROGRAM}" = "mksyslinux" ] && TITLEMSG="SYSLINUX"
     [ "${RUNPROGRAM}" = "mkpxelinux" ] && TITLEMSG="PXELINUX"
     # change to english locale!
@@ -18,7 +17,7 @@ install ()
     echo "Distributed under the GNU General Public License (GPL)" >> ${BOOTMESSAGE}
     echo "" >> ${BOOTMESSAGE}
     echo "${TITLEMSG} BOOT" >> ${BOOTMESSAGE}
-    echo "Creation Tool: '$(echo ${RUNPROGRAM} | sed 's|-grub||')' written by Tobias Powalowski <tpowa@archlinux.org>" >> ${BOOTMESSAGE}
+    echo "Creation Tool: '$(echo ${RUNPROGRAM})' written by Tobias Powalowski <tpowa@archlinux.org>" >> ${BOOTMESSAGE}
     echo "" >> ${BOOTMESSAGE}
     echo "${CONFIGMSG}" >> ${BOOTMESSAGE} 
     echo "Arch Linux ${NAME}" >> ${BOOTMESSAGE}
@@ -26,12 +25,8 @@ install ()
     echo "Architecture: $(uname -m)" >> ${BOOTMESSAGE}
     echo "Creation Date: $(date)" >> ${BOOTMESSAGE}
     echo "" >> ${BOOTMESSAGE}
-    if [ "${RUNPROGRAM}" = "mkbootcd-grub" ]; then
+    [ -s "${APPENDBOOTMESSAGE}" ] && cat ${APPENDBOOTMESSAGE} >> ${BOOTMESSAGE}
-    	[ -s "${APPENDBOOTMESSAGE}" ] && cat ${APPENDBOOTMESSAGE} >> ${BOOTMESSAGE}
+    [ -s "${APPENDOPTIONSBOOTMESSAGE}" ] && cat ${APPENDOPTIONSBOOTMESSAGE} >> ${OPTIONSBOOTMESSAGE}
-    else
-    	[ -s "${APPENDBOOTMESSAGE_SYSLINUX}" ] && cat ${APPENDBOOTMESSAGE_SYSLINUX} >> ${BOOTMESSAGE}
-    	[ -s "${APPENDOPTIONSBOOTMESSAGE}" ] && cat ${APPENDOPTIONSBOOTMESSAGE} >> ${OPTIONSBOOTMESSAGE}
-    fi
 }
 
 help ()

lib/initcpio/install/arch_bootmessage_allinone

@@ -0,0 +1,16 @@
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+
+install ()
+{
+    ### generate boot.msg
+    [ -s "${APPENDBOOTMESSAGE}" ] && cat ${APPENDBOOTMESSAGE} >> ${BOOTMESSAGE}
+    [ -s "${APPENDOPTIONSBOOTMESSAGE}" ] && cat ${APPENDOPTIONSBOOTMESSAGE} >> ${OPTIONSBOOTMESSAGE}
+}
+
+help ()
+{
+cat <<HELPEOF
+  This hook sets up dynamically the boot message, depending on
+  your system.
+HELPEOF
+}

lib/initcpio/install/arch_capi4k

@@ -10,7 +10,7 @@ install ()
 	add_file "$i"
     done
     add_file "/etc/rc.d/capiinit"
-    add_file "/etc/archboot/capi4k/etc/capi.conf" "/etc/capi.conf"
+    add_file "/usr/share/archboot/capi4k/etc/capi.conf" "/etc/capi.conf"
 }
 
 help ()

lib/initcpio/install/arch_core_install

@@ -77,12 +77,12 @@ install ()
     SCRIPT=
     BINARIES=
     # generate iso title name
-    [ "${RUNPROGRAM}" = "mkbootcd" -o "${RUNPROGRAM}" = "mkbootcd-grub" ] && echo "Arch Linux Archboot CORE $(uname -m)" >> ${ISONAME}
+    [ "${RUNPROGRAM}" = "mkisolinux" ] && echo "Arch_Linux_CORE $(uname -m)" >> ${ISONAME}
 }
 
 help ()
 {
 cat <<HELPEOF
-  This hook sets up all you need for a archboot install image.
+  This hook sets up all you need for an core install image.
 HELPEOF
 }

lib/initcpio/install/arch_cpufreq

@@ -7,7 +7,7 @@ install ()
     BINARIES="cpufreq-info cpufreq-set"
     FILES=""
     SCRIPT=""
-    add_file "/etc/archboot/cpufreq/etc/conf.d/cpufreq" "/etc/conf.d/cpufreq"
+    add_file "/usr/share/archboot/cpufreq/etc/conf.d/cpufreq" "/etc/conf.d/cpufreq"
     add_file "/etc/rc.d/cpufreq"
 }
 

lib/initcpio/install/arch_ftp_install

@@ -27,7 +27,7 @@ install ()
     SCRIPT=
     BINARIES=
     # generate iso title name
-    [ "${RUNPROGRAM}" = "mkbootcd" -o "${RUNPROGRAM}" = "mkbootcd-grub" ] && echo "Arch Linux Archboot FTP $(uname -m)" >> ${ISONAME}
+    [ "${RUNPROGRAM}" = "mkisolinux" ] && echo "Arch_Linux_FTP $(uname -m)" >> ${ISONAME}
 }
 
 help ()

lib/initcpio/install/arch_grub

@@ -6,7 +6,7 @@ install ()
     BINARIES="grub grub-install grub-md5-crypt grub-set-default grub-terminfo install-grub"
     FILES=""
     SCRIPT=""
-    add_file "/etc/archboot/grub/boot/grub/menu.lst" "/boot/grub/menu.lst"
+    add_file "/usr/share/archboot/grub/boot/grub/menu.lst" "/boot/grub/menu.lst"
     for i in $(find /usr/lib/grub ! -type d); do
     	add_file "$i"
     done

lib/initcpio/install/arch_installer

@@ -7,14 +7,14 @@ install ()
     FILES=""
     SCRIPT=""
     ! [ -d "${TEMPDIR}/arch/" ] && mkdir -p ${TEMPDIR}/arch/
-    add_file "/etc/archboot/installer/setup" "/arch/setup"
+    add_file "/usr/share/archboot/installer/setup" "/arch/setup"
-    add_file "/etc/archboot/installer/quickinst" "/arch/quickinst"
+    add_file "/usr/share/archboot/installer/quickinst" "/arch/quickinst"
     DOCS=$(mktemp /tmp/docs.XXXX)
-    cp -f /etc/archboot/installer/arch-install-guide.txt ${DOCS}
+    cp -f /usr/share/archboot/installer/arch-install-guide.txt ${DOCS}
     gzip -9 ${DOCS}
     add_file "${DOCS}.gz" "/arch/archdoc.txt.gz" 
     add_dir "/src" 
-    cp /etc/archboot/installer/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt
+    cp /usr/share/archboot/installer/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt
 }
 
 help ()

lib/initcpio/install/arch_intel_wireless

@@ -28,6 +28,7 @@ install ()
     echo "- ARCH_INTEL_WIRELESS USAGE:" >> ${OPTIONSBOOTMESSAGE}
     echo "  In order to use those drivers, you have to agree to the firmware licenses" >> ${OPTIONSBOOTMESSAGE}
     echo "  by appending intel-wireless to boot prompt." >> ${OPTIONSBOOTMESSAGE}
+    echo "" >> ${OPTIONSBOOTMESSAGE}
 }
 
 help ()

lib/initcpio/install/arch_iptables

@@ -8,9 +8,9 @@ install ()
     SCRIPT=""
     add_file "/etc/rc.d/iptables"
     add_file "/etc/rc.d/ip6tables"
-    add_file "/etc/archboot/iptables/etc/conf.d/iptables" "/etc/conf.d/iptables"
+    add_file "/usr/share/archboot/iptables/etc/conf.d/iptables" "/etc/conf.d/iptables"
-    add_file "/etc/archboot/iptables/etc/iptables/empty.rules" "/etc/iptables/empty.rules"
+    add_file "/usr/share/archboot/iptables/etc/iptables/empty.rules" "/etc/iptables/empty.rules"
-    add_file "/etc/archboot/iptables/etc/iptables/simple_firewall.rules" "/etc/iptables/simple_firewall.rules"
+    add_file "/usr/share/archboot/iptables/etc/iptables/simple_firewall.rules" "/etc/iptables/simple_firewall.rules"
 
 }
 

lib/initcpio/install/arch_isdn

@@ -0,0 +1,23 @@
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+
+install ()
+{
+    MODULES=" $(checked_modules "/drivers/isdn/") "
+
+    BINARIES="hisaxctrl icnctrl imon imontty ipppd ipppstats isdnctrl isdnlog mkzonedb pcbitctl isdnconf isdnrate isdnrep"
+    FILES=""
+    SCRIPT=""
+    add_file "/usr/share/archboot/isdn/etc/isdn/callerid.conf" "/etc/isdn/callerid.conf"
+    add_file "/usr/share/archboot/isdn/etc/isdn/isdn.conf" "/etc/isdn/isdn.conf"
+    add_file "/usr/share/archboot/isdn/etc/isdn/isdnlog.isdnctrl0.options" "/etc/isdn/isdnlog.isdnctrl0.options"
+    add_file "/usr/share/archboot/isdn/etc/isdn/isdnlog.users" "/etc/isdn/isdnlog.users"
+    add_file "/usr/share/archboot/isdn/etc/isdn/rate.conf" "/etc/isdn/rate.conf"
+    add_file "/usr/share/archboot/isdn/etc/isdn/stop" "/etc/isdn/stop"
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook includes the isdn subsystem on an arch boot image.
+HELPEOF
+}

lib/initcpio/install/arch_kexec

@@ -7,7 +7,7 @@ install ()
     FILES=""
     SCRIPT=""
     add_file "/etc/rc.d/kexec"
-    add_file "/etc/archboot/kexec/etc/conf.d/kexec" "/etc/conf.d/kexec"
+    add_file "/usr/share/archboot/kexec/etc/conf.d/kexec" "/etc/conf.d/kexec"
 }
 
 help ()

lib/initcpio/install/arch_keymap

@@ -13,7 +13,7 @@ install ()
         for i in $(find /usr/share/kbd/ ! -type d ! -name "mac*"  ! -name "ppc" ! -name "ppc" ! -name "atari*" ! -name "sun*" ! -name "README*" ! -name "amiga*"); do
             add_file $i
         done
-    add_file /etc/archboot/keymap/km /usr/bin/km
+    add_file /usr/share/archboot/keymap/km /usr/bin/km
 }
 
 help ()

lib/initcpio/install/arch_lilo

@@ -6,7 +6,7 @@ install ()
     BINARIES="lilo"
     FILES=""
     SCRIPT=""
-    add_file "/etc/archboot/lilo/etc/lilo.conf" "/etc/lilo.conf"
+    add_file "/usr/share/archboot/lilo/etc/lilo.conf" "/etc/lilo.conf"
 }
 
 help ()

lib/initcpio/install/arch_linux_atm

@@ -7,7 +7,7 @@ install ()
     FILES=""
     SCRIPT=""
     add_dir "/etc/ppp/peers/plugins"
-    add_file "/etc/archboot/linux_atm/etc/atmsigd.conf" "/etc/atmsigd.conf"
+    add_file "/usr/share/archboot/linux_atm/etc/atmsigd.conf" "/etc/atmsigd.conf"
 }
 
 help ()

lib/initcpio/install/arch_lvm2

@@ -3,7 +3,7 @@
 install ()
 {
     MODULES=" dm-mod "
-    BINARIES="lvm"
+    BINARIES="lvm fsadm lvmdump"
     FILES=""
     SCRIPT="arch_lvm2"
 

lib/initcpio/install/arch_memtest

@@ -5,8 +5,8 @@ install ()
     BINARIES=""
     FILES=""
     SCRIPT=""
-    [ ${RUNPROGRAM}  = "mkbootcd" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/isolinux/memtest"
+    [ ${RUNPROGRAM}  = "mkisolinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/isolinux/memtest"
-    [ ${RUNPROGRAM}  = "mkbootcd-grub" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"
+    [ ${RUNPROGRAM}  = "archboot-tarball-helper.sh" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/isolinux/memtest"
     [ ${RUNPROGRAM}  = "mksyslinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/memtest"
     [ ${RUNPROGRAM}  = "mkpxelinux" ] && cp "/boot/memtest86+/memtest.bin" "${INSTALLDIR}/memtest"
 }

lib/initcpio/install/arch_motd

@@ -0,0 +1,45 @@
+# Created by Tobias Powalowski <tpowa@archlinux.org>
+
+install ()
+{
+    ### generate motd
+    MOTD=$(mktemp /tmp/motd.XXXX)
+    echo "Welcome to Arch Linux (archboot environment)" >> ${MOTD}
+    echo "--------------------------------------------" >> ${MOTD}
+    echo "Consoles:" >> ${MOTD}
+    echo "  - Virtual consoles 1-6 are active." >> ${MOTD}
+    echo "  - To change virtual console use ALT + F(1-7 or 12)" >> ${MOTD}
+    echo "Logging:" >> ${MOTD}
+    echo "  - vc7 is used for setup logging." >> ${MOTD}
+    echo "  - vc12 is used for kernel logging." >> ${MOTD}
+    echo "Device node problems (eg. usbsticks or external harddrives:" >> ${MOTD}
+    echo "  - Please unplug and replug your device to get the correct node in /dev/." >> ${MOTD}
+if [ "$(echo $HOOKS | grep arch_keymap)" ]; then
+    echo "Keymap:" >> ${MOTD}
+    echo "  - To change to a non-US keymap, type 'km' at the console." >> ${MOTD}
+fi
+if [ "$(echo $HOOKS | grep arch_tz)" ]; then
+    echo "Timesetting:" >> ${MOTD}
+    echo "  - To change your clock, type 'tz' at the console." >> ${MOTD}
+fi
+if [ "$(echo $HOOKS | grep arch_installer)" ]; then
+    echo "Normal Setup:" >> ${MOTD}
+    echo "  - On first login /arch/setup is launched automatically." >> ${MOTD}
+    echo "  - Please run '/arch/setup' again to install Arch Linux if you left setup." >> ${MOTD}
+    echo "For Experts:" >> ${MOTD}
+    echo "  - Use '/arch/quickinst' to install and bypass the setup routine." >> ${MOTD}
+    echo "Documentation:" >> ${MOTD}
+    echo "  - Documentation can be read by executing:" >> ${MOTD}
+    echo "    zcat /arch/archdoc.txt.gz | less" >> ${MOTD}
+fi
+    chmod 644 ${MOTD}
+    add_file "${MOTD}" "/etc/motd"
+}
+
+help ()
+{
+cat <<HELPEOF
+  This hook sets up dynamically the motd message, depending on
+  your system.
+HELPEOF
+}

lib/initcpio/install/arch_net

@@ -11,13 +11,13 @@ install ()
     add_file "/sbin/ifenslave"
     add_file "/usr/sbin/brctl"
     add_file "/etc/rc.d/network"
-    add_file "/etc/archboot/net/etc/conf.d/dhcpcd" "/etc/conf.d/dhcpcd"
+    add_file "/usr/share/archboot/net/etc/conf.d/dhcpcd" "/etc/conf.d/dhcpcd"
-    add_file "/etc/archboot/net/etc/conf.d/bonding" "/etc/conf.d/bonding"
+    add_file "/usr/share/archboot/net/etc/conf.d/bonding" "/etc/conf.d/bonding"
-    add_file "/etc/archboot/net/etc/conf.d/bridges" "/etc/conf.d/bridges"
+    add_file "/usr/share/archboot/net/etc/conf.d/bridges" "/etc/conf.d/bridges"
     for i in $(find /usr/lib/dhcpcd -type f); do
         add_file "$i"
     done
-    add_file "/etc/archboot/net/etc/dhcpcd.conf" "/etc/dhcpcd.conf"
+    add_file "/usr/share/archboot/net/etc/dhcpcd.conf" "/etc/dhcpcd.conf"
     add_dir "/var/lib/dhcpcd"
 }
 

lib/initcpio/install/arch_netcfg

@@ -20,7 +20,7 @@ install ()
     add_file "/etc/rc.d/net-profiles"
     add_file "/etc/rc.d/net-rename"
     add_file "/etc/rc.d/net-auto"
-    add_file "/etc/archboot/netcfg/etc/iftab" "/etc/iftab"
+    add_file "/usr/share/archboot/netcfg/etc/iftab" "/etc/iftab"
 }
 
 help ()

lib/initcpio/install/arch_openvpn

@@ -8,7 +8,7 @@ install ()
     SCRIPT=""
     CONFIG_FILES="README client.conf firewall.sh home.up loopback-client loopback-server office.up openvpn-shutdown.sh openvpn-startup.sh server.conf static-home.conf static-office.conf tls-home.conf tls-office.conf xinetd-client-config xinetd-server-config"
     for i in $CONFIG_FILES; do
-    	add_file "/etc/archboot/openvpn/etc/openvpn/examples/$i" "/etc/openvpn/examples/$i"
+    	add_file "/usr/share/archboot/openvpn/etc/openvpn/examples/$i" "/etc/openvpn/examples/$i"
     done
 }
 

lib/initcpio/install/arch_pacman

@@ -12,7 +12,7 @@ e2fsprogs findutils gawk grep iputils jfsutils less lvm2 mdadm module-init-tools
 ncurses net-tools gnu-netcat ntfsprogs pcmciautils procps psmisc reiserfsprogs sed snarf \
 syslog-ng sysvinit tar util-linux-ng which wireless_tools xfsprogs dnsutils hdparm memtest86+ \
 grub netkit-telnet openssh hwdetect portmap shadow bridge-utils ifenslave cpufrequtils links tcp_wrappers \
-dosfstools udev initscripts filesystem kernel26 glibc kernel-headers xinetd naim links pacman screen kbd pam \
+dosfstools udev initscripts filesystem kernel26 glibc kernel-headers xinetd links pacman screen kbd pam \
 dhcpcd bzip2 gcc-libs openssl zlib libelf gpm sysfsutils libgcrypt libgpg-error popt kexec-tools ppp libpcap \
 rp-pppoe lilo grub iptables capi4k-utils ntfs-3g isdn4k-utils pciutils usbutils vpnc openvpn b43-fwcutter \
 wpa_supplicant gzip rsync libarchive libdownload device-mapper cracklib nfs-utils nfsidmap readline acl attr \
@@ -29,8 +29,8 @@ for i in $DEPENDS; do
 	done
 done
 add_dir "/var/log"
-add_file "/etc/archboot/pacman/etc/pacman.conf" "/etc/pacman.conf"
+add_file "/usr/share/archboot/pacman/etc/pacman.conf" "/etc/pacman.conf"
-add_file "/etc/archboot/pacman/etc/pacman.d/mirrorlist" "/etc/pacman.d/mirrorlist"
+add_file "/usr/share/archboot/pacman/etc/pacman.d/mirrorlist" "/etc/pacman.d/mirrorlist"
 }
 
 help ()

lib/initcpio/install/arch_pacman_lowmem

@@ -23,8 +23,8 @@ for i in $DEPENDS; do
 	done
 done
 add_dir "/var/log"
-add_file "/etc/archboot/pacman/etc/pacman.conf" "/etc/pacman.conf"
+add_file "/usr/share/archboot/pacman/etc/pacman.conf" "/etc/pacman.conf"
-add_file "/etc/archboot/pacman/etc/pacman.d/mirrorlist" "/etc/pacman.d/mirrorlist"
+add_file "/usr/share/archboot/pacman/etc/pacman.d/mirrorlist" "/etc/pacman.d/mirrorlist"
 }
 
 help ()

lib/initcpio/install/arch_pam

@@ -6,10 +6,10 @@ install ()
     BINARIES="pam_tally unix_chkpwd"
     FILES=""
     SCRIPT=""
-    for i in $(echo /etc/archboot/pam/etc/*/*); do
+    for i in $(echo /usr/share/archboot/pam/etc/*/*); do
-    	add_file "$i" "$(echo $i | sed -e 's|/etc/archboot/pam/etc|/etc|g')"
+    	add_file "$i" "$(echo $i | sed -e 's|/usr/share/archboot/pam/etc|/etc|g')"
     done
-    add_file "/etc/archboot/pam/etc/environment" "/etc/environment"
+    add_file "/usr/share/archboot/pam/etc/environment" "/etc/environment"
     for i in $(echo /lib/libpam*); do
     	add_file "$i"
     done