diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2022-05-04 22:29:54 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-05-07 00:25:58 -0400 |
commit | 5a9a08c94ec980178c93449bf8ce830af775a3ac (patch) | |
tree | 3560752399b280e866293e064a34946237e05a7e /configs | |
parent | a7eda8a0711ea2c436740d51706cb33a0edbf870 (diff) |
bugfix build.sh - expand EFI image
Diffstat (limited to 'configs')
-rwxr-xr-x | configs/profile/build.sh | 7 | ||||
-rwxr-xr-x | configs/profile/rebuild.sh | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh index cd42d30..4d8e787 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -4,7 +4,7 @@ set -e -u # misc constants readonly ALL_ARCHES='i686 x86_64' -readonly EFI_IMG_KBYTES=40000 +readonly EFI_IMG_KBYTES=80000 readonly LOG_COLOR='\033[01;34m' readonly ERR_COLOR='\033[00;31m' readonly END_COLOR='\033[00m' @@ -320,10 +320,11 @@ make_efiboot() { # create EFI image mkdir -p ${work_dir}/iso/EFI/parabolaiso truncate -s ${EFI_IMG_KBYTES}K ${work_dir}/iso/EFI/parabolaiso/efiboot.img - mkfs.vfat -n PARABOLAISO_EFI ${work_dir}/iso/EFI/parabolaiso/efiboot.img + mkfs.vfat -n PARABOLAEFI ${work_dir}/iso/EFI/parabolaiso/efiboot.img mkdir -p ${work_dir}/efiboot mkdir -p ${work_dir}/efiboot-staging + modprobe loop mount ${work_dir}/iso/EFI/parabolaiso/efiboot.img ${work_dir}/efiboot mkdir -p ${work_dir}/efiboot-staging/EFI/parabolaiso @@ -494,7 +495,7 @@ if ! (($is_done)); then LOG_STEP ${launch_msg}; else LOG_STEP "Nothing to do"; e # prepare environment chown -R 0:0 "${releng_dir}/root-image/" -mkdir -p ${work_dir} +mkdir -p "$(realpath ${work_dir})" # allow symlink # prepare target filesystems for arch in ${archs}; do diff --git a/configs/profile/rebuild.sh b/configs/profile/rebuild.sh index c8c791d..6f96052 100755 --- a/configs/profile/rebuild.sh +++ b/configs/profile/rebuild.sh @@ -51,8 +51,9 @@ done if [ "$MODE" == 'wipe' ] then if [ "$PRESERVE_CACHE" == 'true' ] then for arch in i686 x86_64 - do isorepo=./work/${arch}/root-image/isorepo - cache_dir=./work/isorepo-${arch} + do isorepo=$(realpath ./work)/${arch}/root-image/isorepo + cache_dir=$(realpath ./work)/isorepo-${arch} + mkdir -p $cache_dir [ -d $isorepo ] && mv $isorepo/* $cache_dir/ 2> /dev/null done @@ -61,8 +62,9 @@ then if [ "$PRESERVE_CACHE" == 'true' ] rm -rf ./work/${arch} 2> /dev/null for arch in i686 x86_64 - do isorepo=./work/${arch}/root-image/isorepo - cache_dir=./work/isorepo-${arch} + do isorepo=$(realpath ./work)/${arch}/root-image/isorepo + cache_dir=$(realpath ./work)/isorepo-${arch} + if [ "$PRESERVE_CACHE" == 'true' ] then if [ "$TARGET" == 'dual' -o "$TARGET" == "${arch}" ] then mkdir -p $isorepo |