kreyren/parabola-vmbootstrap
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

fixing initcpio creation plus some minor cleanup

Browse Source
This commit is contained in:
Andreas Grapentin 2020-04-01 18:06:34 +02:00
parent 03a480a894
commit 301df3825b
No known key found for this signature in database
GPG Key ID: 7171986E4B745536
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pvmbootstrap.sh
View File

@ -48,7 +48,7 @@ readonly PVM_HOOKS_SUCCESS_MSG="[hooks.sh] pre-init hooks successful"
BasePkgSet=$DEF_PKG_SET BasePkgSet=$DEF_PKG_SET
MinRootMb=$DEF_MIN_MB MinRootMb=$DEF_MIN_MB
Hooks=() Hooks=()
Kernels=() Kernels=($DEF_KERNEL)
Mirror=$DEF_MIRROR Mirror=$DEF_MIRROR
IsNonsystemd=0 IsNonsystemd=0
Pkgs=(${DEF_PKGS[@]}) Pkgs=(${DEF_PKGS[@]})
@ -310,7 +310,9 @@ pvm_bootstrap() # assumes: $arch $imagefile $loopdev $workdir , traps: INT TERM
msg "regenerating initcpio for kernel: '${kernel}'" msg "regenerating initcpio for kernel: '${kernel}'"
sudo cp "$preset_file"{,.backup} || return "$EXIT_FAILURE" sudo cp "$preset_file"{,.backup} || return "$EXIT_FAILURE"
echo "$default_options" | sudo tee -a "$preset_file" > /dev/null || return "$EXIT_FAILURE" echo "$default_options" | sudo tee -a "$preset_file" > /dev/null || return "$EXIT_FAILURE"
sudo arch-chroot "$workdir" mkinitcpio -p ${kernel} || return "$EXIT_FAILURE" # regenerating the initcpio currently produces a benign error:
# https://bugs.archlinux.org/task/65725
sudo arch-chroot "$workdir" mkinitcpio -p ${kernel} #|| return "$EXIT_FAILURE"
sudo mv "$preset_file"{.backup,} || return "$EXIT_FAILURE" sudo mv "$preset_file"{.backup,} || return "$EXIT_FAILURE"
done done
@ -341,10 +343,12 @@ for kernel in ${Kernels[@]} ; do mkinitcpio -p \$kernel ; done ;
pacman -U --noconfirm /var/cache/pacman/pkg/ca-certificates-utils-*.pkg.tar.xz pacman -U --noconfirm /var/cache/pacman/pkg/ca-certificates-utils-*.pkg.tar.xz
# run the hooks # run the hooks
shopt -s nullglob
for hook in /root/hooks/*; do for hook in /root/hooks/*; do
echo "[hooks.sh] running hook: '\$(basename \$hook)'" echo "[hooks.sh] running hook: '\$(basename \$hook)'"
source "\$hook" || return source "\$hook"
done done
shopt -u nullglob
# clean up after yourself # clean up after yourself
systemctl disable preinit.service systemctl disable preinit.service
@ -449,7 +453,7 @@ main() # ( [cli_options] imagefile arch )
shift $shiftlen shift $shiftlen
local imagefile="$1" local imagefile="$1"
local arch="$2" local arch="$2"
(( $# != 2 )) && error "insufficient arguments" && usage >&2 && exit "$EXIT_INVALIDARGUMENT" (( $# < 2 )) && error "insufficient arguments" && usage >&2 && exit "$EXIT_INVALIDARGUMENT"
(( $RootSizeMb > 0 )) && \ (( $RootSizeMb > 0 )) && \
(( $RootSizeMb < $MinRootMb )) && warning "specified root FS size too small - ignoring OptPkgs" (( $RootSizeMb < $MinRootMb )) && warning "specified root FS size too small - ignoring OptPkgs"