diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2018-05-30 19:47:41 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-05-07 09:23:27 -0400 |
commit | 59bb10c2766ef9d9d25d38c4f880c26cc44ee92a (patch) | |
tree | 8c89a6fe03eff452705a081566863386961d608a /configs/profile/build.sh | |
parent | 1bc94e15dd1a11a4904cf7f39bdf7a25a51694d4 (diff) |
housekeeping
Diffstat (limited to 'configs/profile/build.sh')
-rwxr-xr-x | configs/profile/build.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh index 4752c64..eb668bd 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -184,6 +184,7 @@ make_packages() { # Copy mkinitcpio parabolaiso hooks and build initramfs (root-image) make_setup_mkinitcpio() { local _hook + for _hook in parabolaiso parabolaiso_shutdown parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_loop_mnt; do cp ${initcpio_dir}/hooks/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/hooks cp ${initcpio_dir}/install/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/install @@ -196,15 +197,13 @@ make_setup_mkinitcpio() { # Customize installation (root-image) make_customize_root_image() { - cp -af ${releng_dir}/root-image ${work_dir}/${arch} echo "Customizing root image" - arch="${arch}" \ - iso_title="${iso_title}" \ - iso_init="${iso_init}" \ - iso_gui="${iso_gui}" \ - enable_offline_install="${enable_offline_install}" \ + ISO_TITLE="${iso_title}" \ + ISO_INIT="${iso_init}" \ + ISO_GUI="${iso_gui}" \ + ENABLE_OFFLINE_INSTALL="${enable_offline_install}" \ setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} \ -C ${pacman_conf} \ -D ${iso_dirname} \ @@ -420,7 +419,7 @@ out_dir=${out_dir// /} pacman_conf=${pacman_conf// /} # validate build environment -if [[ "$(uname -m)" != 'x86_64' ]] || ! grep 'ID_LIKE=.*archlinux' /usr/lib/os-release > /dev/null; then +if [[ "$(uname -m)" != 'x86_64' ]] || ! grep 'ID_LIKE="*arch' /usr/lib/os-release > /dev/null; then LOG_ERROR "This script needs to be run on an x86_64 ArchLinux derrivative." exit 1 elif [[ ${EUID} -ne 0 ]]; then |