diff --git a/allinone/config/boot.msg b/allinone/config/boot.msg deleted file mode 100644 index 4f14dead3..000000000 --- a/allinone/config/boot.msg +++ /dev/null @@ -1,24 +0,0 @@ -Arch Linux -http://www.archlinux.org -Copyright 2002 - 2007 Judd Vinet -Copyright 2007 - 2008 Aaron Griffin -Distributed under the GNU General Public License (GPL) - -ISOLINUX BOOT -Creation Tool: 'archboot' written by Tobias Powalowski - -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 ' to boot the install/rescue system. -- 'arch root=/dev/??? ' to boot into an existing system. -- 'lowmem ' to boot the 64MB RAM install system. -- 'lowmem root=/dev/??? ' 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. diff --git a/allinone/config/isolinux.bin b/allinone/config/isolinux.bin deleted file mode 100755 index a758379be..000000000 Binary files a/allinone/config/isolinux.bin and /dev/null differ diff --git a/allinone/config/isolinux.cfg b/allinone/config/isolinux.cfg deleted file mode 100644 index 47a79c19b..000000000 --- a/allinone/config/isolinux.cfg +++ /dev/null @@ -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 \ No newline at end of file diff --git a/allinone/config/options.msg b/allinone/config/options.msg deleted file mode 100644 index d98e4d208..000000000 --- a/allinone/config/options.msg +++ /dev/null @@ -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. - - - diff --git a/config/placeholder b/config/placeholder deleted file mode 100644 index 8a13ff141..000000000 --- a/config/placeholder +++ /dev/null @@ -1 +0,0 @@ -This is a placeholder file :) diff --git a/etc/append-message-syslinux-tarball b/etc/append-message-syslinux-tarball deleted file mode 100644 index 2b59c26f0..000000000 --- a/etc/append-message-syslinux-tarball +++ /dev/null @@ -1,8 +0,0 @@ -Available boot options (no input will boot the install/rescue system): -- 'arch ' to boot the install/rescue system. -- 'arch root=/dev/??? ' to boot into an existing system. -- 'lowmem ' to boot the 64MB RAM install system. -- 'lowmem root=/dev/??? ' 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. diff --git a/etc/archboot/allinone-lowmem.conf b/etc/archboot/allinone-lowmem.conf new file mode 100644 index 000000000..224cbb2f1 --- /dev/null +++ b/etc/archboot/allinone-lowmem.conf @@ -0,0 +1,33 @@ +# vim:set ft=sh: +# Created by Tobias Powalowski +# 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="" diff --git a/etc/archboot/allinone.conf b/etc/archboot/allinone.conf new file mode 100644 index 000000000..42e47ba22 --- /dev/null +++ b/etc/archboot/allinone.conf @@ -0,0 +1,32 @@ +# vim:set ft=sh: +# Created by Tobias Powalowski +# 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="" diff --git a/etc/archboot/config/placeholder b/etc/archboot/config/placeholder new file mode 100644 index 000000000..0519ecba6 --- /dev/null +++ b/etc/archboot/config/placeholder @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/etc/archboot/default-ftp-pxelinux.conf b/etc/archboot/default-ftp-pxelinux.conf new file mode 100644 index 000000000..0ef317a3e --- /dev/null +++ b/etc/archboot/default-ftp-pxelinux.conf @@ -0,0 +1,32 @@ +# vim:set ft=sh: +# Created by Tobias Powalowski +# 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="" diff --git a/etc/archboot/default-ftp.conf b/etc/archboot/default-ftp.conf new file mode 100644 index 000000000..fe2de4031 --- /dev/null +++ b/etc/archboot/default-ftp.conf @@ -0,0 +1,32 @@ +# vim:set ft=sh: +# Created by Tobias Powalowski +# 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="" diff --git a/etc/archboot/default-pxelinux.conf b/etc/archboot/default-pxelinux.conf new file mode 100644 index 000000000..9d1894ab8 --- /dev/null +++ b/etc/archboot/default-pxelinux.conf @@ -0,0 +1,32 @@ +# vim:set ft=sh: +# Created by Tobias Powalowski +# 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="" diff --git a/etc/archboot/default.conf b/etc/archboot/default.conf new file mode 100644 index 000000000..a75800342 --- /dev/null +++ b/etc/archboot/default.conf @@ -0,0 +1,32 @@ +# vim:set ft=sh: +# Created by Tobias Powalowski +# 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="" diff --git a/etc/archboot/lowmem.conf b/etc/archboot/lowmem.conf new file mode 100644 index 000000000..1ad267e29 --- /dev/null +++ b/etc/archboot/lowmem.conf @@ -0,0 +1,33 @@ +# vim:set ft=sh: +# Created by Tobias Powalowski +# 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="" diff --git a/etc/archboot/packages/placeholder b/etc/archboot/packages/placeholder new file mode 100644 index 000000000..0519ecba6 --- /dev/null +++ b/etc/archboot/packages/placeholder @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/etc/archboot/presets/allinone b/etc/archboot/presets/allinone new file mode 100644 index 000000000..a0d73654a --- /dev/null +++ b/etc/archboot/presets/allinone @@ -0,0 +1,31 @@ +# vim:set ft=sh: +# Created by Tobias Powalowski +# 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" + diff --git a/etc/archboot/presets/allinone-lowmem b/etc/archboot/presets/allinone-lowmem new file mode 100644 index 000000000..da7148ab6 --- /dev/null +++ b/etc/archboot/presets/allinone-lowmem @@ -0,0 +1,31 @@ +# vim:set ft=sh: +# Created by Tobias Powalowski +# 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" + diff --git a/archbootcd.conf b/etc/archboot/presets/isolinux similarity index 58% rename from archbootcd.conf rename to etc/archboot/presets/isolinux index 17f6270a3..c286fe7d1 100644 --- a/archbootcd.conf +++ b/etc/archboot/presets/isolinux @@ -1,12 +1,12 @@ # vim:set ft=sh: # Created by Tobias Powalowski -# 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_SYSLINUX="/etc/archboot/etc/append-message-syslinux" -APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options" +APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message" +APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options" -# menu.lst or isolinux.cfg files to use -ISOLINUXCFG="/etc/archboot/etc/isolinux.cfg" -MENULST="/etc/archboot/etc/menu.lst" +# isolinux.cfg files to use +ISOLINUXCFG="/usr/share/archboot/bootloader/bootloader.cfg" -# 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" diff --git a/archbootcd-lowmem.conf b/etc/archboot/presets/isolinux-ftp similarity index 54% rename from archbootcd-lowmem.conf rename to etc/archboot/presets/isolinux-ftp index 3f22d19a3..4735a5fff 100644 --- a/archbootcd-lowmem.conf +++ b/etc/archboot/presets/isolinux-ftp @@ -1,12 +1,12 @@ # vim:set ft=sh: # Created by Tobias Powalowski -# 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_SYSLINUX="/etc/archboot/etc/append-message-syslinux" -APPENDBOOTMESSAGE_SYSLINUX_LOWMEM="/etc/archboot/etc/append-message-syslinux-lowmem" -APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options" +APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message" +APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options" -# menu.lst or isolinux.cfg files to use -ISOLINUXCFG="/etc/archboot/etc/isolinux.cfg" -MENULST="/etc/archboot/etc/menu.lst" +# isolinux.cfg files to use +ISOLINUXCFG="/usr/share/archboot/bootloader/bootloader.cfg" -# 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" diff --git a/archbootcd-tarball.conf b/etc/archboot/presets/isolinux-lowmem similarity index 53% rename from archbootcd-tarball.conf rename to etc/archboot/presets/isolinux-lowmem index d50f32411..c0aa68679 100644 --- a/archbootcd-tarball.conf +++ b/etc/archboot/presets/isolinux-lowmem @@ -1,12 +1,12 @@ # vim:set ft=sh: # Created by Tobias Powalowski -# 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_SYSLINUX="/etc/archboot/etc/append-message-syslinux" -APPENDBOOTMESSAGE_SYSLINUX_LOWMEM="/etc/archboot/etc/append-message-syslinux-tarball" -APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options" +APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message-lowmem" +APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options-lowmem" -# menu.lst or isolinux.cfg files to use -ISOLINUXCFG="/etc/archboot/etc/isolinux-tarball.cfg" -MENULST="/etc/archboot/etc/menu.lst" +# isolinux.cfg files to use +ISOLINUXCFG="/usr/share/archboot/bootloader/bootloader.cfg" -# 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" diff --git a/archpxelinux.conf b/etc/archboot/presets/pxelinux similarity index 63% rename from archpxelinux.conf rename to etc/archboot/presets/pxelinux index 2ff841487..0868a3844 100644 --- a/archpxelinux.conf +++ b/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_SYSLINUX="/etc/archboot/etc/append-message-syslinux" -APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options" +APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message" +APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/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="0" +# 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 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="" \ No newline at end of file +NFSROOTDIR="/srv/archboot" \ No newline at end of file diff --git a/etc/archboot/presets/pxelinux-ftp b/etc/archboot/presets/pxelinux-ftp new file mode 100644 index 000000000..06ee640fe --- /dev/null +++ b/etc/archboot/presets/pxelinux-ftp @@ -0,0 +1,38 @@ +# Created by Tobias Powalowski +# 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" \ No newline at end of file diff --git a/archusbstick.conf b/etc/archboot/presets/syslinux similarity index 63% rename from archusbstick.conf rename to etc/archboot/presets/syslinux index 595564bd7..db4b90abc 100644 --- a/archusbstick.conf +++ b/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_SYSLINUX="/etc/archboot/etc/append-message-syslinux" -APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options" +APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message" +APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/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="0" +# Timeout, 30 seconds to fix usb keyboard issues +# 0 means wait for prompt +TIMEOUT="300" # default MBR MBR="/usr/share/mksyslinux/mbr.bin" \ No newline at end of file diff --git a/archsyslinux.conf b/etc/archboot/presets/syslinux-ftp similarity index 62% rename from archsyslinux.conf rename to etc/archboot/presets/syslinux-ftp index 5bec9f9f3..7eb38f6ab 100644 --- a/archsyslinux.conf +++ b/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_SYSLINUX="/etc/archboot/etc/append-message-syslinux" -APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options" +APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message" +APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/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="0" +# Timeout, 30 seconds to fix usb keyboard issues +# 0 means wait for prompt +TIMEOUT="300" # default MBR MBR="/usr/share/mksyslinux/mbr.bin" \ No newline at end of file diff --git a/archusbstick-lowmem.conf b/etc/archboot/presets/syslinux-lowmem similarity index 59% rename from archusbstick-lowmem.conf rename to etc/archboot/presets/syslinux-lowmem index d5a71ae3c..535d0a27e 100644 --- a/archusbstick-lowmem.conf +++ b/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_SYSLINUX="/etc/archboot/etc/append-message-syslinux" -APPENDBOOTMESSAGE_SYSLINUX_LOWMEM="/etc/archboot/etc/append-message-syslinux-lowmem" -APPENDOPTIONSBOOTMESSAGE="/etc/archboot/etc/append-options" +APPENDBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-message-lowmem" +APPENDOPTIONSBOOTMESSAGE="/usr/share/archboot/bootloader/messages/append-options-lowmem" # 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="0" +# Timeout, 30 seconds to fix usb keyboard issues +# 0 means wait for prompt +TIMEOUT="300" # default MBR MBR="/usr/share/mksyslinux/mbr.bin" \ No newline at end of file diff --git a/etc/syslinux-tarball.cfg b/etc/syslinux-tarball.cfg deleted file mode 100644 index 6fd6d4e3e..000000000 --- a/etc/syslinux-tarball.cfg +++ /dev/null @@ -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@@ \ No newline at end of file diff --git a/etc/syslinux.cfg b/etc/syslinux.cfg deleted file mode 100644 index 9bf630173..000000000 --- a/etc/syslinux.cfg +++ /dev/null @@ -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@@ diff --git a/hooks/arch_pacman_lowmem b/hooks/arch_pacman_lowmem deleted file mode 100644 index caa007458..000000000 --- a/hooks/arch_pacman_lowmem +++ /dev/null @@ -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 -} diff --git a/hooks/arch_udev b/hooks/arch_udev deleted file mode 100644 index fc4c8144a..000000000 --- a/hooks/arch_udev +++ /dev/null @@ -1,7 +0,0 @@ -# vim: set ft=sh: -run_hook () -{ - msg -n ":: Loading udev..." - /etc/start_udev - msg "done." -} diff --git a/install-lowmem.conf b/install-lowmem.conf deleted file mode 100644 index 943aedcb8..000000000 --- a/install-lowmem.conf +++ /dev/null @@ -1,73 +0,0 @@ -# vim:set ft=sh: -# Created by Tobias Powalowski -# 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" diff --git a/install.conf b/install.conf deleted file mode 100644 index 63c9f2a12..000000000 --- a/install.conf +++ /dev/null @@ -1,72 +0,0 @@ -# vim:set ft=sh: -# Created by Tobias Powalowski -# 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" diff --git a/install/arch_bootmessage_lowmem b/install/arch_bootmessage_lowmem deleted file mode 100644 index cee582566..000000000 --- a/install/arch_bootmessage_lowmem +++ /dev/null @@ -1,43 +0,0 @@ -# Created by Tobias Powalowski - -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 " >> ${BOOTMESSAGE} - echo "Copyright 2007 - 2008 Aaron Griffin " >> ${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 " >> ${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 < - -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< - -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 < - -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 < - -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 < - -install () -{ - MODULES="" - BINARIES="naim" - FILES="" - SCRIPT="arch_naim" - add_file "/etc/archboot/naim/root/nircrc" "/root/.nircrc" -} - -help () -{ -cat< - -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< - -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</dev/null + else + /usr/sbin/dmraid + fi fi } diff --git a/hooks/arch_encrypt b/lib/initcpio/hooks/arch_encrypt similarity index 100% rename from hooks/arch_encrypt rename to lib/initcpio/hooks/arch_encrypt diff --git a/hooks/arch_filesystems b/lib/initcpio/hooks/arch_filesystems similarity index 100% rename from hooks/arch_filesystems rename to lib/initcpio/hooks/arch_filesystems diff --git a/hooks/arch_filesystems_lowmem b/lib/initcpio/hooks/arch_filesystems_lowmem similarity index 100% rename from hooks/arch_filesystems_lowmem rename to lib/initcpio/hooks/arch_filesystems_lowmem diff --git a/hooks/arch_floppy b/lib/initcpio/hooks/arch_floppy similarity index 100% rename from hooks/arch_floppy rename to lib/initcpio/hooks/arch_floppy diff --git a/hooks/arch_hwdetect b/lib/initcpio/hooks/arch_hwdetect similarity index 100% rename from hooks/arch_hwdetect rename to lib/initcpio/hooks/arch_hwdetect diff --git a/hooks/arch_intel_wireless b/lib/initcpio/hooks/arch_intel_wireless similarity index 72% rename from hooks/arch_intel_wireless rename to lib/initcpio/hooks/arch_intel_wireless index 167e626e3..395d34990 100644 --- a/hooks/arch_intel_wireless +++ b/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 "--------------------" diff --git a/hooks/arch_licenses b/lib/initcpio/hooks/arch_licenses similarity index 100% rename from hooks/arch_licenses rename to lib/initcpio/hooks/arch_licenses diff --git a/hooks/arch_lvm2 b/lib/initcpio/hooks/arch_lvm2 similarity index 53% rename from hooks/arch_lvm2 rename to lib/initcpio/hooks/arch_lvm2 index 7d06b7fde..ba94c3374 100644 --- a/hooks/arch_lvm2 +++ b/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 diff --git a/hooks/arch_naim b/lib/initcpio/hooks/arch_naim similarity index 100% rename from hooks/arch_naim rename to lib/initcpio/hooks/arch_naim diff --git a/hooks/arch_pacman b/lib/initcpio/hooks/arch_pacman similarity index 68% rename from hooks/arch_pacman rename to lib/initcpio/hooks/arch_pacman index 9ffe3f36a..a0d956488 100644 --- a/hooks/arch_pacman +++ b/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 } diff --git a/lib/initcpio/hooks/arch_pacman_lowmem b/lib/initcpio/hooks/arch_pacman_lowmem new file mode 100644 index 000000000..a0d956488 --- /dev/null +++ b/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 +} diff --git a/hooks/arch_pxelinux b/lib/initcpio/hooks/arch_pxelinux similarity index 100% rename from hooks/arch_pxelinux rename to lib/initcpio/hooks/arch_pxelinux diff --git a/hooks/arch_raid b/lib/initcpio/hooks/arch_raid similarity index 100% rename from hooks/arch_raid rename to lib/initcpio/hooks/arch_raid diff --git a/hooks/arch_remote b/lib/initcpio/hooks/arch_remote similarity index 73% rename from hooks/arch_remote rename to lib/initcpio/hooks/arch_remote index c6a94bbec..492f186e0 100644 --- a/hooks/arch_remote +++ b/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 diff --git a/hooks/arch_tiacx_wireless b/lib/initcpio/hooks/arch_tiacx_wireless similarity index 100% rename from hooks/arch_tiacx_wireless rename to lib/initcpio/hooks/arch_tiacx_wireless diff --git a/lib/initcpio/hooks/arch_udev b/lib/initcpio/hooks/arch_udev new file mode 100644 index 000000000..57cf5e7cb --- /dev/null +++ b/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." +} diff --git a/lib/initcpio/hooks/arch_udevtrigger b/lib/initcpio/hooks/arch_udevtrigger new file mode 100644 index 000000000..016344d17 --- /dev/null +++ b/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." +} diff --git a/install/arch_acpi b/lib/initcpio/install/arch_acpi similarity index 100% rename from install/arch_acpi rename to lib/initcpio/install/arch_acpi diff --git a/install/arch_addons b/lib/initcpio/install/arch_addons similarity index 96% rename from install/arch_addons rename to lib/initcpio/install/arch_addons index e2406d88e..292d3faff 100644 --- a/install/arch_addons +++ b/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 diff --git a/install/arch_base b/lib/initcpio/install/arch_base similarity index 92% rename from install/arch_base rename to lib/initcpio/install/arch_base index 455fdb045..3ffe49cfc 100644 --- a/install/arch_base +++ b/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 diff --git a/install/arch_base_lowmem b/lib/initcpio/install/arch_base_lowmem similarity index 89% rename from install/arch_base_lowmem rename to lib/initcpio/install/arch_base_lowmem index 29eed85be..5e65cb031 100644 --- a/install/arch_base_lowmem +++ b/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 diff --git a/install/arch_bootmessage b/lib/initcpio/install/arch_bootmessage similarity index 66% rename from install/arch_bootmessage rename to lib/initcpio/install/arch_bootmessage index 616f465fc..66994985d 100644 --- a/install/arch_bootmessage +++ b/lib/initcpio/install/arch_bootmessage @@ -3,8 +3,7 @@ install () { ### generate boot.msg - [ "${RUNPROGRAM}" = "mkbootcd" ] && TITLEMSG="ISOLINUX" - [ "${RUNPROGRAM}" = "mkbootcd-grub" ] && TITLEMSG="GRUB" + [ "${RUNPROGRAM}" = "mkisolinux" ] && TITLEMSG="ISOLINUX" [ "${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 " >> ${BOOTMESSAGE} + echo "Creation Tool: '$(echo ${RUNPROGRAM})' written by Tobias Powalowski " >> ${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} - else - [ -s "${APPENDBOOTMESSAGE_SYSLINUX}" ] && cat ${APPENDBOOTMESSAGE_SYSLINUX} >> ${BOOTMESSAGE} - [ -s "${APPENDOPTIONSBOOTMESSAGE}" ] && cat ${APPENDOPTIONSBOOTMESSAGE} >> ${OPTIONSBOOTMESSAGE} - fi + [ -s "${APPENDBOOTMESSAGE}" ] && cat ${APPENDBOOTMESSAGE} >> ${BOOTMESSAGE} + [ -s "${APPENDOPTIONSBOOTMESSAGE}" ] && cat ${APPENDOPTIONSBOOTMESSAGE} >> ${OPTIONSBOOTMESSAGE} } help () diff --git a/lib/initcpio/install/arch_bootmessage_allinone b/lib/initcpio/install/arch_bootmessage_allinone new file mode 100644 index 000000000..7b4982ec5 --- /dev/null +++ b/lib/initcpio/install/arch_bootmessage_allinone @@ -0,0 +1,16 @@ +# Created by Tobias Powalowski + +install () +{ + ### generate boot.msg + [ -s "${APPENDBOOTMESSAGE}" ] && cat ${APPENDBOOTMESSAGE} >> ${BOOTMESSAGE} + [ -s "${APPENDOPTIONSBOOTMESSAGE}" ] && cat ${APPENDOPTIONSBOOTMESSAGE} >> ${OPTIONSBOOTMESSAGE} +} + +help () +{ +cat <> ${ISONAME} + [ "${RUNPROGRAM}" = "mkisolinux" ] && echo "Arch_Linux_CORE $(uname -m)" >> ${ISONAME} } help () { cat <> ${ISONAME} + [ "${RUNPROGRAM}" = "mkisolinux" ] && echo "Arch_Linux_FTP $(uname -m)" >> ${ISONAME} } help () diff --git a/install/arch_fw b/lib/initcpio/install/arch_fw similarity index 100% rename from install/arch_fw rename to lib/initcpio/install/arch_fw diff --git a/install/arch_grub b/lib/initcpio/install/arch_grub similarity index 81% rename from install/arch_grub rename to lib/initcpio/install/arch_grub index e20125e0f..6f91618e1 100644 --- a/install/arch_grub +++ b/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 diff --git a/install/arch_hwdetect b/lib/initcpio/install/arch_hwdetect similarity index 100% rename from install/arch_hwdetect rename to lib/initcpio/install/arch_hwdetect diff --git a/install/arch_installer b/lib/initcpio/install/arch_installer similarity index 58% rename from install/arch_installer rename to lib/initcpio/install/arch_installer index 33614df65..1d88a3bf8 100644 --- a/install/arch_installer +++ b/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 "/etc/archboot/installer/quickinst" "/arch/quickinst" + add_file "/usr/share/archboot/installer/setup" "/arch/setup" + 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 () diff --git a/install/arch_intel_wireless b/lib/initcpio/install/arch_intel_wireless similarity index 97% rename from install/arch_intel_wireless rename to lib/initcpio/install/arch_intel_wireless index 9c4379ec4..613bcbd26 100644 --- a/install/arch_intel_wireless +++ b/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 () diff --git a/install/arch_iptables b/lib/initcpio/install/arch_iptables similarity index 62% rename from install/arch_iptables rename to lib/initcpio/install/arch_iptables index 5f7acceb4..c19f8c7f9 100644 --- a/install/arch_iptables +++ b/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 "/etc/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/conf.d/iptables" "/etc/conf.d/iptables" + add_file "/usr/share/archboot/iptables/etc/iptables/empty.rules" "/etc/iptables/empty.rules" + add_file "/usr/share/archboot/iptables/etc/iptables/simple_firewall.rules" "/etc/iptables/simple_firewall.rules" } diff --git a/lib/initcpio/install/arch_isdn b/lib/initcpio/install/arch_isdn new file mode 100644 index 000000000..51f94e928 --- /dev/null +++ b/lib/initcpio/install/arch_isdn @@ -0,0 +1,23 @@ +# Created by Tobias Powalowski + +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< + +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 < + +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 "/usr/share/archboot/remote/etc/hosts.allow" "/etc/hosts.allow" + add_file "/usr/share/archboot/remote/etc/hosts.deny" "/etc/hosts.deny" + add_file "/usr/share/archboot/remote/etc/screenrc" "/etc/screenrc" + add_file "/usr/share/archboot/remote/etc/xinetd.conf" "/etc/xinetd.conf" + add_file "/usr/share/archboot/remote/etc/xinetd.d/servers" "/etc/xinetd.d/servers" + add_file "/usr/share/archboot/remote/etc/xinetd.d/services" "/etc/xinetd.d/services" + add_file "/usr/share/archboot/remote/etc/xinetd.d/telnet" "/etc/xinetd.d/telnet" + add_file "/usr/share/archboot/remote/etc/ssh/ssh_config" "/etc/ssh/ssh_config" + add_file "/usr/share/archboot/remote/etc/ssh/sshd_config" "/etc/ssh/sshd_config" + add_file "/usr/share/archboot/remote/etc/conf.d/sshd" "/etc/conf.d/sshd" + add_file "/usr/share/archboot/remote/etc/ssh/moduli" "/etc/ssh/moduli" + add_file "/usr/share/archboot/remote/etc/pam.d/sshd" "/etc/pam.d/sshd" + add_file "/usr/share/archboot/remote/etc/pam.d/screen" "/etc/pam.d/screen" + add_file "/usr/share/archboot/remote/etc/rsyncd.conf" "/etc/rsyncd.conf" + add_file "/usr/share/archboot/remote/etc/xinetd.d/rsync" "/etc/xinetd.d/rsync" + add_file "/usr/share/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 "/usr/share/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< + +install () +{ + MODULES="" + BINARIES="login" + FILES="" + SCRIPT="" + for i in $(echo /usr/share/archboot/shadow/etc/*/*); do + add_file "$i" "$(echo $i | sed -e 's|/usr/share/archboot/shadow/etc|/etc|g')" + done + for i in $(echo /usr/share/archboot/shadow/etc/*.defs); do + add_file "$i" "$(echo $i | sed -e 's|/usr/share/archboot/shadow/etc|/etc|g')" + done +} + +help () +{ +cat<> ${OPTIONSBOOTMESSAGE} echo " and copy them to /lib/firmware and reload your kernel module." >> ${OPTIONSBOOTMESSAGE} echo " See http://acx100.sourceforge.net/wiki/Firmware for details." >> ${OPTIONSBOOTMESSAGE} + echo "" >> ${OPTIONSBOOTMESSAGE} } help () diff --git a/install/arch_tz b/lib/initcpio/install/arch_tz similarity index 86% rename from install/arch_tz rename to lib/initcpio/install/arch_tz index 65c30fa5a..3c853171c 100644 --- a/install/arch_tz +++ b/lib/initcpio/install/arch_tz @@ -9,7 +9,7 @@ install () for i in $(find /usr/share/zoneinfo ! -type d); do add_file $i done - add_file /etc/archboot/tz/tz /usr/bin/tz + add_file /usr/share/archboot/tz/tz /usr/bin/tz } help () diff --git a/install/arch_udev b/lib/initcpio/install/arch_udev similarity index 59% rename from install/arch_udev rename to lib/initcpio/install/arch_udev index 3d5b9e90d..7d583da26 100644 --- a/install/arch_udev +++ b/lib/initcpio/install/arch_udev @@ -3,12 +3,11 @@ install () { MODULES="" - BINARIES="udevd udevadm dmsetup" + BINARIES="udevd dmsetup" FILES="/etc/udev/udev.conf" SCRIPT="arch_udev" add_file /etc/modprobe.d/framebuffer_blacklist - add_file /etc/archboot/udev/etc/start_udev /etc/start_udev - add_file /etc/archboot/udev/etc/load-modules.sh /lib/udev/load-modules.sh + add_file /usr/share/archboot/udev/etc/load-modules.sh /lib/udev/load-modules.sh add_file /lib/udev/ata_id add_file /lib/udev/cdrom_id add_file /lib/udev/cdsymlinks.sh @@ -27,29 +26,21 @@ install () add_file /lib/libvolume_id.so.1 # add rule files for i in 81-arch 60-pcmcia device-mapper; do - add_file /etc/udev/rules.d/$i.rules + add_file /etc/udev/rules.d/$i.rules + done + for i in 75-cd-aliases-generator.rules.optional 75-persistent-net-generator.rules.optional; do + add_file /etc/udev/rules.d/$i done for i in 40-alsa 40-ia64 40-isdn 40-pilot-links 40-ppc 40-s390 40-zaptel 50-udev-default 60-cdrom_id 60-persistent-input \ 60-persistent-storage-tape 60-persistent-storage 60-persistent-v4l 61-persistent-storage-edd 64-device-mapper \ 64-md-raid 79-fstab_import 80-drivers 95-udev-late; do add_file /lib/udev/rules.d/$i.rules done - ### NOTE not needed normally - # add persistent network and cd symlink support - # add_file /etc/udev/rules.d/75-cd-aliases-generator.rules - # add_file /etc/udev/rules.d/75-persistent-net-generator.rules - # add_file /etc/udev/rules.d/60-cdrom_id.rules - # add_file /lib/udev/write_cd_rules - # add_file /lib/udev/write_net_rules - # add_file /lib/udev/rule_generator.functions - # add_file /lib/udev/path_id } help () { cat <, or visit: -# http://naim.n.ml.org/ - -# The window list can either be always visible, always hidden, or auto-hidden. -#WINLIST Auto - -# nameformat (window list name format for unnamed users) -#set nameformat $user_name_account$user_name_ifwarn - -# nameformat_named (window list name format for named buddies) -#set nameformat_named "$user_name_account$user_name_ifwarn ($user_name_name)" - -# awaymsg (auto-response sent when you are away) -#set awaymsg "I am currently away..." - -# autoawaymsg (auto-response used if you idle away (see $autoaway)) -#set autoawaymsg "Must have stepped out..." - -# autozone (time zone to send to peers) -#set autozone CET+0100 - -# logdir (base directory to store persistent window scrollback) -#set logdir .naimlog/$conn/$cur - -# statusbar (string to use for status bar, replace $if* with $statusbar_*) -#set statusbar " %I:%M%p $ifoper$SN$ifwarn$ifaway$ifquery$ifchat+$ifpending$iftransfer [$conn $online]$iflag$ifidle naim " - -# statusbar_away (display if you are away) -#set statusbar_away " (away)" - -# statusbar_idle (display if you haven't said anything for 10 minutes) -#set statusbar_idle " [Idle $idle]" - -# statusbar_lag (display if there is network delay between you and the server) -#set statusbar_lag " [Lag $lag]" - -# statusbar_oper (display if the current window is a chat, and you are a channel operator) -#set statusbar_oper @ - -# statusbar_warn (if your warning level is above 0%) -#set statusbar_warn /$warnval% - -# statusbar_chat (display if the current window is a chat) -#set statusbar_chat " on $cur$iftopic" - -# statusbar_crypt (display if the current window is a query, and query is automatically encrypted) -#set statusbar_crypt "ENCRYPTED " - -# statusbar_typing (if the current window is a query, and the other person is typing to you) -#set statusbar_typing " TYPING" - -# statusbar_tzname (display if the current window is a query, and you know the buddy's time zone) -#set statusbar_tzname " <$tzname>" - -# statusbar_query (display if the current window is a query) -#set statusbar_query " [$ifcryptQuery: $cur$iftopic$iftzname]$iftyping" - -# timeformat (strftime format prepended to all messages) -#set timeformat [%H:%M:%S]  - -# im_prefix (string added to the beginning of every IM sent) -#set im_prefix "" - -# im_suffix (string added to the end of every IM sent) -#set im_suffix "" - -# chatter (determines which events trigger 'updated' status (yellow)) -#set chatter 15 - -# awaylog (1 = log IM's to an :AWAYLOG window when away, 2 = IM's and chat messages) -#set awaylog 0 - -# echostyle (determines how /echo behaves) -#set echostyle 1 - -# winlistheight (percentage of the screen height to use for the window list window) -#set winlistheight 90 - -# winlistchars (number of characters from each window name to display in the window list) -#set winlistchars 16 - -# beeponim (beep whenever an IM is received (0 = never, 1 = if not away, 2 = always)) -#set beeponim 1 - -# beeponsignon (beep whenever a buddy signs on or off (0 = never, 1 = if not away, 2 = always)) -#set beeponsignon 0 - -# autoaway (if non-zero, maximum idle time before automatically marking away) -#set autoaway 20 - -# autoreply (number of minutes to wait before sending a second auto-response) -#set autoreply 10 - -# tprint (if non-zero, a timestamp is displayed periodically in all query windows) -#set tprint 30 - -# logtprint (1 = log daily timestamps, 2 = log all timestamps) -#set logtprint 2 - -# autohide (number of seconds to display the status and window list windows) -#set autohide 3 - -# idletime (number of minutes you have been idle) -set idletime 3 - -# scrollback (number of lines in the scrollback buffer) -#set scrollback 500 - -# autoclose (number of minutes to keep a non-permanent (autobuddy'd) window open after the user signs off) -#set autoclose 15 - -# autosort (string sorting type (0 = none, 1 = by name, 2 = by group)) -#set autosort 2 - -# updatecheck (number of minutes to wait to check for new versions of naim) -#set updatecheck 240 - -# autounaway (automatically unmark away status whenever an IM is sent) -#set autounaway 0 - -# autoidle (automatically increment $idletime by 1 every minute) -#set autoidle 1 - -# autounidle (reset $idletime to 0 whenever an IM is sent) -#set autounidle 1 - -# lagcheck (periodically determine delay to server) -#set lagcheck 1 - -# autoquery (whenever a buddy signs on, a temporary window will be opened for them) -#set autoquery 1 - -# autopaste (enable logic to detect accidental pastes without first entering paste mode) -#set autopaste 1 - -# autobuddy (whenever a non-buddy IM's you, a window will be opened for them) -#set autobuddy 1 - -# autopeer (automatically attempt to negotiate client capabilities) -#set autopeer 1 - -# autopeerverbose (notify you as client capabilities are negotiated) -#set autopeerverbose 0 - -# autocrypt (use autopeer to negotiate peer to peer IM encryption) -#set autocrypt 1 - -# autosave (automatically update .naimrc on /quit) -#set autosave 0 - -# ctcpverbose (notify you of unknown CTCP requests) -#set ctcpverbose 0 - -# color (honor tags in IM's) -#set color 1 - -# autoreconnect (automatically reconnect if disconnected; you may need to /set an appropriate password variable (such as $AIM:password)) -#set autoreconnect 0 - -# autonames (automatically /names on /join) -#set autonames 1 - -# showraw (display special server messages in a window named :RAW) -#set showraw 0 - -# Colors -#setcol EVENT YELLOW/BROWN -#setcol EVENT_ALT GREEN -#setcol TEXT WHITE/GREY -#setcol SELF RED -#setcol BUDDY CYAN -#setcol BUDDY_WAITING YELLOW/BROWN -#setcol BUDDY_ADDRESSED YELLOW/BROWN -#setcol BUDDY_IDLE BLUE -#setcol BUDDY_AWAY GREEN -#setcol BUDDY_OFFLINE RED -#setcol BUDDY_QUEUED MAGENTA/PINK -#setcol BUDDY_TAGGED BLUE -#setcol INPUT CLEAR/BLACK -#setcol WINLIST CYAN -#setcol WINLISTHIGHLIGHT CLEAR/BLACK -#setcol CONN BLUE -#setcol IMWIN CLEAR/BLACK -#setcol STATUSBAR WHITE/GREY - -# Key bindings. -bind ^I :TAB_BUDDY_NEXT -bind M-^I :BUDDY_PREV - -# Filters. -FILTER REPLACE :FLUSH -FILTER REPLACE u you -FILTER REPLACE ur your -FILTER REPLACE lol -FILTER REPLACE lawlz -FILTER REPLACE lolz -FILTER REPLACE r are -FILTER REPLACE ru are you -FILTER REPLACE some1 someone -FILTER REPLACE sum1 someone -FILTER REPLACE ne any -FILTER REPLACE ne1 anyone -FILTER REPLACE im I'm -FILTER REPLACE b4 before - - - - -# Create a new connection called IRC of type IRC. -newconn IRC IRC - -# naim will automatically attempt to read your profile from -# ~/.naimprofile, though if you prefer you can specify one -# to replace it here. - -# Add your buddies. - -# Rejoin your channels. -IRC:join #archlinux -IRC:join #archlinux.br -IRC:join #archlinux.de -IRC:join #archlinux.dk -IRC:join #archlinux-es -IRC:join #archlinuxfr - -# Logging -#set IRC:log 0 -#set IRC:logfile - -# Connect to IRC. -#set IRC:password mypass -#clear -# naim will prompt you for your password if it's not supplied here. -IRC:connect irc.freenode.net diff --git a/packages/placeholder b/packages/placeholder deleted file mode 100644 index 79acea990..000000000 --- a/packages/placeholder +++ /dev/null @@ -1 +0,0 @@ -This is a placeholder file :) diff --git a/pam/etc/security/fileshare.conf b/pam/etc/security/fileshare.conf deleted file mode 100644 index 0b89ee3c5..000000000 --- a/pam/etc/security/fileshare.conf +++ /dev/null @@ -1 +0,0 @@ -RESTRICT=no \ No newline at end of file diff --git a/pam/etc/security/pam_unix2.conf b/pam/etc/security/pam_unix2.conf deleted file mode 100644 index 6bc7eac07..000000000 --- a/pam/etc/security/pam_unix2.conf +++ /dev/null @@ -1,33 +0,0 @@ -# pam_unix2 config file -# -# This file contains options for the pam_unix2.so module. -# It contains a list of options for every type of management group, -# which will be used for authentication, account management and -# password management. Not all options will be used from all types of -# management groups. -# -# At first, pam_unix2 will read this file and then uses the local -# options. Not all options can be set her global. -# -# Allowed options are: -# -# debug (account, auth, password, session) -# nullok (auth) -# md5 (password / overwrites /etc/default/passwd) -# bigcrypt (password / overwrites /etc/default/passwd) -# blowfish (password / overwrites /etc/default/passwd) -# crypt_rounds=XX -# none (session) -# trace (session) -# call_modules=x,y,z (account, auth, password) -# -# Example: -# auth: nullok -# account: -# password: nullok blowfish crypt_rounds=8 -# session: none -# -auth: -account: -password: -session: none diff --git a/scripts/check-files.sh b/scripts/check-files.sh deleted file mode 100755 index 919933842..000000000 --- a/scripts/check-files.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/bash -cd .. -for i in base capi4k cpufreq grub iptables isdn kexec lilo naim net openvpn pacman pam ppp pppoe pptpclient remote shadow udev vpnc wireless; do - cd $i - for k in $(find ! -type d); do - diff -u $k /$k >/dev/null || (echo Changes found $i: $k) - done - cd .. -done diff --git a/udev/etc/start_udev b/udev/etc/start_udev deleted file mode 100755 index 5f0459eb8..000000000 --- a/udev/etc/start_udev +++ /dev/null @@ -1,119 +0,0 @@ -#! /bin/sh -# -# start_udev -# script to initialize /dev by using udev. -# -# Modified for Archlinux by Tobias Powalowski -# -# Inspired by: -# -# Copyright (C) 2004 Greg Kroah-Hartman -# -# Released under the GPL v2 only. -# -# This needs to be run at the earliest possible point in the boot -# process. -# -# Based on the udev init.d script -# -# Thanks go out to the Gentoo developers for proving -# that this is possible to do. -# -# Yes, it's very verbose, feel free to turn off all of the echo calls, -# they were there to make me feel better that everything was working -# properly during development... - -prog=udev -sysfs_dir=/sys -bin=/sbin/udev -udevd=/sbin/udevd -udev_root="/dev" - -trigger_device_events () -{ - /sbin/udevadm trigger -} - -wait_for_queue () -{ - # disabled because it hangs network boot - #loop=20 - #while ! [ "$loop" -gt 0 -a -d /dev/.udev/queue ]; do - # sleep 0.1; - # loop=$(($loop - 1)) - #done - /sbin/udevadm settle -} - -make_extra_nodes () -{ - # there are a few things that sysfs does not export for us. - # these things go here (and remember to remove them in - # remove_extra_nodes() - # - # Thanks to Gentoo for the initial list of these. - ln -sf /proc/self/fd $udev_root/fd - ln -sf /proc/self/fd/0 $udev_root/stdin - ln -sf /proc/self/fd/1 $udev_root/stdout - ln -sf /proc/self/fd/2 $udev_root/stderr - ln -sf /proc/kcore $udev_root/core -} - -udev_init () -{ -# don't use udev if sysfs is not mounted. -if [ ! -d $sysfs_dir/block ]; then - exit 1 -fi - -# mount ramfs, else autodetection will fail! -mount -t ramfs none $udev_root -#create missing nodes -mknod /dev/null c 1 3 -mknod /dev/zero c 1 5 -mknod /dev/console c 5 1 - -# propogate /udev from /sys -#echo "Creating initial udev device nodes:" - -#echo "making extra nodes" -make_extra_nodes - -# check if udevd is already running -#echo "start udev daemon" -/sbin/udevd --daemon - -case "$(uname -r)" in - 2.6.[0-9]|2.6.[0-9][!0-9]*) ;; - *) if [ -f "/sys/class/tty/console/uevent" ]; then - #echo "Kernel >= 2.6.15 and supports uevents" - # trigger the sorted events - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - # catch events that are real fast - mkdir -p /dev/.udev/queue - else - # for older kernels without uevents will be removed when udevstart dies in udev - echo "Kernel does not support uevents, you need a kernel >= 2.6.15!" - exit 1 - fi - ;; -esac -} - -udev_uevents () -{ -# configure all devices -trigger_device_events -# until we know how to do better, just wait for _all_ events to finish -wait_for_queue -} - -if [ $# -eq 0 ]; then -udev_init -udev_uevents -fi - -[ "$1" = "init" ] && udev_init -[ "$1" = "uevents" ] && udev_uevents - -exit 0 diff --git a/allinone/create-allinone.sh b/usr/bin/archboot-allinone.sh similarity index 67% rename from allinone/create-allinone.sh rename to usr/bin/archboot-allinone.sh index 9a3dd0bb0..379ed537e 100755 --- a/allinone/create-allinone.sh +++ b/usr/bin/archboot-allinone.sh @@ -7,11 +7,9 @@ usage () echo "CREATE ALLINONE USB/CD IMAGES" echo "-----------------------------" echo "Run in archboot x86_64 chroot first ..." - echo "mkbootcd -c=/etc/archboot/archbootcd.conf -t=core64.tar.bz2" - echo "mkbootcd -c=/etc/archboot/archbootcd-lowmem.conf -t=lowmem64.tar.bz2" + echo "create-allinone.sh -t" echo "Run in archboot 686 chroot then ..." - echo "mkbootcd -c=/etc/archboot/archbootcd.conf -t=core.tar.bz2" - echo "mkbootcd -c=/etc/archboot/archbootcd-lowmem.conf -t=lowmem.tar.bz2" + echo "create-allinone.sh -t" echo "Copy the generated tarballs to your favorite directory and run:" echo "${APPNAME} -g " echo "" @@ -26,10 +24,15 @@ usage () [ "$1" == "" ] && usage && exit 1 +ALLINONE="/etc/archboot/presets/allinone" +ALLINONE_LOWMEM="/etc/archboot/presets/allinone-lowmem" +TARBALL_HELPER="/usr/bin/archboot-tarball-helper.sh" +USBIMAGE_HELPER="/usr/bin/archboot-tarball-helper.sh" while [ $# -gt 0 ]; do case $1 in -g|--g) GENERATE="1" ;; + -t|--t) TARBALL="1" ;; -i=*|--i=*) IMAGENAME="$(echo $1 | awk -F= '{print $2;}')" ;; -r=*|--r=*) RELEASENAME="$(echo $1 | awk -F= '{print $2;}')" ;; -k=*|--k=*) KERNEL="$(echo $1 | awk -F= '{print $2;}')" ;; @@ -39,20 +42,28 @@ while [ $# -gt 0 ]; do shift done -if ! [ ${GENERATE} = "1" ]; then - usage -fi - ### check for root if ! [ $UID -eq 0 ]; then echo "ERROR: Please run as root user!" exit 1 fi +if [ ${TARBALL} = "1" ]; then + ${TARBALL_HELPER} -c=${ALLINONE} -t=core-$(uname -m).tar + ${TARBALL_HELPER} -c=${ALLINONE_LOWMEM} -t=lowmem-$(uname -m).tar + exit 0 +fi + +if ! [ ${GENERATE} = "1" ]; then + usage +fi + +# set defaults, if nothing given [ "${KERNEL}" = "" ] && KERNEL=$(uname -r) [ "${RELEASENAME}" = "" ] && RELEASENAME="Nepal" [ "${IMAGENAME}" = "" ] && IMAGENAME="Archlinux-allinone-$(date +%Y.%m)" +# generate temp directories LOWMEM=$(mktemp -d /tmp/lowmem.XXX) LOWMEM64=$(mktemp -d /tmp/lowmem64.XXX) CORE=$(mktemp -d /tmp/core.XXX) @@ -62,42 +73,55 @@ ALLINONE=$(mktemp -d /tmp/allinone.XXX) # create directories mkdir ${ALLINONE}/arch mkdir ${ALLINONE}/isolinux + # extract tarballs -tar xvf lowmem64.tar -C ${LOWMEM64} || exit 1 -tar xvf core64.tar -C ${CORE64} || exit 1 -tar xvf lowmem.tar -C ${LOWMEM} || exit 1 -tar xvf core.tar -C ${CORE} || exit 1 +tar xvf lowmem-i686.tar -C ${LOWMEM} || exit 1 +tar xvf core-i686.tar -C ${CORE} || exit 1 +tar xvf lowmem-x86_64.tar -C ${LOWMEM64} || exit 1 +tar xvf core-x86_64.tar -C ${CORE64} || exit 1 + # move in packages mv ${LOWMEM}/tmp/*/core-i686 ${ALLINONE}/ mv ${LOWMEM64}/tmp/*/core-x86_64 ${ALLINONE}/ + # move in doc mv ${CORE}/tmp/*/arch/archdoc.txt ${ALLINONE}/arch/ + # place kernels and memtest mv ${LOWMEM}/tmp/*/isolinux/vmlinuz ${ALLINONE}/isolinux/ mv ${LOWMEM64}/tmp/*/isolinux/vmlinuz ${ALLINONE}/isolinux/vm64 -mv ${LOWMEM}/tmp/*/isolinux/memtest ${ALLINONE}/isolinux/ +mv ${CORE}/tmp/*/isolinux/memtest ${ALLINONE}/isolinux/ + # place initrd files mv ${LOWMEM}/tmp/*/isolinux/initrd.img ${ALLINONE}/isolinux/lowmem.img mv ${LOWMEM64}/tmp/*/isolinux/initrd.img ${ALLINONE}/isolinux/lowmem64.img -mv ${CORE}/tmp/*/isolinux/initrd.img ${ALLINONE}/isolinux/ +mv ${CORE}/tmp/*/isolinux/initrd.img ${ALLINONE}/isolinux/initrd.img mv ${CORE64}/tmp/*/isolinux/initrd.img ${ALLINONE}/isolinux/initrd64.img + # place config files -cp /etc/archboot/allinone/config/* ${ALLINONE}/isolinux/ -rm ${ALLINONE}/isolinux/boot-syslinux.msg -sed -i -e "s/@@DATE@@/$(date)/g" -e "s/@@KERNEL@@/$KERNEL/g" -e "s/@@RELEASENAME@@/$RELEASENAME/g" ${ALLINONE}/isolinux/boot.msg +mv ${CORE}/tmp/*/isolinux/isolinux.cfg ${ALLINONE}/isolinux/ +mv ${CORE}/tmp/*/isolinux/boot.msg ${ALLINONE}/isolinux/ +mv ${CORE}/tmp/*/isolinux/options.msg ${ALLINONE}/isolinux/ +mv ${CORE}/tmp/*/isolinux/isolinux.bin ${ALLINONE}/isolinux/ +# Change parameters in boot.msg +sed -i -e "s/@@DATE@@/$(date)/g" -e "s/@@KERNEL@@/$KERNEL/g" -e "s/@@RELEASENAME@@/$RELEASENAME/g" -e "s/@@BOOTLOADER@@/ISOLINUX/g" ${ALLINONE}/isolinux/boot.msg + # generate iso file echo "Generating ALLINONE ISO ..." mkisofs -RlDJLV "Arch Linux ALLINONE" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o ${IMAGENAME}.iso ${ALLINONE}/ > /dev/null 2>&1 -echo "Generating ALLINONE IMG ..." # cleanup isolinux and migrate to syslinux +echo "Generating ALLINONE IMG ..." rm ${ALLINONE}/isolinux/isolinux.bin mv ${ALLINONE}/isolinux/isolinux.cfg ${ALLINONE}/isolinux/syslinux.cfg mv ${ALLINONE}/isolinux/* ${ALLINONE}/ -rm -r ${ALLINONE}/isolinux -cp /etc/archboot/allinone/config/boot-syslinux.msg ${ALLINONE}/boot.msg -sed -i -e "s/@@DATE@@/$(date)/g" -e "s/@@KERNEL@@/$KERNEL/g" -e "s/@@RELEASENAME@@/$RELEASENAME/g" ${ALLINONE}/boot.msg -/etc/archboot/allinone/usbimage-helper.sh ${ALLINONE} ${IMAGENAME}.img > /dev/null 2>&1 +rm -r ${ALLINONE}/isolinux +mv ${CORE64}/tmp/*/isolinux/boot.msg ${ALLINONE}/ +# Change parameters in boot.msg +sed -i -e "s/@@DATE@@/$(date)/g" -e "s/@@KERNEL@@/$KERNEL/g" -e "s/@@RELEASENAME@@/$RELEASENAME/g" -e "s/@@BOOTLOADER@@/SYSLINUX/g" ${ALLINONE}/boot.msg + +/usr/bin/archboot-usbimage-helper.sh ${ALLINONE} ${IMAGENAME}.img > /dev/null 2>&1 + #create md5sums.txt [ -e md5sum.txt ] && rm -f md5sum.txt for i in ${IMAGENAME}.iso ${IMAGENAME}.img; do diff --git a/usr/bin/archboot-find-changes.sh b/usr/bin/archboot-find-changes.sh new file mode 100755 index 000000000..441e78406 --- /dev/null +++ b/usr/bin/archboot-find-changes.sh @@ -0,0 +1,8 @@ +#! /bin/bash +TEMPFILE=$(mktemp /tmp/archboot-change-XXX) +for i in /usr/share/archboot/{base,capi4k,cpufreq,grub,iptables,isdn,kexec,lilo,net,openvpn,pacman,pam,ppp pppoe,pptpclient,remote,shadow,udev,vpnc,wireless}; do + cd $i + for k in $(find ! -type d); do + diff -u $k /$k >>$TEMPFILE || (echo Changes found $i: $k) + done +done diff --git a/usr/bin/archboot-svn.sh b/usr/bin/archboot-svn.sh new file mode 100644 index 000000000..0eedc8494 --- /dev/null +++ b/usr/bin/archboot-svn.sh @@ -0,0 +1,21 @@ +#!/bin/sh +### general setup stuff +SVNSETUP="svn://archlinux.org/srv/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 .. diff --git a/usr/bin/archboot-tarball-helper.sh b/usr/bin/archboot-tarball-helper.sh new file mode 100755 index 000000000..4290f9cdd --- /dev/null +++ b/usr/bin/archboot-tarball-helper.sh @@ -0,0 +1,83 @@ +#! /bin/sh +# Created by Tobias Powalowski +# Settings +APPNAME=$(basename "${0}") +CONFIG="" +TARNAME="" +export TEMPDIR=$(mktemp -d /tmp/tarball-helper.XXXX) + +usage () +{ + echo "${APPNAME}: usage" + echo " -c=CONFIG Use CONFIG file" + echo " -t=TARNAME Generate a tar image instead of an iso image" + echo " -h This message." + exit 1 +} + +[ "$1" == "" ] && usage + +while [ $# -gt 0 ]; do + case $1 in + -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; + -t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;; + -h|--h|?) usage ;; + *) usage ;; + esac + shift +done + +if [ "${TARNAME}" = "" ]; then + echo "ERROR: No image name specified, please use the -t option" + exit 1 +fi + +if [ ! -f "${CONFIG}" ]; then + echo "config file '${CONFIG}' cannot be found, aborting..." + exit 1 +fi + +. "${CONFIG}" +# export for mkinitcpio +[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE +[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE + +export RUNPROGRAM="${APPNAME}" +export BOOTDIRNAME="isolinux" +export USEKERNEL=${VERSION} + +[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) +[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) + +# begin script +mkdir -p ${TEMPDIR}/${BOOTDIRNAME}/ +install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin + +# Use config file +echo ":: Creating isolinux.cfg ..." +if [ "${ISOLINUXCFG}" = "" ]; then + echo "No isolinux.cfg file specified, aborting ..." + exit 1 +else + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && echo "No isolinux.cfg found" && exit 1 +fi +# generate initramdisk +echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." +echo ":: Creating initramdisk ..." + mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/${BOOTDIRNAME}/initrd.img +echo ":: Using ${KERNEL} as image kernel ..." + install -m644 ${KERNEL} ${TEMPDIR}/${BOOTDIRNAME}/vmlinuz + install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg + install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 +# create image +if ! [ "${TARNAME}" = "" ]; then + echo ":: Creating tar image ..." + [ -e ${TARNAME} ] && rm ${TARNAME} + tar cfv ${TARNAME} ${TEMPDIR} > /dev/null 2>&1 && echo ":: tar Image succesfull created at ${TARNAME}" +fi +# clean /tmp +rm -r ${TEMPDIR} diff --git a/allinone/usbimage-helper.sh b/usr/bin/archboot-usbimage-helper.sh similarity index 100% rename from allinone/usbimage-helper.sh rename to usr/bin/archboot-usbimage-helper.sh diff --git a/usr/share/archboot/base/etc/crypttab b/usr/share/archboot/base/etc/crypttab new file mode 100644 index 000000000..dd6994b5a --- /dev/null +++ b/usr/share/archboot/base/etc/crypttab @@ -0,0 +1,33 @@ +# crypttab: Mappings for encrypted partitions +# +# Each mapped device will be created in /dev/mapper, so your /etc/fstab +# should use the /dev/mapper/{NAME} paths for encrypted devices. +# +# Each PASSWORD field can be an absolute pathname to a key file (starting +# with a slash, recommended) or a literal string that will be used as +# a passphrase. To use special characters in the passphrase, surround it +# by quotes, the usual bash quoting rules apply. +# There are two special keywords that cannot be used as passphrases: +# - ASK ask for a passphrase on boot +# - SWAP use a random key and create a swapspace afterwards +# WARNING: use the SWAP keyword carefully, as it overwrites the data +# on the specified partition +# +# To create a key file: +# hashalot -n 32 ripemd160 >/etc/crytfs.key +# or +# dd if=/dev/urandom of=/etc/cryptfs.key bs=256 count=1 +# +# To pass additional options to cryptsetup for non-LUKS partitions, use the +# fourth column. +# +# NOTE: Do not list your root (/) partition here, it must be set up +# beforehand by the initramfs (/etc/mkinitcpio.conf). + + +# NAME SOURCE DEVICE PASSWORD OPTIONS +#home /dev/hda4 mypassword +#data1 /dev/hda3 "my \"password\"" +#data2 /dev/hda5 /etc/cryptfs.key +#swap /dev/hdx4 SWAP -c aes-cbc-essiv:sha256 -s 256 +#vol /dev/hdb7 ASK diff --git a/base/etc/fstab b/usr/share/archboot/base/etc/fstab similarity index 100% rename from base/etc/fstab rename to usr/share/archboot/base/etc/fstab diff --git a/base/etc/group b/usr/share/archboot/base/etc/group similarity index 100% rename from base/etc/group rename to usr/share/archboot/base/etc/group diff --git a/usr/share/archboot/base/etc/gshadow b/usr/share/archboot/base/etc/gshadow new file mode 100644 index 000000000..30733e3ab --- /dev/null +++ b/usr/share/archboot/base/etc/gshadow @@ -0,0 +1,27 @@ +root:::root +bin:::root,bin,daemon +daemon:::root,bin,daemon +sys:::root,bin +adm:::root,daemon +tty::: +disk:::root +lp:::daemon +mem::: +kmem::: +wheel:::root +ftp::: +mail::: +log:::root +smmsp::: +http::: +games::: +network:x:: +video:x:: +audio::: +optical::: +floppy:x:: +storage:x:: +scanner:x:: +power:x:: +nobody::: +users::: diff --git a/base/etc/host.conf b/usr/share/archboot/base/etc/host.conf similarity index 100% rename from base/etc/host.conf rename to usr/share/archboot/base/etc/host.conf diff --git a/base/etc/hosts b/usr/share/archboot/base/etc/hosts similarity index 100% rename from base/etc/hosts rename to usr/share/archboot/base/etc/hosts diff --git a/base/etc/inittab b/usr/share/archboot/base/etc/inittab similarity index 100% rename from base/etc/inittab rename to usr/share/archboot/base/etc/inittab diff --git a/base/etc/inputrc b/usr/share/archboot/base/etc/inputrc similarity index 100% rename from base/etc/inputrc rename to usr/share/archboot/base/etc/inputrc diff --git a/base/etc/login.sh b/usr/share/archboot/base/etc/login.sh similarity index 100% rename from base/etc/login.sh rename to usr/share/archboot/base/etc/login.sh diff --git a/base/etc/mke2fs.conf b/usr/share/archboot/base/etc/mke2fs.conf similarity index 100% rename from base/etc/mke2fs.conf rename to usr/share/archboot/base/etc/mke2fs.conf diff --git a/base/etc/nanorc b/usr/share/archboot/base/etc/nanorc similarity index 100% rename from base/etc/nanorc rename to usr/share/archboot/base/etc/nanorc diff --git a/base/etc/nsswitch.conf b/usr/share/archboot/base/etc/nsswitch.conf similarity index 100% rename from base/etc/nsswitch.conf rename to usr/share/archboot/base/etc/nsswitch.conf diff --git a/base/etc/pacman.conf b/usr/share/archboot/base/etc/pacman.conf similarity index 100% rename from base/etc/pacman.conf rename to usr/share/archboot/base/etc/pacman.conf diff --git a/base/etc/passwd b/usr/share/archboot/base/etc/passwd similarity index 100% rename from base/etc/passwd rename to usr/share/archboot/base/etc/passwd diff --git a/base/etc/profile b/usr/share/archboot/base/etc/profile similarity index 98% rename from base/etc/profile rename to usr/share/archboot/base/etc/profile index b2eb67901..731034445 100644 --- a/base/etc/profile +++ b/usr/share/archboot/base/etc/profile @@ -25,6 +25,7 @@ alias dir='dir --color=auto' cd / echo "Hit ENTER to enter the bash shell ..." read +clear if ! [ -e /tmp/.setup ]; then [ $(which /arch/setup 2> /dev/null) ] && /arch/setup fi diff --git a/base/etc/protocols b/usr/share/archboot/base/etc/protocols similarity index 100% rename from base/etc/protocols rename to usr/share/archboot/base/etc/protocols diff --git a/base/etc/rc.conf b/usr/share/archboot/base/etc/rc.conf similarity index 100% rename from base/etc/rc.conf rename to usr/share/archboot/base/etc/rc.conf diff --git a/base/etc/rc.local b/usr/share/archboot/base/etc/rc.local similarity index 100% rename from base/etc/rc.local rename to usr/share/archboot/base/etc/rc.local diff --git a/base/etc/rc.shutdown b/usr/share/archboot/base/etc/rc.shutdown similarity index 100% rename from base/etc/rc.shutdown rename to usr/share/archboot/base/etc/rc.shutdown diff --git a/base/etc/rc.sysinit b/usr/share/archboot/base/etc/rc.sysinit similarity index 100% rename from base/etc/rc.sysinit rename to usr/share/archboot/base/etc/rc.sysinit diff --git a/usr/share/archboot/base/etc/resolv.conf b/usr/share/archboot/base/etc/resolv.conf new file mode 100644 index 000000000..cecafba03 --- /dev/null +++ b/usr/share/archboot/base/etc/resolv.conf @@ -0,0 +1,8 @@ +# +# /etc/resolv.conf +# + +#search +#nameserver + +# End of file diff --git a/base/etc/securetty b/usr/share/archboot/base/etc/securetty similarity index 100% rename from base/etc/securetty rename to usr/share/archboot/base/etc/securetty diff --git a/base/etc/services b/usr/share/archboot/base/etc/services similarity index 100% rename from base/etc/services rename to usr/share/archboot/base/etc/services diff --git a/base/etc/shadow b/usr/share/archboot/base/etc/shadow similarity index 100% rename from base/etc/shadow rename to usr/share/archboot/base/etc/shadow diff --git a/base/etc/shells b/usr/share/archboot/base/etc/shells similarity index 100% rename from base/etc/shells rename to usr/share/archboot/base/etc/shells diff --git a/base/etc/syslog-ng.conf b/usr/share/archboot/base/etc/syslog-ng.conf similarity index 100% rename from base/etc/syslog-ng.conf rename to usr/share/archboot/base/etc/syslog-ng.conf diff --git a/base/etc/virc b/usr/share/archboot/base/etc/virc similarity index 69% rename from base/etc/virc rename to usr/share/archboot/base/etc/virc index e0af3346a..0d71a2cf4 100644 --- a/base/etc/virc +++ b/usr/share/archboot/base/etc/virc @@ -1,7 +1,7 @@ " An example for a vimrc file. " " Maintainer: Bram Moolenaar -" Last change: 2006 Nov 16 +" Last change: 2008 Jul 02 " " To use it, copy it to " for Unix and OS/2: ~/.vimrc @@ -13,7 +13,7 @@ if v:progname =~? "evim" finish endif - +set mouse=a " Use Vim settings, rather then Vi settings (much better!). " This must be first, because it changes other options as a side effect. set nocompatible @@ -21,6 +21,11 @@ set nocompatible " allow backspacing over everything in insert mode set backspace=indent,eol,start +if has("vms") + set nobackup " do not keep a backup file, use versions instead +else + set backup " keep a backup file +endif set history=50 " keep 50 lines of command line history set ruler " show the cursor position all the time set showcmd " display incomplete commands @@ -32,6 +37,15 @@ set incsearch " do incremental searching " Don't use Ex mode, use Q for formatting map Q gq +" CTRL-U in insert mode deletes a lot. Use CTRL-G u to first break undo, +" so that you can undo CTRL-U after inserting a line break. +inoremap u + +" In many terminal emulators the mouse works just fine, thus enable it. +if has('mouse') + set mouse=a +endif + " Switch syntax highlighting on, when the terminal has colors " Also switch on highlighting the last used search pattern. if &t_Co > 2 || has("gui_running") @@ -58,8 +72,10 @@ if has("autocmd") " When editing a file, always jump to the last known cursor position. " Don't do it when the position is invalid or when inside an event handler " (happens when dropping a file on gvim). + " Also don't do it when the mark is in the first line, that is the default + " position when opening a file. autocmd BufReadPost * - \ if line("'\"") > 0 && line("'\"") <= line("$") | + \ if line("'\"") > 1 && line("'\"") <= line("$") | \ exe "normal! g`\"" | \ endif @@ -71,3 +87,10 @@ else endif " has("autocmd") +" Convenient command to see the difference between the current buffer and the +" file it was loaded from, thus the changes you made. +" Only define it when not defined already. +if !exists(":DiffOrig") + command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis + \ | wincmd p | diffthis +endif diff --git a/base/init b/usr/share/archboot/base/init similarity index 95% rename from base/init rename to usr/share/archboot/base/init index 49a51d2f5..a9fac268d 100755 --- a/base/init +++ b/usr/share/archboot/base/init @@ -82,14 +82,6 @@ if [ -e "/hooks" ]; then done fi -if [ "${rootdelay}" != "0" ]; then - msg -n "Waiting for devices to settle..." - /bin/sleep "${rootdelay}" - export rootdelay=0 - export kinit_params="$kinit_params rootdelay=0" - msg "done." -fi - if [ "${break}" = "y" ]; then echo ":: Break requested, type 'exit' to resume operation" echo " NOTE: klibc contains no 'ls' binary, used 'echo *' instead" diff --git a/usr/share/archboot/bootloader/allinone.cfg b/usr/share/archboot/bootloader/allinone.cfg new file mode 100644 index 000000000..dc155a927 --- /dev/null +++ b/usr/share/archboot/bootloader/allinone.cfg @@ -0,0 +1,18 @@ +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 arch64 +kernel vm64 +append initrd=initrd64.img @@KERNEL_BOOT_OPTIONS@@ +label lowmem +kernel vmlinuz +append initrd=lowmem.img @@KERNEL_BOOT_OPTIONS@@ +label lowmem64 +kernel vm64 +append initrd=lowmem64.img @@KERNEL_BOOT_OPTIONS@@ \ No newline at end of file diff --git a/etc/isolinux.cfg b/usr/share/archboot/bootloader/bootloader.cfg similarity index 100% rename from etc/isolinux.cfg rename to usr/share/archboot/bootloader/bootloader.cfg diff --git a/etc/menu.lst b/usr/share/archboot/bootloader/grub/menu.lst similarity index 100% rename from etc/menu.lst rename to usr/share/archboot/bootloader/grub/menu.lst diff --git a/allinone/config/boot-syslinux.msg b/usr/share/archboot/bootloader/messages/allinone similarity index 76% rename from allinone/config/boot-syslinux.msg rename to usr/share/archboot/bootloader/messages/allinone index 44bd432e8..bc2bc52d7 100644 --- a/allinone/config/boot-syslinux.msg +++ b/usr/share/archboot/bootloader/messages/allinone @@ -4,7 +4,7 @@ Copyright 2002 - 2007 Judd Vinet Copyright 2007 - 2008 Aaron Griffin Distributed under the GNU General Public License (GPL) -SYSLINUX BOOT +@@BOOTLOADER@@ BOOT Creation Tool: 'archboot' written by Tobias Powalowski INSTALLATION / RESCUEBOOT SYSTEM @@ -13,11 +13,11 @@ Kernel: @@KERNEL@@ Architecture: i686/x86_64 Creation Date: @@DATE@@ -Available boot options (no input will boot the 32bit install/rescue system): +Available boot options (no input will boot the 32bit archboot system): - For 64bit environment, please use arch64 or lowmem64. -- 'arch ' to boot the install/rescue system. +- 'arch ' to boot the archboot system. - 'arch root=/dev/??? ' to boot into an existing system. -- 'lowmem ' to boot the 64MB RAM install system. +- 'lowmem ' to boot the 64MB RAM archboot system. - 'lowmem root=/dev/??? ' to boot into an existing 64MB RAM system. - 'memtest' to start the memory test program memtest86+. diff --git a/etc/append-message-syslinux b/usr/share/archboot/bootloader/messages/append-message similarity index 58% rename from etc/append-message-syslinux rename to usr/share/archboot/bootloader/messages/append-message index b01e0da7d..8d5c71053 100644 --- a/etc/append-message-syslinux +++ b/usr/share/archboot/bootloader/messages/append-message @@ -1,5 +1,9 @@ -Available boot options (no input will boot the install/rescue system): -- 'arch ' to boot the install/rescue system. +Available boot options (no input will boot the archboot system): + +- 'arch ' to boot the archboot system. + - 'arch root=/dev/??? ' to boot into an existing system. + - 'memtest' to start the memory test program memtest86+. + - For troubleshooting and other options press the F2 key. diff --git a/etc/append-message b/usr/share/archboot/bootloader/messages/append-message-grub similarity index 84% rename from etc/append-message rename to usr/share/archboot/bootloader/messages/append-message-grub index c91b689ca..d705c3158 100644 --- a/etc/append-message +++ b/usr/share/archboot/bootloader/messages/append-message-grub @@ -1,7 +1,7 @@ Select the appropriate option in the following menu. -- If you have trouble with IDE drives, select the "ide-legacy" option +- If you have trouble with IDE drives, select the "ide-legacy" option. - If your system hangs during the boot process, any combinations of the - boot options noapic acpi=off pci=routeirq nosmp may be useful + boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. - To edit boot options, follow the instructions in the following menu - Select "Memory Check" to run memtest86+ - To boot an installed system, select one of the "Installed system" prototypes diff --git a/etc/append-message-syslinux-lowmem b/usr/share/archboot/bootloader/messages/append-message-lowmem similarity index 59% rename from etc/append-message-syslinux-lowmem rename to usr/share/archboot/bootloader/messages/append-message-lowmem index 6c345afbe..55510cb6d 100644 --- a/etc/append-message-syslinux-lowmem +++ b/usr/share/archboot/bootloader/messages/append-message-lowmem @@ -1,6 +1,9 @@ -Available boot options (no input will boot the install/rescue system): -- 'arch ' to boot the 64MB RAM install system. +Available boot options (no input will boot the archboot system): +- 'arch ' to boot the 64MB RAM archboot system. + - 'arch root=/dev/??? ' 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. diff --git a/etc/append-options b/usr/share/archboot/bootloader/messages/append-options similarity index 57% rename from etc/append-options rename to usr/share/archboot/bootloader/messages/append-options index 2e365f2aa..27cad8baa 100644 --- a/etc/append-options +++ b/usr/share/archboot/bootloader/messages/append-options @@ -1,4 +1,9 @@ Arch Linux options and troubleshooting: -- If you have trouble with IDE drives, use the "ide-legacy" boot option + +- For returning to start screen press F1 key. + +- 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. + boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. + diff --git a/usr/share/archboot/bootloader/messages/append-options-lowmem b/usr/share/archboot/bootloader/messages/append-options-lowmem new file mode 100644 index 000000000..f05a8287b --- /dev/null +++ b/usr/share/archboot/bootloader/messages/append-options-lowmem @@ -0,0 +1,24 @@ + + + + + + + +Arch Linux options and troubleshooting: + +- For returning to start screen press F1 key. + +- 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 nomsi may be useful. + + + + + + + + + diff --git a/etc/isolinux-tarball.cfg b/usr/share/archboot/bootloader/old.cfg similarity index 100% rename from etc/isolinux-tarball.cfg rename to usr/share/archboot/bootloader/old.cfg diff --git a/capi4k/etc/capi.conf b/usr/share/archboot/capi4k/etc/capi.conf similarity index 100% rename from capi4k/etc/capi.conf rename to usr/share/archboot/capi4k/etc/capi.conf diff --git a/cpufreq/etc/conf.d/cpufreq b/usr/share/archboot/cpufreq/etc/conf.d/cpufreq similarity index 100% rename from cpufreq/etc/conf.d/cpufreq rename to usr/share/archboot/cpufreq/etc/conf.d/cpufreq diff --git a/grub/boot/grub/menu.lst b/usr/share/archboot/grub/boot/grub/menu.lst similarity index 93% rename from grub/boot/grub/menu.lst rename to usr/share/archboot/grub/boot/grub/menu.lst index 2b698c752..fca3d5253 100644 --- a/grub/boot/grub/menu.lst +++ b/usr/share/archboot/grub/boot/grub/menu.lst @@ -6,9 +6,9 @@ # Linux Grub # ------------------------- # /dev/fd0 (fd0) -# /dev/hda (hd0) -# /dev/hdb2 (hd1,1) -# /dev/hda3 (hd0,2) +# /dev/sda (hd0) +# /dev/sdb2 (hd1,1) +# /dev/sda3 (hd0,2) # # FRAMEBUFFER RESOLUTION SETTINGS diff --git a/installer/arch-install-guide.txt b/usr/share/archboot/installer/arch-install-guide.txt similarity index 100% rename from installer/arch-install-guide.txt rename to usr/share/archboot/installer/arch-install-guide.txt diff --git a/installer/quickinst b/usr/share/archboot/installer/quickinst similarity index 98% rename from installer/quickinst rename to usr/share/archboot/installer/quickinst index 79ad7d81e..db07b1cac 100755 --- a/installer/quickinst +++ b/usr/share/archboot/installer/quickinst @@ -107,19 +107,19 @@ mount -o bind /dev $DESTDIR/dev if [ "$INSTMODE" = "cd" ]; then $PACMAN -r $DESTDIR --config /tmp/pacman.conf -Sy $PKGLIST fi - if [ "$INSTMODE" = "ftp" ]; then $PACMAN -r $DESTDIR --config /tmp/pacman.conf -Sy base fi - -umount $DESTDIR/proc $DESTDIR/sys $DESTDIR/dev if [ $? -gt 0 ]; then echo echo "Package installation FAILED." echo + umount $DESTDIR/proc $DESTDIR/sys $DESTDIR/dev exit 1 fi +umount $DESTDIR/proc $DESTDIR/sys $DESTDIR/dev + echo echo "Package installation complete." echo diff --git a/installer/setup b/usr/share/archboot/installer/setup similarity index 99% rename from installer/setup rename to usr/share/archboot/installer/setup index 66da91363..8b671c08d 100755 --- a/installer/setup +++ b/usr/share/archboot/installer/setup @@ -694,7 +694,7 @@ select_mirror() { "ftp://ftp.archlinux.org/core/os/i686" 2>$ANSWER || return 1 SYNC_URL=$(cat $ANSWER) else - SYNC_URL=$(egrep -o "${_server}.*" "${MIRRORLIST}" | sed 's/\$repo/core/g') + SYNC_URL=$(egrep -o "${_server}.*" "${MIRRORLIST}" | sed "s#\$repo/os/x86_64#core/os/$(uname -m)#g") fi } diff --git a/iptables/etc/conf.d/iptables b/usr/share/archboot/iptables/etc/conf.d/iptables similarity index 100% rename from iptables/etc/conf.d/iptables rename to usr/share/archboot/iptables/etc/conf.d/iptables diff --git a/iptables/etc/iptables/empty.rules b/usr/share/archboot/iptables/etc/iptables/empty.rules similarity index 100% rename from iptables/etc/iptables/empty.rules rename to usr/share/archboot/iptables/etc/iptables/empty.rules diff --git a/iptables/etc/iptables/simple_firewall.rules b/usr/share/archboot/iptables/etc/iptables/simple_firewall.rules similarity index 100% rename from iptables/etc/iptables/simple_firewall.rules rename to usr/share/archboot/iptables/etc/iptables/simple_firewall.rules diff --git a/isdn/etc/isdn/callerid.conf b/usr/share/archboot/isdn/etc/isdn/callerid.conf similarity index 100% rename from isdn/etc/isdn/callerid.conf rename to usr/share/archboot/isdn/etc/isdn/callerid.conf diff --git a/isdn/etc/isdn/isdn.conf b/usr/share/archboot/isdn/etc/isdn/isdn.conf similarity index 100% rename from isdn/etc/isdn/isdn.conf rename to usr/share/archboot/isdn/etc/isdn/isdn.conf diff --git a/isdn/etc/isdn/isdnlog.isdnctrl0.options b/usr/share/archboot/isdn/etc/isdn/isdnlog.isdnctrl0.options similarity index 100% rename from isdn/etc/isdn/isdnlog.isdnctrl0.options rename to usr/share/archboot/isdn/etc/isdn/isdnlog.isdnctrl0.options diff --git a/isdn/etc/isdn/isdnlog.users b/usr/share/archboot/isdn/etc/isdn/isdnlog.users similarity index 100% rename from isdn/etc/isdn/isdnlog.users rename to usr/share/archboot/isdn/etc/isdn/isdnlog.users diff --git a/isdn/etc/isdn/rate.conf b/usr/share/archboot/isdn/etc/isdn/rate.conf similarity index 100% rename from isdn/etc/isdn/rate.conf rename to usr/share/archboot/isdn/etc/isdn/rate.conf diff --git a/isdn/etc/isdn/stop b/usr/share/archboot/isdn/etc/isdn/stop similarity index 100% rename from isdn/etc/isdn/stop rename to usr/share/archboot/isdn/etc/isdn/stop diff --git a/kexec/etc/conf.d/kexec b/usr/share/archboot/kexec/etc/conf.d/kexec similarity index 100% rename from kexec/etc/conf.d/kexec rename to usr/share/archboot/kexec/etc/conf.d/kexec diff --git a/keymap/km b/usr/share/archboot/keymap/km similarity index 100% rename from keymap/km rename to usr/share/archboot/keymap/km diff --git a/lilo/etc/lilo.conf b/usr/share/archboot/lilo/etc/lilo.conf similarity index 100% rename from lilo/etc/lilo.conf rename to usr/share/archboot/lilo/etc/lilo.conf diff --git a/linux_atm/etc/atmsigd.conf b/usr/share/archboot/linux_atm/etc/atmsigd.conf similarity index 100% rename from linux_atm/etc/atmsigd.conf rename to usr/share/archboot/linux_atm/etc/atmsigd.conf diff --git a/net/etc/conf.d/bonding b/usr/share/archboot/net/etc/conf.d/bonding similarity index 100% rename from net/etc/conf.d/bonding rename to usr/share/archboot/net/etc/conf.d/bonding diff --git a/net/etc/conf.d/bridges b/usr/share/archboot/net/etc/conf.d/bridges similarity index 100% rename from net/etc/conf.d/bridges rename to usr/share/archboot/net/etc/conf.d/bridges diff --git a/net/etc/conf.d/dhcpcd b/usr/share/archboot/net/etc/conf.d/dhcpcd similarity index 59% rename from net/etc/conf.d/dhcpcd rename to usr/share/archboot/net/etc/conf.d/dhcpcd index aceca9974..83c6f14ad 100644 --- a/net/etc/conf.d/dhcpcd +++ b/usr/share/archboot/net/etc/conf.d/dhcpcd @@ -2,5 +2,5 @@ # Arguments to be passed to the DHCP client daemon # -DHCPCD_ARGS="-q -L -t 30 -h $HOSTNAME" +DHCPCD_ARGS="-q" diff --git a/net/etc/dhcpcd.conf b/usr/share/archboot/net/etc/dhcpcd.conf similarity index 100% rename from net/etc/dhcpcd.conf rename to usr/share/archboot/net/etc/dhcpcd.conf diff --git a/netcfg/etc/iftab b/usr/share/archboot/netcfg/etc/iftab similarity index 100% rename from netcfg/etc/iftab rename to usr/share/archboot/netcfg/etc/iftab diff --git a/openvpn/etc/openvpn/examples/README b/usr/share/archboot/openvpn/etc/openvpn/examples/README similarity index 100% rename from openvpn/etc/openvpn/examples/README rename to usr/share/archboot/openvpn/etc/openvpn/examples/README diff --git a/openvpn/etc/openvpn/examples/client.conf b/usr/share/archboot/openvpn/etc/openvpn/examples/client.conf similarity index 100% rename from openvpn/etc/openvpn/examples/client.conf rename to usr/share/archboot/openvpn/etc/openvpn/examples/client.conf diff --git a/openvpn/etc/openvpn/examples/firewall.sh b/usr/share/archboot/openvpn/etc/openvpn/examples/firewall.sh similarity index 100% rename from openvpn/etc/openvpn/examples/firewall.sh rename to usr/share/archboot/openvpn/etc/openvpn/examples/firewall.sh diff --git a/openvpn/etc/openvpn/examples/home.up b/usr/share/archboot/openvpn/etc/openvpn/examples/home.up similarity index 100% rename from openvpn/etc/openvpn/examples/home.up rename to usr/share/archboot/openvpn/etc/openvpn/examples/home.up diff --git a/openvpn/etc/openvpn/examples/loopback-client b/usr/share/archboot/openvpn/etc/openvpn/examples/loopback-client similarity index 100% rename from openvpn/etc/openvpn/examples/loopback-client rename to usr/share/archboot/openvpn/etc/openvpn/examples/loopback-client diff --git a/openvpn/etc/openvpn/examples/loopback-server b/usr/share/archboot/openvpn/etc/openvpn/examples/loopback-server similarity index 100% rename from openvpn/etc/openvpn/examples/loopback-server rename to usr/share/archboot/openvpn/etc/openvpn/examples/loopback-server diff --git a/openvpn/etc/openvpn/examples/office.up b/usr/share/archboot/openvpn/etc/openvpn/examples/office.up similarity index 100% rename from openvpn/etc/openvpn/examples/office.up rename to usr/share/archboot/openvpn/etc/openvpn/examples/office.up diff --git a/openvpn/etc/openvpn/examples/openvpn-shutdown.sh b/usr/share/archboot/openvpn/etc/openvpn/examples/openvpn-shutdown.sh similarity index 100% rename from openvpn/etc/openvpn/examples/openvpn-shutdown.sh rename to usr/share/archboot/openvpn/etc/openvpn/examples/openvpn-shutdown.sh diff --git a/openvpn/etc/openvpn/examples/openvpn-startup.sh b/usr/share/archboot/openvpn/etc/openvpn/examples/openvpn-startup.sh similarity index 100% rename from openvpn/etc/openvpn/examples/openvpn-startup.sh rename to usr/share/archboot/openvpn/etc/openvpn/examples/openvpn-startup.sh diff --git a/openvpn/etc/openvpn/examples/server.conf b/usr/share/archboot/openvpn/etc/openvpn/examples/server.conf similarity index 100% rename from openvpn/etc/openvpn/examples/server.conf rename to usr/share/archboot/openvpn/etc/openvpn/examples/server.conf diff --git a/openvpn/etc/openvpn/examples/static-home.conf b/usr/share/archboot/openvpn/etc/openvpn/examples/static-home.conf similarity index 100% rename from openvpn/etc/openvpn/examples/static-home.conf rename to usr/share/archboot/openvpn/etc/openvpn/examples/static-home.conf diff --git a/openvpn/etc/openvpn/examples/static-office.conf b/usr/share/archboot/openvpn/etc/openvpn/examples/static-office.conf similarity index 100% rename from openvpn/etc/openvpn/examples/static-office.conf rename to usr/share/archboot/openvpn/etc/openvpn/examples/static-office.conf diff --git a/openvpn/etc/openvpn/examples/tls-home.conf b/usr/share/archboot/openvpn/etc/openvpn/examples/tls-home.conf similarity index 100% rename from openvpn/etc/openvpn/examples/tls-home.conf rename to usr/share/archboot/openvpn/etc/openvpn/examples/tls-home.conf diff --git a/openvpn/etc/openvpn/examples/tls-office.conf b/usr/share/archboot/openvpn/etc/openvpn/examples/tls-office.conf similarity index 100% rename from openvpn/etc/openvpn/examples/tls-office.conf rename to usr/share/archboot/openvpn/etc/openvpn/examples/tls-office.conf diff --git a/openvpn/etc/openvpn/examples/xinetd-client-config b/usr/share/archboot/openvpn/etc/openvpn/examples/xinetd-client-config similarity index 100% rename from openvpn/etc/openvpn/examples/xinetd-client-config rename to usr/share/archboot/openvpn/etc/openvpn/examples/xinetd-client-config diff --git a/openvpn/etc/openvpn/examples/xinetd-server-config b/usr/share/archboot/openvpn/etc/openvpn/examples/xinetd-server-config similarity index 100% rename from openvpn/etc/openvpn/examples/xinetd-server-config rename to usr/share/archboot/openvpn/etc/openvpn/examples/xinetd-server-config diff --git a/pacman/etc/pacman.conf b/usr/share/archboot/pacman/etc/pacman.conf similarity index 100% rename from pacman/etc/pacman.conf rename to usr/share/archboot/pacman/etc/pacman.conf diff --git a/pacman/etc/pacman.d/mirrorlist b/usr/share/archboot/pacman/etc/pacman.d/mirrorlist similarity index 100% rename from pacman/etc/pacman.d/mirrorlist rename to usr/share/archboot/pacman/etc/pacman.d/mirrorlist diff --git a/pam/etc/default/passwd b/usr/share/archboot/pam/etc/default/passwd similarity index 100% rename from pam/etc/default/passwd rename to usr/share/archboot/pam/etc/default/passwd diff --git a/pam/etc/environment b/usr/share/archboot/pam/etc/environment similarity index 100% rename from pam/etc/environment rename to usr/share/archboot/pam/etc/environment diff --git a/pam/etc/pam.d/other b/usr/share/archboot/pam/etc/pam.d/other similarity index 100% rename from pam/etc/pam.d/other rename to usr/share/archboot/pam/etc/pam.d/other diff --git a/pam/etc/pam.d/su b/usr/share/archboot/pam/etc/pam.d/su similarity index 100% rename from pam/etc/pam.d/su rename to usr/share/archboot/pam/etc/pam.d/su diff --git a/pam/etc/security/access.conf b/usr/share/archboot/pam/etc/security/access.conf similarity index 100% rename from pam/etc/security/access.conf rename to usr/share/archboot/pam/etc/security/access.conf diff --git a/pam/etc/security/group.conf b/usr/share/archboot/pam/etc/security/group.conf similarity index 100% rename from pam/etc/security/group.conf rename to usr/share/archboot/pam/etc/security/group.conf diff --git a/pam/etc/security/limits.conf b/usr/share/archboot/pam/etc/security/limits.conf similarity index 100% rename from pam/etc/security/limits.conf rename to usr/share/archboot/pam/etc/security/limits.conf diff --git a/pam/etc/security/namespace.conf b/usr/share/archboot/pam/etc/security/namespace.conf similarity index 100% rename from pam/etc/security/namespace.conf rename to usr/share/archboot/pam/etc/security/namespace.conf diff --git a/pam/etc/security/namespace.init b/usr/share/archboot/pam/etc/security/namespace.init similarity index 100% rename from pam/etc/security/namespace.init rename to usr/share/archboot/pam/etc/security/namespace.init diff --git a/pam/etc/security/pam_env.conf b/usr/share/archboot/pam/etc/security/pam_env.conf similarity index 100% rename from pam/etc/security/pam_env.conf rename to usr/share/archboot/pam/etc/security/pam_env.conf diff --git a/pam/etc/security/time.conf b/usr/share/archboot/pam/etc/security/time.conf similarity index 100% rename from pam/etc/security/time.conf rename to usr/share/archboot/pam/etc/security/time.conf diff --git a/ppp/etc/ppp/chap-secrets b/usr/share/archboot/ppp/etc/ppp/chap-secrets similarity index 100% rename from ppp/etc/ppp/chap-secrets rename to usr/share/archboot/ppp/etc/ppp/chap-secrets diff --git a/ppp/etc/ppp/ip-down b/usr/share/archboot/ppp/etc/ppp/ip-down similarity index 100% rename from ppp/etc/ppp/ip-down rename to usr/share/archboot/ppp/etc/ppp/ip-down diff --git a/ppp/etc/ppp/ip-up b/usr/share/archboot/ppp/etc/ppp/ip-up similarity index 100% rename from ppp/etc/ppp/ip-up rename to usr/share/archboot/ppp/etc/ppp/ip-up diff --git a/ppp/etc/ppp/options b/usr/share/archboot/ppp/etc/ppp/options similarity index 100% rename from ppp/etc/ppp/options rename to usr/share/archboot/ppp/etc/ppp/options diff --git a/ppp/etc/ppp/pap-secrets b/usr/share/archboot/ppp/etc/ppp/pap-secrets similarity index 100% rename from ppp/etc/ppp/pap-secrets rename to usr/share/archboot/ppp/etc/ppp/pap-secrets diff --git a/pppoe/etc/ppp/firewall-masq b/usr/share/archboot/pppoe/etc/ppp/firewall-masq similarity index 100% rename from pppoe/etc/ppp/firewall-masq rename to usr/share/archboot/pppoe/etc/ppp/firewall-masq diff --git a/pppoe/etc/ppp/firewall-standalone b/usr/share/archboot/pppoe/etc/ppp/firewall-standalone similarity index 100% rename from pppoe/etc/ppp/firewall-standalone rename to usr/share/archboot/pppoe/etc/ppp/firewall-standalone diff --git a/pppoe/etc/ppp/pppoe-server-options b/usr/share/archboot/pppoe/etc/ppp/pppoe-server-options similarity index 100% rename from pppoe/etc/ppp/pppoe-server-options rename to usr/share/archboot/pppoe/etc/ppp/pppoe-server-options diff --git a/pppoe/etc/ppp/pppoe.conf b/usr/share/archboot/pppoe/etc/ppp/pppoe.conf similarity index 98% rename from pppoe/etc/ppp/pppoe.conf rename to usr/share/archboot/pppoe/etc/ppp/pppoe.conf index 145a0b511..c383c527c 100644 --- a/pppoe/etc/ppp/pppoe.conf +++ b/usr/share/archboot/pppoe/etc/ppp/pppoe.conf @@ -15,7 +15,6 @@ # Public License. # # LIC: GPL -# $Id: pppoe.conf,v 1.11 2005/08/09 02:49:12 dfs Exp $ #*********************************************************************** # When you configure a variable, DO NOT leave spaces around the "=" sign. diff --git a/pptpclient/etc/ppp/options.pptp b/usr/share/archboot/pptpclient/etc/ppp/options.pptp similarity index 100% rename from pptpclient/etc/ppp/options.pptp rename to usr/share/archboot/pptpclient/etc/ppp/options.pptp diff --git a/remote/etc/conf.d/nfs b/usr/share/archboot/remote/etc/conf.d/nfs similarity index 100% rename from remote/etc/conf.d/nfs rename to usr/share/archboot/remote/etc/conf.d/nfs diff --git a/remote/etc/conf.d/sshd b/usr/share/archboot/remote/etc/conf.d/sshd similarity index 100% rename from remote/etc/conf.d/sshd rename to usr/share/archboot/remote/etc/conf.d/sshd diff --git a/remote/etc/exports b/usr/share/archboot/remote/etc/exports similarity index 100% rename from remote/etc/exports rename to usr/share/archboot/remote/etc/exports diff --git a/remote/etc/hosts.allow b/usr/share/archboot/remote/etc/hosts.allow similarity index 100% rename from remote/etc/hosts.allow rename to usr/share/archboot/remote/etc/hosts.allow diff --git a/remote/etc/hosts.deny b/usr/share/archboot/remote/etc/hosts.deny similarity index 100% rename from remote/etc/hosts.deny rename to usr/share/archboot/remote/etc/hosts.deny diff --git a/remote/etc/pam.d/screen b/usr/share/archboot/remote/etc/pam.d/screen similarity index 100% rename from remote/etc/pam.d/screen rename to usr/share/archboot/remote/etc/pam.d/screen diff --git a/remote/etc/pam.d/sshd b/usr/share/archboot/remote/etc/pam.d/sshd similarity index 100% rename from remote/etc/pam.d/sshd rename to usr/share/archboot/remote/etc/pam.d/sshd diff --git a/remote/etc/rsyncd.conf b/usr/share/archboot/remote/etc/rsyncd.conf similarity index 100% rename from remote/etc/rsyncd.conf rename to usr/share/archboot/remote/etc/rsyncd.conf diff --git a/remote/etc/screenrc b/usr/share/archboot/remote/etc/screenrc similarity index 100% rename from remote/etc/screenrc rename to usr/share/archboot/remote/etc/screenrc diff --git a/remote/etc/ssh/moduli b/usr/share/archboot/remote/etc/ssh/moduli similarity index 100% rename from remote/etc/ssh/moduli rename to usr/share/archboot/remote/etc/ssh/moduli diff --git a/remote/etc/ssh/ssh_config b/usr/share/archboot/remote/etc/ssh/ssh_config similarity index 100% rename from remote/etc/ssh/ssh_config rename to usr/share/archboot/remote/etc/ssh/ssh_config diff --git a/remote/etc/ssh/sshd_config b/usr/share/archboot/remote/etc/ssh/sshd_config similarity index 100% rename from remote/etc/ssh/sshd_config rename to usr/share/archboot/remote/etc/ssh/sshd_config diff --git a/remote/etc/xinetd.conf b/usr/share/archboot/remote/etc/xinetd.conf similarity index 100% rename from remote/etc/xinetd.conf rename to usr/share/archboot/remote/etc/xinetd.conf diff --git a/remote/etc/xinetd.d/rsync b/usr/share/archboot/remote/etc/xinetd.d/rsync similarity index 100% rename from remote/etc/xinetd.d/rsync rename to usr/share/archboot/remote/etc/xinetd.d/rsync diff --git a/remote/etc/xinetd.d/servers b/usr/share/archboot/remote/etc/xinetd.d/servers similarity index 100% rename from remote/etc/xinetd.d/servers rename to usr/share/archboot/remote/etc/xinetd.d/servers diff --git a/remote/etc/xinetd.d/services b/usr/share/archboot/remote/etc/xinetd.d/services similarity index 100% rename from remote/etc/xinetd.d/services rename to usr/share/archboot/remote/etc/xinetd.d/services diff --git a/remote/etc/xinetd.d/telnet b/usr/share/archboot/remote/etc/xinetd.d/telnet similarity index 100% rename from remote/etc/xinetd.d/telnet rename to usr/share/archboot/remote/etc/xinetd.d/telnet diff --git a/scripts/config/686.conf b/usr/share/archboot/scripts/old/config/686.conf similarity index 100% rename from scripts/config/686.conf rename to usr/share/archboot/scripts/old/config/686.conf diff --git a/scripts/config/x86_64.conf b/usr/share/archboot/scripts/old/config/x86_64.conf similarity index 100% rename from scripts/config/x86_64.conf rename to usr/share/archboot/scripts/old/config/x86_64.conf diff --git a/scripts/create-upload-tarball.sh b/usr/share/archboot/scripts/old/create-upload-tarball.sh similarity index 100% rename from scripts/create-upload-tarball.sh rename to usr/share/archboot/scripts/old/create-upload-tarball.sh diff --git a/scripts/generate-isos.sh b/usr/share/archboot/scripts/old/generate-isos.sh similarity index 100% rename from scripts/generate-isos.sh rename to usr/share/archboot/scripts/old/generate-isos.sh diff --git a/shadow/etc/login.defs b/usr/share/archboot/shadow/etc/login.defs similarity index 99% rename from shadow/etc/login.defs rename to usr/share/archboot/shadow/etc/login.defs index 8650448cb..9b1fab05a 100644 --- a/shadow/etc/login.defs +++ b/usr/share/archboot/shadow/etc/login.defs @@ -1,8 +1,6 @@ # # /etc/login.defs - Configuration control definitions for the login package. # -# $Id: login.defs,v 1.1.1.1 2007/02/22 22:46:50 kth5 Exp $ -# # Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. # If unspecified, some arbitrary (and possibly incorrect) value will # be assumed. All other items are optional - if not specified then diff --git a/shadow/etc/pam.d/chage b/usr/share/archboot/shadow/etc/pam.d/chage similarity index 100% rename from shadow/etc/pam.d/chage rename to usr/share/archboot/shadow/etc/pam.d/chage diff --git a/shadow/etc/pam.d/chfn b/usr/share/archboot/shadow/etc/pam.d/chfn similarity index 100% rename from shadow/etc/pam.d/chfn rename to usr/share/archboot/shadow/etc/pam.d/chfn diff --git a/shadow/etc/pam.d/chgpasswd b/usr/share/archboot/shadow/etc/pam.d/chgpasswd similarity index 100% rename from shadow/etc/pam.d/chgpasswd rename to usr/share/archboot/shadow/etc/pam.d/chgpasswd diff --git a/shadow/etc/pam.d/chpasswd b/usr/share/archboot/shadow/etc/pam.d/chpasswd similarity index 100% rename from shadow/etc/pam.d/chpasswd rename to usr/share/archboot/shadow/etc/pam.d/chpasswd diff --git a/shadow/etc/pam.d/groupadd b/usr/share/archboot/shadow/etc/pam.d/groupadd similarity index 100% rename from shadow/etc/pam.d/groupadd rename to usr/share/archboot/shadow/etc/pam.d/groupadd diff --git a/shadow/etc/pam.d/groupdel b/usr/share/archboot/shadow/etc/pam.d/groupdel similarity index 100% rename from shadow/etc/pam.d/groupdel rename to usr/share/archboot/shadow/etc/pam.d/groupdel diff --git a/shadow/etc/pam.d/groupmems b/usr/share/archboot/shadow/etc/pam.d/groupmems similarity index 100% rename from shadow/etc/pam.d/groupmems rename to usr/share/archboot/shadow/etc/pam.d/groupmems diff --git a/shadow/etc/pam.d/groupmod b/usr/share/archboot/shadow/etc/pam.d/groupmod similarity index 100% rename from shadow/etc/pam.d/groupmod rename to usr/share/archboot/shadow/etc/pam.d/groupmod diff --git a/shadow/etc/pam.d/login b/usr/share/archboot/shadow/etc/pam.d/login similarity index 100% rename from shadow/etc/pam.d/login rename to usr/share/archboot/shadow/etc/pam.d/login diff --git a/shadow/etc/pam.d/newusers b/usr/share/archboot/shadow/etc/pam.d/newusers similarity index 100% rename from shadow/etc/pam.d/newusers rename to usr/share/archboot/shadow/etc/pam.d/newusers diff --git a/shadow/etc/pam.d/passwd b/usr/share/archboot/shadow/etc/pam.d/passwd similarity index 100% rename from shadow/etc/pam.d/passwd rename to usr/share/archboot/shadow/etc/pam.d/passwd diff --git a/shadow/etc/pam.d/shadow b/usr/share/archboot/shadow/etc/pam.d/shadow similarity index 100% rename from shadow/etc/pam.d/shadow rename to usr/share/archboot/shadow/etc/pam.d/shadow diff --git a/shadow/etc/pam.d/useradd b/usr/share/archboot/shadow/etc/pam.d/useradd similarity index 100% rename from shadow/etc/pam.d/useradd rename to usr/share/archboot/shadow/etc/pam.d/useradd diff --git a/shadow/etc/pam.d/userdel b/usr/share/archboot/shadow/etc/pam.d/userdel similarity index 100% rename from shadow/etc/pam.d/userdel rename to usr/share/archboot/shadow/etc/pam.d/userdel diff --git a/shadow/etc/pam.d/usermod b/usr/share/archboot/shadow/etc/pam.d/usermod similarity index 100% rename from shadow/etc/pam.d/usermod rename to usr/share/archboot/shadow/etc/pam.d/usermod diff --git a/tz/tz b/usr/share/archboot/tz/tz similarity index 100% rename from tz/tz rename to usr/share/archboot/tz/tz diff --git a/udev/etc/load-modules.sh b/usr/share/archboot/udev/etc/load-modules.sh similarity index 100% rename from udev/etc/load-modules.sh rename to usr/share/archboot/udev/etc/load-modules.sh diff --git a/vpnc/etc/vpnc/default.conf b/usr/share/archboot/vpnc/etc/vpnc/default.conf similarity index 100% rename from vpnc/etc/vpnc/default.conf rename to usr/share/archboot/vpnc/etc/vpnc/default.conf diff --git a/vpnc/etc/vpnc/vpnc-script b/usr/share/archboot/vpnc/etc/vpnc/vpnc-script similarity index 100% rename from vpnc/etc/vpnc/vpnc-script rename to usr/share/archboot/vpnc/etc/vpnc/vpnc-script diff --git a/wireless/etc/conf.d/wireless b/usr/share/archboot/wireless/etc/conf.d/wireless similarity index 100% rename from wireless/etc/conf.d/wireless rename to usr/share/archboot/wireless/etc/conf.d/wireless diff --git a/wireless/etc/wlan/prism2_ssf.pda b/usr/share/archboot/wireless/etc/wlan/prism2_ssf.pda similarity index 100% rename from wireless/etc/wlan/prism2_ssf.pda rename to usr/share/archboot/wireless/etc/wlan/prism2_ssf.pda diff --git a/wireless/etc/wlan/shared b/usr/share/archboot/wireless/etc/wlan/shared similarity index 100% rename from wireless/etc/wlan/shared rename to usr/share/archboot/wireless/etc/wlan/shared diff --git a/wireless/etc/wlan/shared.prism2 b/usr/share/archboot/wireless/etc/wlan/shared.prism2 similarity index 100% rename from wireless/etc/wlan/shared.prism2 rename to usr/share/archboot/wireless/etc/wlan/shared.prism2 diff --git a/wireless/etc/wlan/wlan-udev.sh b/usr/share/archboot/wireless/etc/wlan/wlan-udev.sh similarity index 100% rename from wireless/etc/wlan/wlan-udev.sh rename to usr/share/archboot/wireless/etc/wlan/wlan-udev.sh diff --git a/wireless/etc/wlan/wlan.conf b/usr/share/archboot/wireless/etc/wlan/wlan.conf similarity index 100% rename from wireless/etc/wlan/wlan.conf rename to usr/share/archboot/wireless/etc/wlan/wlan.conf diff --git a/wireless/etc/wlan/wlancfg-DEFAULT b/usr/share/archboot/wireless/etc/wlan/wlancfg-DEFAULT similarity index 100% rename from wireless/etc/wlan/wlancfg-DEFAULT rename to usr/share/archboot/wireless/etc/wlan/wlancfg-DEFAULT diff --git a/wireless/etc/wpa_supplicant.conf b/usr/share/archboot/wireless/etc/wpa_supplicant.conf similarity index 100% rename from wireless/etc/wpa_supplicant.conf rename to usr/share/archboot/wireless/etc/wpa_supplicant.conf