From cb65f58e2ecf5f59722242a67b274c86e1a7c856 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sat, 26 May 2012 11:50:43 +0200 Subject: [PATCH] start migration to mkinitcpio-0.9.0 --- usr/lib/initcpio/install/arch_acpi | 7 ++----- usr/lib/initcpio/install/arch_addons | 6 ++---- usr/lib/initcpio/install/arch_advanced_root | 6 ++---- usr/lib/initcpio/install/arch_base | 15 +++++++++++---- usr/lib/initcpio/install/arch_bootmessage | 1 + .../initcpio/install/arch_bootmessage_allinone | 1 + usr/lib/initcpio/install/arch_cdrom | 6 ++---- usr/lib/initcpio/install/arch_chntpw | 9 +++++---- 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/usr/lib/initcpio/install/arch_acpi b/usr/lib/initcpio/install/arch_acpi index 61dc59fed..290dd821e 100644 --- a/usr/lib/initcpio/install/arch_acpi +++ b/usr/lib/initcpio/install/arch_acpi @@ -1,12 +1,9 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES=" $(checked_modules "/acpi/")" - - BINARIES="" - FILES="" - SCRIPT="" + add_checked_modules '/acpi/' } help () diff --git a/usr/lib/initcpio/install/arch_addons b/usr/lib/initcpio/install/arch_addons index 295c21eca..deed46f5a 100644 --- a/usr/lib/initcpio/install/arch_addons +++ b/usr/lib/initcpio/install/arch_addons @@ -1,15 +1,13 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="" - FILES="" - SCRIPT="arch_addons" ! [ -d ${TEMPDIR}/packages ] && mkdir ${TEMPDIR}/packages ! [ -d ${TEMPDIR}/config ] && mkdir ${TEMPDIR}/config cp -r /etc/archboot/packages/* ${TEMPDIR}/packages cp -r /etc/archboot/config/* ${TEMPDIR}/config + add_runscript } help () diff --git a/usr/lib/initcpio/install/arch_advanced_root b/usr/lib/initcpio/install/arch_advanced_root index 9af81ce66..45eeddd2c 100644 --- a/usr/lib/initcpio/install/arch_advanced_root +++ b/usr/lib/initcpio/install/arch_advanced_root @@ -1,11 +1,9 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="" - FILES="" - SCRIPT="arch_advanced_root" + add_runscript } help () diff --git a/usr/lib/initcpio/install/arch_base b/usr/lib/initcpio/install/arch_base index cd241a858..ded2fe0b3 100644 --- a/usr/lib/initcpio/install/arch_base +++ b/usr/lib/initcpio/install/arch_base @@ -1,11 +1,16 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - SCRIPT="arch_base" - BINARIES="/sbin/init /sbin/agetty /bin/mount /bin/umount /usr/bin/basename /bin/du /usr/bin/clear /usr/bin/env /usr/bin/head /usr/bin/id /usr/bin/md5sum /usr/bin/nano /usr/bin/nc /usr/bin/printf /usr/bin/tail /usr/bin/tee /usr/bin/test /usr/bin/tr /usr/bin/tty /usr/bin/uptime /usr/bin/w /usr/bin/who /usr/bin/wc /usr/bin/which /usr/bin/whoami /usr/bin/xargs /usr/bin/yes /usr/sbin/syslog-ng /usr/sbin/syslog-ng-ctl /usr/bin/loggen /usr/bin/pdbtool /bin/bash /sbin/swapon /usr/bin/uniq /usr/bin/cut /usr/bin/seq /usr/bin/snarf /usr/bin/find /usr/bin/sort /sbin/fdisk /sbin/sfdisk /sbin/cfdisk /usr/sbin/parted /usr/sbin/partprobe /usr/bin/gawk /bin/cp /bin/mv /sbin/shutdown /usr/bin/free /bin/ls /bin/rm /bin/sed /usr/bin/less /bin/chgrp /bin/chmod /bin/chown /bin/date /bin/df /usr/bin/dialog /bin/dmesg /usr/bin/egrep /usr/bin/fgrep /bin/grep /bin/hostname /bin/kill /usr/bin/killall /sbin/killall5 /bin/more /bin/ps /bin/pwd /bin/rmdir /bin/stty /bin/sync /bin/tar /usr/bin/bsdtar /usr/bin/bsdcpio /usr/bin/touch /bin/uname /usr/bin/vim /sbin/hdparm /bin/true /usr/bin/mktemp /usr/sbin/chroot /usr/bin/dirname /usr/bin/expr /bin/bzip2 /sbin/hwclock /bin/su /bin/cat /bin/cpio /bin/dd /bin/gzip /usr/bin/wget /usr/bin/top /usr/bin/sdparm /usr/bin/tput /sbin/ifconfig /bin/ln /sbin/losetup /bin/mkdir /usr/bin/mkfifo /bin/mknod /usr/bin/readlink /bin/echo /usr/bin/reset /sbin/swapoff /sbin/halt /sbin/telinit /usr/bin/awk /usr/bin/dir /sbin/reboot /sbin/poweroff /bin/pidof /usr/bin/nc /usr/bin/lzcat /usr/bin/lzma /usr/bin/lzmadec /usr/bin/unlzma /usr/bin/unxz /usr/bin/xz /usr/bin/xzcat /usr/bin/xzdec /sbin/switch_root /bin/false /sbin/pivot_root /usr/bin/sleep /sbin/chcpu /sbin/ctrlaltdel /sbin/raw /sbin/gdisk /sbin/sgdisk /sbin/cgdisk /sbin/fixparts /bin/findmnt /bin/lsblk /sbin/swaplabel /usr/bin/cal /usr/bin/chkdupexe /usr/bin/chrt /usr/bin/col /usr/bin/colcrt /usr/bin/colrm /usr/bin/column /usr/bin/cytune /usr/bin/fallocate /usr/bin/flock /usr/bin/getopt /usr/bin/hexdump /usr/bin/i386 /usr/bin/ionice /usr/bin/ipcmk /usr/bin/ipcrm /usr/bin/ipcs /usr/bin/isosize /usr/bin/linux32 /usr/bin/linux64 /usr/bin/logger /usr/bin/look /usr/bin/lscpu /usr/bin/mcookie /usr/bin/namei /usr/bin/pg /usr/bin/prlimit /usr/bin/rename /usr/bin/renice /usr/bin/rev /usr/bin/script /usr/bin/scriptreplay /usr/bin/setarch /usr/bin/setsid /usr/bin/setterm /usr/bin/tailf /usr/bin/taskset /usr/bin/ul /usr/bin/unshare /usr/bin/uuidgen /usr/bin/whereis /usr/bin/write /usr/sbin/addpart /usr/sbin/delpart /usr/sbin/fdformat /usr/sbin/ldattach /usr/sbin/partx /usr/sbin/readprofile /usr/sbin/rtcwake /usr/sbin/tunelp /usr/sbin/uuidd /sbin/sysctl /usr/bin/pgrep /usr/bin/pkill /usr/bin/pmap /usr/bin/pwdx /usr/bin/skill /usr/bin/slabtop /usr/bin/snice /usr/bin/tload /usr/bin/vmstat /usr/bin/watch /usr/bin/file /usr/bin/eject /usr/bin/volname /bin/keyctl /sbin/request-key /usr/bin/kmod" - FILES="/usr/lib/libkmod.so /usr/bin/lsmod /sbin/depmod /usr/bin/insmod /usr/bin/modinfo /sbin/modprobe /usr/bin/rmmod /usr/bin/update-patterndb /bin/gunzip /bin/zcat /usr/bin/lzcmp /usr/bin/lzdiff /usr/bin/lzegrep /usr/bin/lzfgrep /usr/bin/lzgrep /usr/bin/lzless /usr/bin/lzmore" - + apps="/sbin/init /sbin/agetty /bin/mount /bin/umount /usr/bin/basename /bin/du /usr/bin/clear /usr/bin/env /usr/bin/head /usr/bin/id /usr/bin/md5sum /usr/bin/nano /usr/bin/nc /usr/bin/printf /usr/bin/tail /usr/bin/tee /usr/bin/test /usr/bin/tr /usr/bin/tty /usr/bin/uptime /usr/bin/w /usr/bin/who /usr/bin/wc /usr/bin/which /usr/bin/whoami /usr/bin/xargs /usr/bin/yes /usr/sbin/syslog-ng /usr/sbin/syslog-ng-ctl /usr/bin/loggen /usr/bin/pdbtool /bin/bash /sbin/swapon /usr/bin/uniq /usr/bin/cut /usr/bin/seq /usr/bin/snarf /usr/bin/find /usr/bin/sort /sbin/fdisk /sbin/sfdisk /sbin/cfdisk /usr/sbin/parted /usr/sbin/partprobe /usr/bin/gawk /bin/cp /bin/mv /sbin/shutdown /usr/bin/free /bin/ls /bin/rm /bin/sed /usr/bin/less /bin/chgrp /bin/chmod /bin/chown /bin/date /bin/df /usr/bin/dialog /bin/dmesg /usr/bin/egrep /usr/bin/fgrep /bin/grep /bin/hostname /bin/kill /usr/bin/killall /sbin/killall5 /bin/more /bin/ps /bin/pwd /bin/rmdir /bin/stty /bin/sync /bin/tar /usr/bin/bsdtar /usr/bin/bsdcpio /usr/bin/touch /bin/uname /usr/bin/vim /sbin/hdparm /bin/true /usr/bin/mktemp /usr/sbin/chroot /usr/bin/dirname /usr/bin/expr /bin/bzip2 /sbin/hwclock /bin/su /bin/cat /bin/cpio /bin/dd /bin/gzip /usr/bin/wget /usr/bin/top /usr/bin/sdparm /usr/bin/tput /sbin/ifconfig /bin/ln /sbin/losetup /bin/mkdir /usr/bin/mkfifo /bin/mknod /usr/bin/readlink /bin/echo /usr/bin/reset /sbin/swapoff /sbin/halt /sbin/telinit /usr/bin/awk /usr/bin/dir /sbin/reboot /sbin/poweroff /bin/pidof /usr/bin/nc /usr/bin/lzcat /usr/bin/lzma /usr/bin/lzmadec /usr/bin/unlzma /usr/bin/unxz /usr/bin/xz /usr/bin/xzcat /usr/bin/xzdec /sbin/switch_root /bin/false /sbin/pivot_root /usr/bin/sleep /sbin/chcpu /sbin/ctrlaltdel /sbin/raw /sbin/gdisk /sbin/sgdisk /sbin/cgdisk /sbin/fixparts /bin/findmnt /bin/lsblk /sbin/swaplabel /usr/bin/cal /usr/bin/chkdupexe /usr/bin/chrt /usr/bin/col /usr/bin/colcrt /usr/bin/colrm /usr/bin/column /usr/bin/cytune /usr/bin/fallocate /usr/bin/flock /usr/bin/getopt /usr/bin/hexdump /usr/bin/i386 /usr/bin/ionice /usr/bin/ipcmk /usr/bin/ipcrm /usr/bin/ipcs /usr/bin/isosize /usr/bin/linux32 /usr/bin/linux64 /usr/bin/logger /usr/bin/look /usr/bin/lscpu /usr/bin/mcookie /usr/bin/namei /usr/bin/pg /usr/bin/prlimit /usr/bin/rename /usr/bin/renice /usr/bin/rev /usr/bin/script /usr/bin/scriptreplay /usr/bin/setarch /usr/bin/setsid /usr/bin/setterm /usr/bin/tailf /usr/bin/taskset /usr/bin/ul /usr/bin/unshare /usr/bin/uuidgen /usr/bin/whereis /usr/bin/write /usr/sbin/addpart /usr/sbin/delpart /usr/sbin/fdformat /usr/sbin/ldattach /usr/sbin/partx /usr/sbin/readprofile /usr/sbin/rtcwake /usr/sbin/tunelp /usr/sbin/uuidd /sbin/sysctl /usr/bin/pgrep /usr/bin/pkill /usr/bin/pmap /usr/bin/pwdx /usr/bin/skill /usr/bin/slabtop /usr/bin/snice /usr/bin/tload /usr/bin/vmstat /usr/bin/watch /usr/bin/file /usr/bin/eject /usr/bin/volname /bin/keyctl /sbin/request-key /usr/bin/kmod" + for i in $apps; do + add_binary "$i" + done + appfiles="/usr/lib/libkmod.so /usr/bin/lsmod /sbin/depmod /usr/bin/insmod /usr/bin/modinfo /sbin/modprobe /usr/bin/rmmod /usr/bin/update-patterndb /bin/gunzip /bin/zcat /usr/bin/lzcmp /usr/bin/lzdiff /usr/bin/lzegrep /usr/bin/lzfgrep /usr/bin/lzgrep /usr/bin/lzless /usr/bin/lzmore" + for i in $appfiles do + add_file "$i" + done ### setting up base structure add_dir "/mnt" add_dir "/media" @@ -74,6 +79,8 @@ build () add_file "/usr/share/licenses/vim/license.txt" add_file "/usr/share/licenses/zlib/LICENSE" add_file "/usr/share/licenses/iana-etc/LICENSE" + + add_runscript } help () diff --git a/usr/lib/initcpio/install/arch_bootmessage b/usr/lib/initcpio/install/arch_bootmessage index d0d22359c..70ad983be 100644 --- a/usr/lib/initcpio/install/arch_bootmessage +++ b/usr/lib/initcpio/install/arch_bootmessage @@ -1,3 +1,4 @@ +#!/bin/bash # Created by Tobias Powalowski build () diff --git a/usr/lib/initcpio/install/arch_bootmessage_allinone b/usr/lib/initcpio/install/arch_bootmessage_allinone index a7c7d1908..83192cad7 100644 --- a/usr/lib/initcpio/install/arch_bootmessage_allinone +++ b/usr/lib/initcpio/install/arch_bootmessage_allinone @@ -1,3 +1,4 @@ +#!/bin/bash # Created by Tobias Powalowski build () diff --git a/usr/lib/initcpio/install/arch_cdrom b/usr/lib/initcpio/install/arch_cdrom index c58a085ee..50f33670d 100644 --- a/usr/lib/initcpio/install/arch_cdrom +++ b/usr/lib/initcpio/install/arch_cdrom @@ -1,11 +1,9 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="sr_mod" - BINARIES="" - FILES="" - SCRIPT="" + add_module 'sr_mod' } help () diff --git a/usr/lib/initcpio/install/arch_chntpw b/usr/lib/initcpio/install/arch_chntpw index f68cc7a38..34a24e846 100644 --- a/usr/lib/initcpio/install/arch_chntpw +++ b/usr/lib/initcpio/install/arch_chntpw @@ -1,11 +1,12 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="/usr/bin/chntpw /usr/bin/reged /usr/bin/cpnt" - FILES="" - SCRIPT="" + apps="/usr/bin/chntpw /usr/bin/reged /usr/bin/cpnt" + for i in $apps; do + add_binary $i + done } help ()