From a94cba86d29e25c68f0cf7e75a8006a470e39cde Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sun, 27 May 2012 12:04:03 +0200 Subject: [PATCH] more mkinitcpio 0.9.0 fixes --- usr/lib/initcpio/install/arch_memtest | 4 +--- usr/lib/initcpio/install/arch_mmc | 8 ++------ usr/lib/initcpio/install/arch_motd | 1 + usr/lib/initcpio/install/arch_net | 16 +++++++++++----- usr/lib/initcpio/install/arch_netcfg | 9 +++++---- usr/lib/initcpio/install/arch_nmap | 9 +++++---- usr/lib/initcpio/install/arch_openconnect | 6 ++---- usr/lib/initcpio/install/arch_openvpn | 6 ++---- usr/lib/initcpio/install/arch_pacman | 13 +++++++------ usr/lib/initcpio/install/arch_pacman_lts | 11 ++++++----- usr/lib/initcpio/install/arch_pam | 7 +++---- usr/lib/initcpio/install/arch_pciutils | 7 +++---- 12 files changed, 48 insertions(+), 49 deletions(-) diff --git a/usr/lib/initcpio/install/arch_memtest b/usr/lib/initcpio/install/arch_memtest index 1039c8f94..a51277698 100644 --- a/usr/lib/initcpio/install/arch_memtest +++ b/usr/lib/initcpio/install/arch_memtest @@ -1,10 +1,8 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - BINARIES="" - FILES="" - SCRIPT="" [ ${RUNPROGRAM} = "mkisolinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest" [ ${RUNPROGRAM} = "archboot-tarball-helper.sh" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest" [ ${RUNPROGRAM} = "mksyslinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest" diff --git a/usr/lib/initcpio/install/arch_mmc b/usr/lib/initcpio/install/arch_mmc index 365ca5040..17203e72b 100644 --- a/usr/lib/initcpio/install/arch_mmc +++ b/usr/lib/initcpio/install/arch_mmc @@ -1,13 +1,9 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES=" $(checked_modules "/mmc/") " - - MODULES=$(echo ${MODULES}) #trim whitespace - BINARIES="" - FILES="" - SCRIPT="" + add_checked_modules '/mmc/' } help () diff --git a/usr/lib/initcpio/install/arch_motd b/usr/lib/initcpio/install/arch_motd index 2cadaf823..52c263b96 100644 --- a/usr/lib/initcpio/install/arch_motd +++ b/usr/lib/initcpio/install/arch_motd @@ -1,3 +1,4 @@ +#!/bin/bash # Created by Tobias Powalowski build () diff --git a/usr/lib/initcpio/install/arch_net b/usr/lib/initcpio/install/arch_net index 12ae7383f..c4a9c0394 100644 --- a/usr/lib/initcpio/install/arch_net +++ b/usr/lib/initcpio/install/arch_net @@ -1,16 +1,22 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES=" $(checked_modules "/drivers/net/" | grep -ve "wireless") " + add_checked_modules -f 'wireless' '/drivers/net/' # add staging modules STAGING="et131x" for i in $STAGING; do - MODULES="$MODULES $(checked_modules "/drivers/staging/$i")" + add_checked_modules "/drivers/staging/$i" done - BINARIES="/bin/dnsdomainname /usr/bin/domainname /bin/netstat /usr/bin/nisdomainname /usr/bin/ypdomainname /sbin/arp /sbin/ipmaddr /sbin/iptunnel /sbin/mii-tool /sbin/nameif /sbin/plipconfig /sbin/rarp /sbin/slattach /bin/ping /bin/ping6 /bin/traceroute /bin/traceroute6 /usr/sbin/arping /usr/sbin/clockdiff /usr/sbin/rarpd /usr/sbin/rdisc /usr/sbin/tftpd /usr/sbin/tracepath /usr/sbin/tracepath6 /sbin/route /usr/bin/dig /usr/bin/host /usr/bin/nslookup /usr/bin/nsupdate /usr/bin/telnet /usr/bin/ssh /usr/sbin/arpd /usr/sbin/ctstat /usr/sbin/genl /usr/sbin/ifstat /usr/sbin/ip /usr/sbin/lnstat /usr/sbin/nstat /usr/sbin/rtacct /usr/sbin/rtmon /usr/sbin/rtstat /usr/sbin/ss /usr/sbin/tc /usr/sbin/dhclient /usr/sbin/ifplugd /usr/sbin/ifplugstatus" - FILES="/usr/sbin/ifcfg /usr/sbin/routef /usr/sbin/routel /usr/sbin/rtpr" - SCRIPT="" + apps="/bin/dnsdomainname /usr/bin/domainname /bin/netstat /usr/bin/nisdomainname /usr/bin/ypdomainname /sbin/arp /sbin/ipmaddr /sbin/iptunnel /sbin/mii-tool /sbin/nameif /sbin/plipconfig /sbin/rarp /sbin/slattach /bin/ping /bin/ping6 /bin/traceroute /bin/traceroute6 /usr/sbin/arping /usr/sbin/clockdiff /usr/sbin/rarpd /usr/sbin/rdisc /usr/sbin/tftpd /usr/sbin/tracepath /usr/sbin/tracepath6 /sbin/route /usr/bin/dig /usr/bin/host /usr/bin/nslookup /usr/bin/nsupdate /usr/bin/telnet /usr/bin/ssh /usr/sbin/arpd /usr/sbin/ctstat /usr/sbin/genl /usr/sbin/ifstat /usr/sbin/ip /usr/sbin/lnstat /usr/sbin/nstat /usr/sbin/rtacct /usr/sbin/rtmon /usr/sbin/rtstat /usr/sbin/ss /usr/sbin/tc /usr/sbin/dhclient /usr/sbin/ifplugd /usr/sbin/ifplugstatus" + for i in $apps; do + add_binary "$i" + done + appfiles="/usr/sbin/ifcfg /usr/sbin/routef /usr/sbin/routel /usr/sbin/rtpr" + for i in $appfiles do + add_file "$i" + done add_file "/sbin/dhcpcd" add_file "/sbin/ifenslave" add_file "/usr/sbin/brctl" diff --git a/usr/lib/initcpio/install/arch_netcfg b/usr/lib/initcpio/install/arch_netcfg index f7d016f05..e73b1a0dc 100644 --- a/usr/lib/initcpio/install/arch_netcfg +++ b/usr/lib/initcpio/install/arch_netcfg @@ -1,11 +1,12 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="/usr/bin/netcfg-wpa_actiond /usr/bin/netcfg-wpa_actiond-action /usr/bin/netcfg-menu /usr/bin/netcfg-daemon /usr/bin/wifi-menu /usr/bin/netcfg" - FILES="" - SCRIPT="" + apps="/usr/bin/netcfg-wpa_actiond /usr/bin/netcfg-wpa_actiond-action /usr/bin/netcfg-menu /usr/bin/netcfg-daemon /usr/bin/wifi-menu /usr/bin/netcfg" + for i in $apps; do + add_binary "$i" + done add_full_dir "/usr/lib/network/" add_dir "/var/run/network/interfaces" add_dir "/var/run/network/profiles" diff --git a/usr/lib/initcpio/install/arch_nmap b/usr/lib/initcpio/install/arch_nmap index 4f60002c2..6aaab9368 100644 --- a/usr/lib/initcpio/install/arch_nmap +++ b/usr/lib/initcpio/install/arch_nmap @@ -1,11 +1,12 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="/usr/bin/nmap /usr/bin/ncat /usr/bin/ndiff /usr/bin/nping" - FILES="" - SCRIPT="" + apps="/usr/bin/nmap /usr/bin/ncat /usr/bin/ndiff /usr/bin/nping" + for i in $apps; do + add_binary "$i" + done add_full_dir "/usr/share/nmap" add_file "/usr/share/licenses/nmap/LICENSE" } diff --git a/usr/lib/initcpio/install/arch_openconnect b/usr/lib/initcpio/install/arch_openconnect index a50ae65d4..cc51e7fc0 100644 --- a/usr/lib/initcpio/install/arch_openconnect +++ b/usr/lib/initcpio/install/arch_openconnect @@ -1,11 +1,9 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="/usr/sbin/openconnect" - FILES="" - SCRIPT="" + add_binary "/usr/sbin/openconnect" } help () diff --git a/usr/lib/initcpio/install/arch_openvpn b/usr/lib/initcpio/install/arch_openvpn index 22cb90660..4b6a150d1 100644 --- a/usr/lib/initcpio/install/arch_openvpn +++ b/usr/lib/initcpio/install/arch_openvpn @@ -1,11 +1,9 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="/usr/sbin/openvpn" - FILES="" - SCRIPT="" + add_binary "/usr/sbin/openvpn" add_dir "/etc/openvpn" add_file "/etc/rc.d/openvpn" add_file "/etc/rc.d/openvpn-tapdev" diff --git a/usr/lib/initcpio/install/arch_pacman b/usr/lib/initcpio/install/arch_pacman index 7cf8280dc..f20ed7f21 100644 --- a/usr/lib/initcpio/install/arch_pacman +++ b/usr/lib/initcpio/install/arch_pacman @@ -1,12 +1,12 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="/usr/bin/pacman /usr/bin/pacman-db-upgrade /usr/bin/pacman-key /usr/bin/pacsort /usr/bin/pactree /usr/bin/cleanupdelta /usr/bin/makepkg /usr/bin/pacman-optimize /usr/bin/pkgdelta /usr/bin/rankmirrors /usr/bin/repo-add /usr/bin/repo-elephant /usr/bin/repo-remove /usr/bin/testdb /usr/bin/testpkg /usr/bin/vercmp /usr/bin/curl" - FILES="" - SCRIPT="" - + apps="/usr/bin/pacman /usr/bin/pacman-db-upgrade /usr/bin/pacman-key /usr/bin/pacsort /usr/bin/pactree /usr/bin/cleanupdelta /usr/bin/makepkg /usr/bin/pacman-optimize /usr/bin/pkgdelta /usr/bin/rankmirrors /usr/bin/repo-add /usr/bin/repo-elephant /usr/bin/repo-remove /usr/bin/testdb /usr/bin/testpkg /usr/bin/vercmp /usr/bin/curl" + for i in $apps; do + add_binary "$i" + done DEPENDS="initscripts wget bash coreutils cryptsetup dialog \ e2fsprogs findutils gawk grep iputils jfsutils less lvm2 mdadm kmod nano \ ncurses net-tools gnu-netcat ntfsprogs pcmciautils procps-ng psmisc reiserfsprogs sed snarf \ @@ -26,7 +26,8 @@ btrfs-progs nilfs-utils linux-firmware ipw2100-fw ipw2200-fw iana-etc chntpw lib grub2-common grub2-bios grub2-efi-x86_64 efibootmgr file eject keyutils yp-tools \ curl smartmontools dnsmasq lftp openconnect libxml2 libproxy speedtouch tcpdump nmap lua weechat \ gnutls nettle libtasn1 bind rpcbind expat progsreiserfs glib2 freetype2 libssh2 libedit \ -talloc eventlog idnkit libjpeg-turbo pth gnupg libksba libassuan pinentry dirmngr gpgme ldns dnssec-anchors" +talloc eventlog idnkit libjpeg-turbo pth gnupg libksba libassuan pinentry dirmngr gpgme ldns\ +dnssec-anchors hwids" for i in $DEPENDS; do diff --git a/usr/lib/initcpio/install/arch_pacman_lts b/usr/lib/initcpio/install/arch_pacman_lts index fff80108f..63ea8f217 100644 --- a/usr/lib/initcpio/install/arch_pacman_lts +++ b/usr/lib/initcpio/install/arch_pacman_lts @@ -1,11 +1,12 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="/usr/bin/pacman /usr/bin/pacman-db-upgrade /usr/bin/pacman-key /usr/bin/pacsort /usr/bin/pactree /usr/bin/cleanupdelta /usr/bin/makepkg /usr/bin/pacman-optimize /usr/bin/pkgdelta /usr/bin/rankmirrors /usr/bin/repo-add /usr/bin/repo-elephant /usr/bin/repo-remove /usr/bin/testdb /usr/bin/testpkg /usr/bin/vercmp /usr/bin/curl" - FILES="" - SCRIPT="" + apps="/usr/bin/pacman /usr/bin/pacman-db-upgrade /usr/bin/pacman-key /usr/bin/pacsort /usr/bin/pactree /usr/bin/cleanupdelta /usr/bin/makepkg /usr/bin/pacman-optimize /usr/bin/pkgdelta /usr/bin/rankmirrors /usr/bin/repo-add /usr/bin/repo-elephant /usr/bin/repo-remove /usr/bin/testdb /usr/bin/testpkg /usr/bin/vercmp /usr/bin/curl" + for i in $apps; do + add_binary "$i" + done DEPENDS="initscripts wget bash coreutils cryptsetup dialog \ e2fsprogs findutils gawk grep iputils jfsutils less lvm2 mdadm kmod nano \ @@ -26,7 +27,7 @@ nilfs-utils linux-firmware ipw2100-fw ipw2200-fw iana-etc chntpw libusb grub2-co grub2-efi-x86_64 efibootmgr file eject keyutils yp-tools smartmontools curl dnsmasq \ lftp openconnect libproxy libxml2 speedtouch tcpdump nmap lua weechat gnutls nettle libtasn1 bind rpcbind \ expat progsreiserfs glib2 freetype2 libssh2 libedit talloc eventlog idnkit libjpeg-turbo \ -pth gnupg libksba libassuan pinentry dirmngr gpgme ldns dnssec-anchors" +pth gnupg libksba libassuan pinentry dirmngr gpgme ldns dnssec-anchors hwids" for i in $DEPENDS; do for k in $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do diff --git a/usr/lib/initcpio/install/arch_pam b/usr/lib/initcpio/install/arch_pam index f27bd32a6..19e171924 100644 --- a/usr/lib/initcpio/install/arch_pam +++ b/usr/lib/initcpio/install/arch_pam @@ -1,11 +1,10 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="/sbin/pam_tally /sbin/unix_chkpwd" - FILES="" - SCRIPT="" + add_binary "/sbin/pam_tally" + add_binary "/sbin/unix_chkpwd" for i in $(echo /usr/share/archboot/pam/etc/*/*); do add_file "$i" "$(echo $i | sed -e 's|/usr/share/archboot/pam/etc|/etc|g')" done diff --git a/usr/lib/initcpio/install/arch_pciutils b/usr/lib/initcpio/install/arch_pciutils index fb80141f5..1ef54c9db 100644 --- a/usr/lib/initcpio/install/arch_pciutils +++ b/usr/lib/initcpio/install/arch_pciutils @@ -1,11 +1,10 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="/usr/sbin/lspci /usr/sbin/setpci" - FILES="/usr/sbin/update-pciids" - SCRIPT="" + add_binary "/usr/sbin/lspci" + add_binary "/usr/sbin/setpci" add_file "/usr/share/hwdata/pci.ids" }