diff --git a/etc/archboot/allinone.conf b/etc/archboot/allinone.conf index 190279275..05b259fea 100644 --- a/etc/archboot/allinone.conf +++ b/etc/archboot/allinone.conf @@ -8,7 +8,7 @@ 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_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm 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_syslinux 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_fsarchiver arch_addons" +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_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm 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_syslinux 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_fsarchiver arch_addons arch_vim" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-ftp-pxelinux.conf b/etc/archboot/default-ftp-pxelinux.conf index 38fbb5c7a..a9911eb4b 100644 --- a/etc/archboot/default-ftp-pxelinux.conf +++ b/etc/archboot/default-ftp-pxelinux.conf @@ -8,7 +8,7 @@ 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_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm 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_syslinux 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_fsarchiver arch_addons arch_pxelinux" +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_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm 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_syslinux 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_fsarchiver arch_addons arch_vim arch_pxelinux" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-ftp.conf b/etc/archboot/default-ftp.conf index 203af22bd..bb8b59b37 100644 --- a/etc/archboot/default-ftp.conf +++ b/etc/archboot/default-ftp.conf @@ -8,7 +8,7 @@ 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_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm 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_syslinux 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_fsarchiver arch_addons" +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_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm 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_syslinux 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_fsarchiver arch_addons arch_vim" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-pxelinux.conf b/etc/archboot/default-pxelinux.conf index 9c1e35551..69e056924 100644 --- a/etc/archboot/default-pxelinux.conf +++ b/etc/archboot/default-pxelinux.conf @@ -8,7 +8,7 @@ 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_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm 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_syslinux 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_fsarchiver arch_addons arch_pxelinux" +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_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm 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_syslinux 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_fsarchiver arch_addons arch_vim arch_pxelinux" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default.conf b/etc/archboot/default.conf index 86ce98104..1735a08e8 100644 --- a/etc/archboot/default.conf +++ b/etc/archboot/default.conf @@ -8,7 +8,7 @@ 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_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm 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_syslinux 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_fsarchiver arch_addons" +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_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm 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_syslinux 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_fsarchiver arch_vim arch_addons" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/lib/initcpio/hooks/arch_base b/lib/initcpio/hooks/arch_base index 12e8f67f5..4c5f47d68 100644 --- a/lib/initcpio/hooks/arch_base +++ b/lib/initcpio/hooks/arch_base @@ -3,11 +3,7 @@ run_hook () { # fixing some symlinks - ln -s /sbin/halt /sbin/poweroff - ln -s /sbin/halt /sbin/reboot ln -s /usr/sbin/chroot /bin/chroot - ln -s /sbin/killall5 /bin/pidof - ln -s /usr/bin/netcat /usr/bin/nc # fix depmod link ln -s /sbin/depmod /bin/depmod # fix permission on /var/lock diff --git a/lib/initcpio/hooks/arch_base_lowmem b/lib/initcpio/hooks/arch_base_lowmem index 5c8c73ce3..ed167ba16 100644 --- a/lib/initcpio/hooks/arch_base_lowmem +++ b/lib/initcpio/hooks/arch_base_lowmem @@ -3,11 +3,7 @@ run_hook () { # fixing some symlinks - ln -s /sbin/halt /sbin/poweroff - ln -s /sbin/halt /sbin/reboot ln -s /usr/sbin/chroot /bin/chroot - ln -s /sbin/killall5 /bin/pidof - ln -s /usr/bin/netcat /usr/bin/nc # fix depmod link ln -s /sbin/depmod /bin/depmod # fix permission on /var/lock diff --git a/lib/initcpio/hooks/arch_filesystems b/lib/initcpio/hooks/arch_filesystems index 6d44adb1f..8842547f1 100644 --- a/lib/initcpio/hooks/arch_filesystems +++ b/lib/initcpio/hooks/arch_filesystems @@ -1,45 +1,5 @@ run_hook () { - # fix reiserfs symlinks - ln -s /sbin/mkreiserfs /sbin/mkfs.reiserfs - ln -s /sbin/reiserfsck /sbin/fsck.reiserfs - - # fix ext2/ext3/ext4 symlinks - ln -s /sbin/e2fsck /sbin/fsck.ext2 - ln -s /sbin/e2fsck /sbin/fsck.ext3 - ln -s /sbin/findfs /sbin/e2label - ln -s /sbin/findfs /sbin/tune2fs - ln -s /sbin/mkfs.ext2 /sbin/mkfs.ext3 - ln -s /sbin/mkfs.ext2 /sbin/mkfs.ext4 - ln -s /sbin/mkfs.ext2 /sbin/mke2fs - - # fix jfs symlinks - ln -s /sbin/jfs_fsck /sbin/fsck.jfs - ln -s /sbin/jfs_mkfs /sbin/mkfs.jfs - - # fix vfat symlink - ln -s /sbin/mkdosfs /sbin/mkfs.vfat - ln -s /sbin/mkdosfs /sbin/mkfs.msdos - ln -s /sbin/dosfsck /sbin/fsck.msdos - ln -s /sbin/dosfsck /sbin/fsck.vfat - # fix ntfs symlinks - ln -s /usr/sbin/mkntfs /sbin/mkfs.ntfs - ln -s /usr/bin/ntfsmount /sbin/mount.ntfs-fuse - ln -s /usr/bin/ntfsmount /sbin/mount.fuse.ntfs - - # fix ntfs-3g symlink - ln -s /bin/ntfs-3g /sbin/mount.ntfs-3g - - # fix nfs - ln -s /sbin/mount.nfs /sbin/mount.nfs4 - ln -s /sbin/mount.nfs /sbin/umount.nfs - ln -s /sbin/mount.nfs /sbin/umount.nfs4 - - # fix cifs - ln -s /sbin/mount.cifs /sbin/mount.smbfs - ln -s /sbin/umount.cifs /sbin/umount.smbfs - - #needed for switching if ! [ "${root}" = "" ]; then msg -n ":: Loading root filesystem module..." diff --git a/lib/initcpio/hooks/arch_filesystems_lowmem b/lib/initcpio/hooks/arch_filesystems_lowmem index de85c9f74..8842547f1 100644 --- a/lib/initcpio/hooks/arch_filesystems_lowmem +++ b/lib/initcpio/hooks/arch_filesystems_lowmem @@ -1,28 +1,5 @@ run_hook () { - # fix reiserfs symlinks - ln -s /sbin/mkreiserfs /sbin/mkfs.reiserfs - - # fix ext2/ext3 symlinks - ln -s /sbin/mkfs.ext2 /sbin/mkfs.ext3 - ln -s /sbin/mkfs.ext2 /sbin/mkfs.ext4 - ln -s /sbin/mkfs.ext2 /sbin/mke2fs - - # fix jfs symlinks - ln -s /sbin/jfs_mkfs /sbin/mkfs.jfs - - # fix ntfs symlinks - ln -s /usr/sbin/mkntfs /sbin/mkfs.ntfs - ln -s /usr/bin/ntfsmount /sbin/mount.ntfs-fuse - ln -s /usr/bin/ntfsmount /sbin/mount.fuse.ntfs - - # fix ntfs-3g symlink - ln -s /bin/ntfs-3g /sbin/mount.ntfs-3g - - # fix vfat symlink - ln -s /sbin/mkdosfs /sbin/mkfs.vfat - ln -s /sbin/mkdosfs /sbin/mkfs.msdos - #needed for switching if ! [ "${root}" = "" ]; then msg -n ":: Loading root filesystem module..." diff --git a/lib/initcpio/hooks/arch_intel_wireless b/lib/initcpio/hooks/arch_intel_wireless index 395d34990..f526d0333 100644 --- a/lib/initcpio/hooks/arch_intel_wireless +++ b/lib/initcpio/hooks/arch_intel_wireless @@ -1,21 +1,25 @@ run_hook () { - if grep -qw intel-wireless /proc/cmdline; then - echo "ARCH_INTEL_WIRELESS:" - echo "--------------------" - echo "You have ACCEPTED the firmware licenses:" - echo "/usr/share/licenses/iwlwifi-4965-ucode/LICENSE" - echo "/usr/share/licenses/iwlwifi-3945-ucode/LICENSE" - echo "/lib/firmware/LICENSE.ipw2200-fw" - echo "/lib/firmware/LICENSE.ipw2100-fw" - echo "Intel wireless drivers are now available." - ! [ -d /lib/firmware/ ] && mkdir -p /lib/firmware - mv /intel-firmware/* /lib/firmware/ + ### remove firmware took in by generation! + rm /lib/firmware/ipw2100* >/dev/null 2>&1 + rm /lib/firmware/ipw2200* >/dev/null 2>&1 + rm /lib/firmware/iwlwifi* >/dev/null 2>&1 + if grep -qw intel-wireless /proc/cmdline; then + echo "ARCH_INTEL_WIRELESS:" + echo "--------------------" + echo "You have ACCEPTED the firmware licenses:" + echo "/usr/share/licenses/iwlwifi-4965-ucode/LICENSE" + echo "/usr/share/licenses/iwlwifi-3945-ucode/LICENSE" + echo "/lib/firmware/LICENSE.ipw2200-fw" + echo "/lib/firmware/LICENSE.ipw2100-fw" + echo "Intel wireless drivers are now available." + ! [ -d /lib/firmware/ ] && mkdir -p /lib/firmware + mv /intel-firmware/* /lib/firmware/ else - echo "ARCH_INTEL_WIRELESS USAGE:" - echo "--------------------" - echo "In order to use those drivers, you have to agree to the firmware licenses" - echo "by appending intel-wireless to boot prompt." - echo "--------------------" + echo "ARCH_INTEL_WIRELESS USAGE:" + echo "--------------------" + echo "In order to use those drivers, you have to agree to the firmware licenses" + echo "by appending intel-wireless to boot prompt." + echo "--------------------" fi } diff --git a/lib/initcpio/hooks/arch_lvm2 b/lib/initcpio/hooks/arch_lvm2 index ba94c3374..b77e2a5cd 100644 --- a/lib/initcpio/hooks/arch_lvm2 +++ b/lib/initcpio/hooks/arch_lvm2 @@ -1,19 +1,13 @@ 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 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -c "/dev/mapper/control" ]; then - read dev_t < /sys/class/misc/device-mapper/dev - /bin/mknod "/dev/mapper/control" c $(/bin/replace "${dev_t}" ':') - fi - + read dev_t < /sys/class/misc/device-mapper/dev + /bin/mknod "/dev/mapper/control" c $(/bin/replace "${dev_t}" ':') + fi msg "Scanning logical volumes..." /sbin/lvm vgscan --ignorelockingfailure msg "Activating logical volumes..." diff --git a/lib/initcpio/hooks/arch_net b/lib/initcpio/hooks/arch_net deleted file mode 100644 index 11aa9c72e..000000000 --- a/lib/initcpio/hooks/arch_net +++ /dev/null @@ -1,8 +0,0 @@ -# Created by Tobias Powalowski - -run_hook () -{ - # fixing some symlinks - ln -s /usr/sbin/lnstat /usr/sbin/ctstat - ln -s /usr/sbin/lnstat /usr/sbin/rtstat -} diff --git a/lib/initcpio/hooks/arch_remote b/lib/initcpio/hooks/arch_remote index 492f186e0..842caf405 100644 --- a/lib/initcpio/hooks/arch_remote +++ b/lib/initcpio/hooks/arch_remote @@ -1,9 +1,5 @@ run_hook () { - # fix slogin - 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 diff --git a/lib/initcpio/hooks/arch_syslinux b/lib/initcpio/hooks/arch_syslinux deleted file mode 100644 index 312f9ee78..000000000 --- a/lib/initcpio/hooks/arch_syslinux +++ /dev/null @@ -1,6 +0,0 @@ -run_hook () -{ - # fix syslinux - ln -s /usr/bin/mtools /usr/bin/mcopy - ln -s /usr/bin/mtools /usr/bin/mattrib -} diff --git a/lib/initcpio/install/arch_base b/lib/initcpio/install/arch_base index d83bfdc23..56a9a9d1f 100644 --- a/lib/initcpio/install/arch_base +++ b/lib/initcpio/install/arch_base @@ -2,6 +2,9 @@ install () { + 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 vim-normal 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 echo gunzip zcat reset swapoff halt telinit awk dir reboot poweroff pidof nc" + ### setting up base structure add_dir "/proc" add_dir "/sys" @@ -26,56 +29,33 @@ install () add_file $f done - ### adding klibc binaries + ### adding klibc binaries, stripping out all programs we use real version! 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 vim-normal 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" - add_file "/usr/bin/reset" - add_file "/sbin/swapoff" - add_file "/sbin/halt" - add_file "/sbin/telinit" - add_file "/bin/awk" - add_file "/usr/share/archboot/base/init" "/init" - add_file "/usr/bin/vim" - add_file "/bin/dir" + add_file "/usr/share/terminfo/l/linux" - add_file "/usr/share/vim/vim72/syntax/syntax.vim" - add_file "/usr/share/vim/vim72/syntax/conf.vim" - add_file "/usr/share/vim/vim72/syntax/sh.vim" - add_file "/usr/share/vim/vim72/syntax/grub.vim" - add_file "/usr/share/vim/vim72/syntax/lilo.vim" - add_file "/usr/share/vim/vim72/syntax/manual.vim" - add_file "/usr/share/vim/vim72/syntax/synload.vim" - add_file "/usr/share/vim/vim72/syntax/colortest.vim" - add_file "/usr/share/vim/vim72/syntax/syncolor.vim" - add_file "/usr/share/vim/vim72/syntax/hitest.vim" - add_file "/usr/share/vim/vim72/syntax/whitespace.vim" - add_file "/usr/share/vim/vim72/syntax/modconf.vim" - add_file "/usr/share/vim/vim72/syntax/resolv.vim" - add_file "/usr/share/vim/vim72/syntax/fstab.vim" - add_file "/usr/share/vim/vim72/filetype.vim" + add_file "/usr/share/archboot/base/init" "/init" add_file "/etc/rc.d/functions" 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 /usr/share/archboot/base/etc/*); do add_file "$i" "/etc/$(basename $i)" done - + ### fixing network support add_file "/lib/libnss_files.so.2" add_file "/lib/libnss_dns.so.2" + ### add copy-mountpoint.sh add_file "/usr/bin/copy-mountpoint.sh" - # fix licenses + + ### fix licenses add_file "/usr/share/licenses/bzip2/LICENSE" add_file "/usr/share/licenses/hdparm/LICENSE.TXT" add_file "/usr/share/licenses/ncurses/license.txt" diff --git a/lib/initcpio/install/arch_base_lowmem b/lib/initcpio/install/arch_base_lowmem index bea2688b0..ecf52b3e3 100644 --- a/lib/initcpio/install/arch_base_lowmem +++ b/lib/initcpio/install/arch_base_lowmem @@ -2,6 +2,9 @@ install () { + 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 readlink echo gunzip zcat reset swapoff halt telinit awk dir poweroff reboot pidof nc" + ### setting up base structure add_dir "/proc" add_dir "/sys" @@ -26,25 +29,15 @@ install () add_file $f done - ### adding klibc binaries + ### adding klibc binaries, stripping out all programs we use real version! 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 readlink" - add_file "/bin/echo" - add_file "/bin/gunzip" - add_file "/bin/zcat" - add_file "/usr/bin/reset" - add_file "/sbin/swapoff" - add_file "/sbin/halt" - add_file "/sbin/telinit" - add_file "/bin/awk" + 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 "/usr/share/archboot/base/etc/rc.conf" "/etc/rc.conf" @@ -58,9 +51,11 @@ install () ### fixing network support add_file "/lib/libnss_files.so.2" add_file "/lib/libnss_dns.so.2" + ### add copy-mountpoint.sh add_file "/usr/bin/copy-mountpoint.sh" - # fix licenses + + ### fix licenses add_file "/usr/share/licenses/bzip2/LICENSE" add_file "/usr/share/licenses/hdparm/LICENSE.TXT" add_file "/usr/share/licenses/ncurses/license.txt" diff --git a/lib/initcpio/install/arch_core_install b/lib/initcpio/install/arch_core_install index 6b6aabf18..2e74d0a13 100644 --- a/lib/initcpio/install/arch_core_install +++ b/lib/initcpio/install/arch_core_install @@ -2,61 +2,63 @@ install () { + SCRIPT= + BINARIES= ### check for root if ! [ $UID -eq 0 ]; then - echo "ERROR: Please run as root user!" - exit 1 + 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 + 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 + 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} + SVNTREE=$(mktemp /tmp/svntree.XXXX) + rm ${SVNTREE} + mkdir -p ${SVNTREE} else - SVNTREE=${SVNTREE} + 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')) ntfs-3g dhclient" - 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*") + # 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')) ntfs-3g dhclient" + 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*") + 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) @@ -65,17 +67,16 @@ install () # 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 || return 1 - fi + 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 || return 1 + fi done + rm ${TEMPDIR}/core-$(uname -m)/pkg/core.db.tar.gz~ # 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}" = "mkisolinux" ] && echo "Arch_Linux_CORE $(uname -m)" >> ${ISONAME} } diff --git a/lib/initcpio/install/arch_fb b/lib/initcpio/install/arch_fb index 60aefbfd0..b4e05e29f 100644 --- a/lib/initcpio/install/arch_fb +++ b/lib/initcpio/install/arch_fb @@ -2,7 +2,7 @@ install () { - MODULES=" $(checked_modules "/video/" | grep 'fb')" + MODULES=" $(checked_modules "drivers/video/" | grep 'fb')" BINARIES="v86d" FILES="" diff --git a/lib/initcpio/install/arch_filesystems b/lib/initcpio/install/arch_filesystems index ef0067d3a..427814098 100644 --- a/lib/initcpio/install/arch_filesystems +++ b/lib/initcpio/install/arch_filesystems @@ -3,7 +3,7 @@ install () { MODULES=" $(checked_modules '/kernel/fs') " - BINARIES="mkswap debugreiserfs mkreiserfs reiserfsck reiserfstune resize_reiserfs badblocks blkid debugfs dumpe2fs e2fsck e2image findfs fsck logsave mkfs.ext2 resize2fs mkntfs ntfsmount ntfscp ntfsclone ntfslabel ntfsresize ntfsundelete ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs fsck.xfs xfs_repair xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_freeze xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp mkdosfs dosfsck dosfslabel ntfs-3g mount.nfs mount.cifs umount.cifs" + BINARIES="mkswap debugreiserfs mkreiserfs reiserfsck reiserfstune resize_reiserfs badblocks blkid debugfs dumpe2fs e2fsck e2image findfs fsck logsave mkfs.ext2 resize2fs mkntfs ntfsmount ntfscp ntfsclone ntfslabel ntfsresize ntfsundelete ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs fsck.xfs xfs_repair xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_freeze xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp mkdosfs dosfsck dosfslabel ntfs-3g mount.nfs mount.cifs umount.cifs mkfs.reiserfs fsck.reiserfs fsck.ext2 fsck.ext3 e2label tune2fs mkfs.ext3 mkfs.ext4 mke2fs fsck.jfs mkfs.jfs mkfs.vfat mkfs.msdos fsck.msdos fsck.vfat mkfs.ntfs mount.ntfs-fuse mount.fuse.ntfs mount.ntfs-3g mount.nfs4 umount.nfs umount.nfs4" FILES="" SCRIPT="arch_filesystems" # fix licenses diff --git a/lib/initcpio/install/arch_filesystems_lowmem b/lib/initcpio/install/arch_filesystems_lowmem index e3dfacdb3..d27d7a201 100644 --- a/lib/initcpio/install/arch_filesystems_lowmem +++ b/lib/initcpio/install/arch_filesystems_lowmem @@ -3,7 +3,7 @@ install () { MODULES=" $(checked_modules '/kernel/fs/reiserfs') $(checked_modules '/kernel/fs/ext2') $(checked_modules '/kernel/fs/ext3') $(checked_modules '/kernel/fs/ext4') $(checked_modules '/kernel/fs/jfs') $(checked_modules '/kernel/fs/xfs') $(checked_modules '/kernel/fs/vfat') $(checked_modules '/kernel/fs/fat') $(checked_modules '/kernel/fs/isofs') $(checked_modules '/kernel/fs/nls/nls_cp437') $(checked_modules '/kernel/fs/fuse')" - BINARIES="mkswap mkreiserfs mkfs.ext2 jfs_fsck jfs_mkfs mkfs.xfs xfs_freeze xfs_io mkdosfs blkid mkntfs ntfsmount ntfs-3g" + BINARIES="mkswap mkreiserfs mkfs.ext2 jfs_fsck jfs_mkfs mkfs.xfs xfs_freeze xfs_io mkdosfs blkid mkntfs ntfsmount ntfs-3g mkfs.reiserfs mkfs.ext3 mkfs.ext4 mke2fs mkfs.jfs mkfs.ntfs mount.ntfs-fuse mount.fuse.ntfs mount.ntfs-3g mkfs.vfat mkfs.msdos" FILES="" SCRIPT="arch_filesystems_lowmem" # fix licenses diff --git a/lib/initcpio/install/arch_fw b/lib/initcpio/install/arch_fw index 14e4b9d1e..7a076ac2f 100644 --- a/lib/initcpio/install/arch_fw +++ b/lib/initcpio/install/arch_fw @@ -2,7 +2,7 @@ install () { - MODULES=" $(checked_modules "/firewire/") $(checked_modules "/ieee1394/") " + MODULES=" $(checked_modules "/ieee1394/") " MODULES=$(echo ${MODULES}) #trim whitespace if [ -n "${MODULES}" ]; then diff --git a/lib/initcpio/install/arch_hwdetect b/lib/initcpio/install/arch_hwdetect index e3a538687..37da9a2b4 100644 --- a/lib/initcpio/install/arch_hwdetect +++ b/lib/initcpio/install/arch_hwdetect @@ -3,10 +3,9 @@ install () { MODULES="" - BINARIES="vmware-detect" + BINARIES="vmware-detect hwdetect" FILES="" SCRIPT="arch_hwdetect" - add_file /sbin/hwdetect /sbin/hwdetect } help () diff --git a/lib/initcpio/install/arch_licenses b/lib/initcpio/install/arch_licenses index a4345ff65..c33307939 100644 --- a/lib/initcpio/install/arch_licenses +++ b/lib/initcpio/install/arch_licenses @@ -6,9 +6,9 @@ install () BINARIES="" FILES="" SCRIPT="arch_licenses" - for i in $(find /usr/share/licenses/common ! -type d -type f); do - add_file $i - done + for i in $(find /usr/share/licenses/common ! -type d -type f); do + add_file $i + done } help () diff --git a/lib/initcpio/install/arch_lvm2 b/lib/initcpio/install/arch_lvm2 index eacff008e..eb8251502 100644 --- a/lib/initcpio/install/arch_lvm2 +++ b/lib/initcpio/install/arch_lvm2 @@ -3,10 +3,9 @@ install () { MODULES=" $(checked_modules "drivers/md/dm-*") " - BINARIES="lvm fsadm lvmdump" + BINARIES="lvm fsadm lvmdump 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" FILES="" SCRIPT="arch_lvm2" - add_dir "/dev/mapper" } diff --git a/lib/initcpio/install/arch_net b/lib/initcpio/install/arch_net index e1fc83989..4e2898277 100644 --- a/lib/initcpio/install/arch_net +++ b/lib/initcpio/install/arch_net @@ -8,30 +8,9 @@ install () for i in $STAGING; do MODULES="$MODULES $(checked_modules "/drivers/staging/$i")" done - BINARIES="ping ping6 route nslookup telnet ssh arpd genl ifcfg ifstat ip lnstat nstat routef routel rtacct rtmon rtpr ss tc dhclient" + BINARIES="ping ping6 route nslookup telnet ssh arpd genl ifcfg ifstat ip lnstat ctstat rtstat nstat routef routel rtacct rtmon rtpr ss tc dhclient" FILES="" - SCRIPT="arch_net" - # add e100 firmware files - add_file "/lib/firmware/e100/d101m_ucode.bin" - add_file "/lib/firmware/e100/d101s_ucode.bin" - add_file "/lib/firmware/e100/d102e_ucode.bin" - # add acenic firmware files - add_file "/lib/firmware/acenic/tg1.bin" - add_file "/lib/firmware/acenic/tg2.bin" - # add cassini firmware files - add_file "/lib/firmware/sun/cassini.bin" - # add kaweth firmware files - add_file "/lib/firmware/kaweth/new_code.bin" - add_file "/lib/firmware/kaweth/new_code_fix.bin" - add_file "/lib/firmware/kaweth/trigger_code.bin" - add_file "/lib/firmware/kaweth/trigger_code_fix.bin" - # add starfire firmware files - add_file "/lib/firmware/adaptec/starfire_rx.bin" - add_file "/lib/firmware/adaptec/starfire_tx.bin" - # add tg3 firmware files - add_file "/lib/firmware/tigon/tg3.bin" - add_file "/lib/firmware/tigon/tg3_tso.bin" - add_file "/lib/firmware/tigon/tg3_tso5.bin" + SCRIPT="" add_file "/sbin/dhcpcd" add_file "/sbin/ifenslave" add_file "/usr/sbin/brctl" diff --git a/lib/initcpio/install/arch_netcfg b/lib/initcpio/install/arch_netcfg index 1e33bd079..e79a65fbe 100644 --- a/lib/initcpio/install/arch_netcfg +++ b/lib/initcpio/install/arch_netcfg @@ -3,7 +3,7 @@ install () { MODULES="" - BINARIES="" + BINARIES="netcfg-auto-wireless netcfg-menu netcfg2 netcfg" FILES="" SCRIPT="" for i in /usr/lib/network/*; do @@ -14,9 +14,6 @@ install () done add_dir "/var/run/network/interfaces" add_dir "/var/run/network/profiles" - add_file "/usr/bin/netcfg-auto-wireless" - add_file "/usr/bin/netcfg-menu" - add_file "/usr/bin/netcfg2" for i in /etc/network.d/examples/*; do add_file $i done diff --git a/lib/initcpio/install/arch_pciutils b/lib/initcpio/install/arch_pciutils index a0692a84d..1438ede4a 100644 --- a/lib/initcpio/install/arch_pciutils +++ b/lib/initcpio/install/arch_pciutils @@ -7,7 +7,6 @@ install () FILES="" SCRIPT="" add_file "/usr/share/hwdata/pci.ids" - add_file "/usr/sbin/update-pciids" } help () diff --git a/lib/initcpio/install/arch_remote b/lib/initcpio/install/arch_remote index e8cd2da31..a4b42df71 100644 --- a/lib/initcpio/install/arch_remote +++ b/lib/initcpio/install/arch_remote @@ -4,7 +4,7 @@ install () { MODULES=" $(checked_modules "/drivers/net/") " - BINARIES="$(basename $(find /usr/bin/screen-*)) tcpd findssl.sh scp sftp ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan sshd pmap_set pmap_dump portmap xinetd telnetd rsync exportfs nfsstat rpc.idmapd rpc.mountd rpc.nfsd rpc.statd rpcdebug showmount sm-notify start-statd" + BINARIES="tcpd findssl.sh scp sftp ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan sshd pmap_set pmap_dump portmap xinetd telnetd rsync exportfs nfsstat rpc.idmapd rpc.mountd rpc.nfsd rpc.statd rpcdebug showmount sm-notify start-statd slogin screen" FILES="" SCRIPT="arch_remote" add_file "/usr/share/archboot/remote/etc/hosts.allow" "/etc/hosts.allow" diff --git a/lib/initcpio/install/arch_shadow b/lib/initcpio/install/arch_shadow index a240a6bcc..dc5e6050c 100644 --- a/lib/initcpio/install/arch_shadow +++ b/lib/initcpio/install/arch_shadow @@ -3,11 +3,9 @@ install () { MODULES="" - BINARIES="groups login nologin chage chfn chsh expiry faillog gpasswd lastlog passwd adduser chgpasswd chpasswd groupadd groupdel groupmems groupmod grpck grpconv grpunconv logoutd newusers pwck pwconv pwunconv useradd userdel usermod" + BINARIES="groups login nologin chage chfn chsh expiry faillog gpasswd lastlog passwd adduser chgpasswd chpasswd groupadd groupdel groupmems groupmod grpck grpconv grpunconv logoutd newusers pwck pwconv pwunconv useradd userdel usermod sg vigr" FILES="" SCRIPT="" - add_file "/usr/bin/sg" - add_file "/usr/sbin/vigr" 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 diff --git a/lib/initcpio/install/arch_syslinux b/lib/initcpio/install/arch_syslinux index a8a176b69..a6397ffd4 100644 --- a/lib/initcpio/install/arch_syslinux +++ b/lib/initcpio/install/arch_syslinux @@ -3,9 +3,9 @@ install () { MODULES="" - BINARIES="syslinux mtools" + BINARIES="syslinux mtools mcopy mattrib" FILES="" - SCRIPT="arch_syslinux" + SCRIPT="" add_file "/usr/lib/syslinux/mbr.bin" add_file "/usr/lib/gconv/gconv-modules" add_file "/usr/lib/gconv/IBM850.so" diff --git a/lib/initcpio/install/arch_tiacx_wireless b/lib/initcpio/install/arch_tiacx_wireless index 4f6b739f6..633e39d27 100644 --- a/lib/initcpio/install/arch_tiacx_wireless +++ b/lib/initcpio/install/arch_tiacx_wireless @@ -3,13 +3,12 @@ install () { MODULES="" - BINARIES="" FILES="" SCRIPT="arch_tiacx_wireless" # add firmware files for i in $(find /usr/share/tiacx/ ! -type d); do - add_file $i + add_file $i done echo "- ARCH_TIACX_WIRELESS USAGE:" >> ${OPTIONSBOOTMESSAGE} echo " Please identify the correct file(s) for your device in /usr/share/tiacx" >> ${OPTIONSBOOTMESSAGE} diff --git a/lib/initcpio/install/arch_tz b/lib/initcpio/install/arch_tz index 3416b62a0..2f26a6600 100644 --- a/lib/initcpio/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 /usr/share/archboot/tz/tz /usr/bin/tz + add_file "/usr/share/archboot/tz/tz" "/usr/bin/tz" # fix licenses add_file "/usr/share/licenses/ntp/COPYRIGHT" } diff --git a/lib/initcpio/install/arch_vim b/lib/initcpio/install/arch_vim new file mode 100644 index 000000000..dc8c174a3 --- /dev/null +++ b/lib/initcpio/install/arch_vim @@ -0,0 +1,31 @@ +# Created by Tobias Powalowski + +install () +{ + MODULES="" + BINARIES="vim" + FILES="" + SCRIPT="" + add_file "/usr/share/vim/vim72/syntax/syntax.vim" + add_file "/usr/share/vim/vim72/syntax/conf.vim" + add_file "/usr/share/vim/vim72/syntax/sh.vim" + add_file "/usr/share/vim/vim72/syntax/grub.vim" + add_file "/usr/share/vim/vim72/syntax/lilo.vim" + add_file "/usr/share/vim/vim72/syntax/manual.vim" + add_file "/usr/share/vim/vim72/syntax/synload.vim" + add_file "/usr/share/vim/vim72/syntax/colortest.vim" + add_file "/usr/share/vim/vim72/syntax/syncolor.vim" + add_file "/usr/share/vim/vim72/syntax/hitest.vim" + add_file "/usr/share/vim/vim72/syntax/whitespace.vim" + add_file "/usr/share/vim/vim72/syntax/modconf.vim" + add_file "/usr/share/vim/vim72/syntax/resolv.vim" + add_file "/usr/share/vim/vim72/syntax/fstab.vim" + add_file "/usr/share/vim/vim72/filetype.vim" +} + +help () +{ +cat<