diff options
Diffstat (limited to 'adelie-build-cd')
| -rwxr-xr-x | adelie-build-cd | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/adelie-build-cd b/adelie-build-cd index 465bd02..ee09405 100755 --- a/adelie-build-cd +++ b/adelie-build-cd @@ -1,7 +1,7 @@ #!/bin/sh -e def_arch=$(uname -m) -def_ver="1.0-beta4" +def_ver="1.0" declare -r PROGNAME=$(basename $0) @@ -143,9 +143,9 @@ clean_dirs() { install_pkgs() { header "Installing base system to squash root..." - declare -r PACKAGES=$(cat packages 2>/dev/null || fatal 'No core packages specified') - declare -r ARCH_PKGS=$(cat packages-$ARCH 2>/dev/null || echo '') - declare -r KIND_PKGS=$(cat packages-$KIND 2>/dev/null || echo '') + declare -r PACKAGES=$(cat packages/base 2>/dev/null || fatal 'No core packages specified') + declare -r ARCH_PKGS=$(cat packages/arch/$ARCH 2>/dev/null || echo '') + declare -r KIND_PKGS=$(cat packages/kind/$KIND 2>/dev/null || echo '') mkdir -p squashroot-$ARCH/etc/apk/keys cp 'packages@adelielinux.org.pub' squashroot-$ARCH/etc/apk/keys/ @@ -183,12 +183,11 @@ make_structure() { squashroot-$ARCH/etc/runlevels/boot/$bootservice done - if [ -f services-$KIND ]; then - for service in $(cat services-$KIND 2>/dev/null || echo ''); do - ln -s /etc/init.d/$service \ - sqaushroot-$ARCH/etc/runlevels/default/$service - done - fi + for service in $(cat services/base 2>/dev/null || echo '') + $(cat services/kind/$KIND 2>/dev/null || echo ''); do + ln -s /etc/init.d/$service \ + sqaushroot-$ARCH/etc/runlevels/default/$service + done cat >squashroot-$ARCH/etc/fstab <<- FSTAB # Welcome to Adélie Linux. @@ -308,9 +307,14 @@ make_initrd() { } prepare_cdroot() { - if test -f post-$ARCH.sh; then + if test -f post/arch/$ARCH.sh; then header 'Running architecture-specific scripts...' - sh post-$ARCH.sh + sh post/arch/$ARCH.sh + fi + + if test -f post/kind/$KIND.sh; then + header "Running $KIND script..." + sh post/kind/$KIND.sh fi header 'Adding kernel...' |