On 05/19/2012 02:35 AM, Gerardo Exequiel Pozzi wrote:

Signed-off-by: Gerardo Exequiel Pozzi --- archiso/install/archiso | 7 +++++-- archiso/install/archiso_kms | 16 ++++++++++++++-- archiso/install/archiso_loop_mnt | 2 +- archiso/install/archiso_pxe_common | 8 ++------ archiso/install/archiso_pxe_http | 2 +- archiso/install/archiso_pxe_nbd | 5 +++-- archiso/install/archiso_pxe_nfs | 5 +++-- archiso/install/archiso_shutdown | 2 +- 8 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/archiso/install/archiso b/archiso/install/archiso index c36c001..8893667 100644 --- a/archiso/install/archiso +++ b/archiso/install/archiso @@ -1,8 +1,11 @@ #!/bin/bash

build() { - MODULES="cdrom loop dm-snapshot" - SCRIPT="archiso" + add_module "cdrom" + add_module "loop" + add_module "dm-snapshot" + + add_runscript

add_binary /usr/lib/udev/cdrom_id add_binary blockdev diff --git a/archiso/install/archiso_kms b/archiso/install/archiso_kms index 6566049..3ff31f3 100644 --- a/archiso/install/archiso_kms +++ b/archiso/install/archiso_kms @@ -1,9 +1,21 @@ #!/bin/bash

build() { - MODULES="radeon nouveau i915 via-agp sis-agp intel-agp" + add_module "radeon" + add_module "nouveau" + add_module "i915" + add_module "via-agp" + add_module "sis-agp" + add_module "intel-agp" + if [[ $(uname -m) == i686 ]]; then - MODULES+=" amd64-agp ati-agp sworks-agp ali-agp amd-k7-agp nvidia-agp efficeon-agp" + add_module "amd64-agp" + add_module "ati-agp" + add_module "sworks-agp" + add_module "ali-agp" + add_module "amd-k7-agp" + add_module "nvidia-agp" + add_module "efficeon-agp" fi }

diff --git a/archiso/install/archiso_loop_mnt b/archiso/install/archiso_loop_mnt index 4141043..59f1d94 100644 --- a/archiso/install/archiso_loop_mnt +++ b/archiso/install/archiso_loop_mnt @@ -1,7 +1,7 @@ #!/bin/bash

build() { - SCRIPT="archiso_loop_mnt" + add_runscript }

help() { diff --git a/archiso/install/archiso_pxe_common b/archiso/install/archiso_pxe_common index 2e3eec5..77d0bb6 100644 --- a/archiso/install/archiso_pxe_common +++ b/archiso/install/archiso_pxe_common @@ -1,13 +1,9 @@ #!/bin/bash

build() { - MODULES="${MODULES} $(comm -2 -3<(checked_modules "/drivers/net/" | sort) \ -<(find $MODULEDIR/kernel/drivers/net/{irda,phy,wimax,wireless} \ - -name '*.ko*' \ - -exec bash -c 'printf "%s\n" "${@%%.ko*}" | sed "s@.*/@@;s@-@_@" | sort' _ {} +) \ - | grep -v -e 'ppp_' -e 'plip' -e 'pppoe')" - SCRIPT="archiso_pxe_common" + add_checked_modules -f "(irda|phy|wimax|wireless|ppp_|plip|pppoe)" "/drivers/net/"

+ add_runscript

add_binary /usr/lib/initcpio/ipconfig /bin/ipconfig

diff --git a/archiso/install/archiso_pxe_http b/archiso/install/archiso_pxe_http index 9e2ff65..4e02f98 100644 --- a/archiso/install/archiso_pxe_http +++ b/archiso/install/archiso_pxe_http @@ -1,7 +1,7 @@ #!/bin/bash

build() { - SCRIPT="archiso_pxe_http" + add_runscript

add_binary curl } diff --git a/archiso/install/archiso_pxe_nbd b/archiso/install/archiso_pxe_nbd index 1ee3910..8d9552a 100644 --- a/archiso/install/archiso_pxe_nbd +++ b/archiso/install/archiso_pxe_nbd @@ -1,8 +1,9 @@ #!/bin/bash

build() { - MODULES="nbd" - SCRIPT="archiso_pxe_nbd" + add_module "nbd" + + add_runscript

add_binary nbd-client

diff --git a/archiso/install/archiso_pxe_nfs b/archiso/install/archiso_pxe_nfs index f210cd3..f8226e5 100644 --- a/archiso/install/archiso_pxe_nfs +++ b/archiso/install/archiso_pxe_nfs @@ -1,8 +1,9 @@ #!/bin/bash

build() { - MODULES="nfs" - SCRIPT="archiso_pxe_nfs" + add_module "nfs" + + add_runscript

add_binary /usr/lib/initcpio/nfsmount /bin/nfsmount } diff --git a/archiso/install/archiso_shutdown b/archiso/install/archiso_shutdown index 87b8297..962be95 100644 --- a/archiso/install/archiso_shutdown +++ b/archiso/install/archiso_shutdown @@ -1,7 +1,7 @@ #!/bin/bash

build() { - SCRIPT="archiso_shutdown" + add_runscript

add_file /usr/lib/initcpio/archiso_shutdown /shutdown }

This is now in testing branch [#1], so it can be using with [testing] repo enabled ;) [#1] https://projects.archlinux.org/archiso.git/log/?h=testing -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1