root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

more mkinitcpio 0.9.0 fixes

Browse source
This commit is contained in:
Tobias Powalowski 2012-05-27 12:04:03 +02:00
parent 5cea4ec405
commit a94cba86d2
12 changed files with 48 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/lib/initcpio/install/arch_memtest
View file

@ -1,10 +1,8 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()
{ {
BINARIES=""
FILES=""
SCRIPT=""
[ ${RUNPROGRAM} = "mkisolinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest" [ ${RUNPROGRAM} = "mkisolinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"
[ ${RUNPROGRAM} = "archboot-tarball-helper.sh" ] && 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" [ ${RUNPROGRAM} = "mksyslinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"

8
usr/lib/initcpio/install/arch_mmc
View file

@ -1,13 +1,9 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()
{ {
MODULES=" $(checked_modules "/mmc/") " add_checked_modules '/mmc/'
MODULES=$(echo ${MODULES}) #trim whitespace
BINARIES=""
FILES=""
SCRIPT=""
} }
help () help ()

1
usr/lib/initcpio/install/arch_motd
View file

@ -1,3 +1,4 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()

16
usr/lib/initcpio/install/arch_net
View file

@ -1,16 +1,22 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()
{ {
MODULES=" $(checked_modules "/drivers/net/" | grep -ve "wireless") " add_checked_modules -f 'wireless' '/drivers/net/'
# add staging modules # add staging modules
STAGING="et131x" STAGING="et131x"
for i in $STAGING; do for i in $STAGING; do
MODULES="$MODULES $(checked_modules "/drivers/staging/$i")" add_checked_modules "/drivers/staging/$i"
done
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 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=""
add_file "/sbin/dhcpcd" add_file "/sbin/dhcpcd"
add_file "/sbin/ifenslave" add_file "/sbin/ifenslave"
add_file "/usr/sbin/brctl" add_file "/usr/sbin/brctl"

9
usr/lib/initcpio/install/arch_netcfg
View file

@ -1,11 +1,12 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()
{ {
MODULES="" 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"
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" for i in $apps; do
FILES="" add_binary "$i"
SCRIPT="" done
add_full_dir "/usr/lib/network/" add_full_dir "/usr/lib/network/"
add_dir "/var/run/network/interfaces" add_dir "/var/run/network/interfaces"
add_dir "/var/run/network/profiles" add_dir "/var/run/network/profiles"

9
usr/lib/initcpio/install/arch_nmap
View file

@ -1,11 +1,12 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()
{ {
MODULES="" apps="/usr/bin/nmap /usr/bin/ncat /usr/bin/ndiff /usr/bin/nping"
BINARIES="/usr/bin/nmap /usr/bin/ncat /usr/bin/ndiff /usr/bin/nping" for i in $apps; do
FILES="" add_binary "$i"
SCRIPT="" done
add_full_dir "/usr/share/nmap" add_full_dir "/usr/share/nmap"
add_file "/usr/share/licenses/nmap/LICENSE" add_file "/usr/share/licenses/nmap/LICENSE"
} }

6
usr/lib/initcpio/install/arch_openconnect
View file

@ -1,11 +1,9 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()
{ {
MODULES="" add_binary "/usr/sbin/openconnect"
BINARIES="/usr/sbin/openconnect"
FILES=""
SCRIPT=""
} }
help () help ()

6
usr/lib/initcpio/install/arch_openvpn
View file

@ -1,11 +1,9 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()
{ {
MODULES="" add_binary "/usr/sbin/openvpn"
BINARIES="/usr/sbin/openvpn"
FILES=""
SCRIPT=""
add_dir "/etc/openvpn" add_dir "/etc/openvpn"
add_file "/etc/rc.d/openvpn" add_file "/etc/rc.d/openvpn"
add_file "/etc/rc.d/openvpn-tapdev" add_file "/etc/rc.d/openvpn-tapdev"

13
usr/lib/initcpio/install/arch_pacman
View file

@ -1,12 +1,12 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()
{ {
MODULES="" 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"
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" for i in $apps; do
FILES="" add_binary "$i"
SCRIPT="" done
DEPENDS="initscripts wget bash coreutils cryptsetup dialog \ DEPENDS="initscripts wget bash coreutils cryptsetup dialog \
e2fsprogs findutils gawk grep iputils jfsutils less lvm2 mdadm kmod nano \ e2fsprogs findutils gawk grep iputils jfsutils less lvm2 mdadm kmod nano \
ncurses net-tools gnu-netcat ntfsprogs pcmciautils procps-ng psmisc reiserfsprogs sed snarf \ 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 \ 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 \ curl smartmontools dnsmasq lftp openconnect libxml2 libproxy speedtouch tcpdump nmap lua weechat \
gnutls nettle libtasn1 bind rpcbind expat progsreiserfs glib2 freetype2 libssh2 libedit \ 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 for i in $DEPENDS; do

11
usr/lib/initcpio/install/arch_pacman_lts
View file

@ -1,11 +1,12 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()
{ {
MODULES="" 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"
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" for i in $apps; do
FILES="" add_binary "$i"
SCRIPT="" done
DEPENDS="initscripts wget bash coreutils cryptsetup dialog \ DEPENDS="initscripts wget bash coreutils cryptsetup dialog \
e2fsprogs findutils gawk grep iputils jfsutils less lvm2 mdadm kmod nano \ 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 \ 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 \ 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 \ 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 i in $DEPENDS; do
for k in $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do for k in $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do

7
usr/lib/initcpio/install/arch_pam
View file

@ -1,11 +1,10 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()
{ {
MODULES="" add_binary "/sbin/pam_tally"
BINARIES="/sbin/pam_tally /sbin/unix_chkpwd" add_binary "/sbin/unix_chkpwd"
FILES=""
SCRIPT=""
for i in $(echo /usr/share/archboot/pam/etc/*/*); do 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')" add_file "$i" "$(echo $i | sed -e 's|/usr/share/archboot/pam/etc|/etc|g')"
done done

7
usr/lib/initcpio/install/arch_pciutils
View file

@ -1,11 +1,10 @@
#!/bin/bash
# Created by Tobias Powalowski <tpowa@archlinux.org> # Created by Tobias Powalowski <tpowa@archlinux.org>
build () build ()
{ {
MODULES="" add_binary "/usr/sbin/lspci"
BINARIES="/usr/sbin/lspci /usr/sbin/setpci" add_binary "/usr/sbin/setpci"
FILES="/usr/sbin/update-pciids"
SCRIPT=""
add_file "/usr/share/hwdata/pci.ids" add_file "/usr/share/hwdata/pci.ids"
} }