apadana/arkdep
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup

Browse source
This commit is contained in:
Dennis ten Hoove 2024-05-02 08:23:16 +02:00
parent 1478019cc6
commit 15bb611ee8
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arkdep-build
View file

@ -156,8 +156,6 @@ if [[ $type == 'archlinux' ]]; then
btrfs subvolume create $workdir/etc || cleanup_and_quit "Failed to create btrfs subvolume $workdir/etc)" btrfs subvolume create $workdir/etc || cleanup_and_quit "Failed to create btrfs subvolume $workdir/etc)"
btrfs subvolume create $workdir/var || cleanup_and_quit "Failed to create btrfs subvolume $workdir/var)" btrfs subvolume create $workdir/var || cleanup_and_quit "Failed to create btrfs subvolume $workdir/var)"
printf "\e[1;34m-->\e[0m\e[1m Mounting $build_image at $workdir\e[0m\n"
# Read base package list and install base system # Read base package list and install base system
readarray bootstrap_packages < $variantdir/bootstrap.list readarray bootstrap_packages < $variantdir/bootstrap.list
printf '\e[1;34m-->\e[0m\e[1m Installing base packages\e[0m\n' printf '\e[1;34m-->\e[0m\e[1m Installing base packages\e[0m\n'
@ -166,7 +164,7 @@ if [[ $type == 'archlinux' ]]; then
pacstrap -c -C $variantdir/pacman.conf $workdir ${bootstrap_packages[*]} || cleanup_and_quit 'Failed to install secondary package list' pacstrap -c -C $variantdir/pacman.conf $workdir ${bootstrap_packages[*]} || cleanup_and_quit 'Failed to install secondary package list'
cp -v $variantdir/pacman.conf $workdir/etc/pacman.conf cp -v $variantdir/pacman.conf $workdir/etc/pacman.conf
else else
pacstrap -c $workdir ${bootstrap_packages[*]} || cleanup_and_quit 'Failed to install secondary package list' pacstrap -c $workdir ${bootstrap_packages[*]} || cleanup_and_quit 'Failed to bootstrap system'
fi fi
# If overlay directory exists in variant copy it's contents to the temporary subvolume # If overlay directory exists in variant copy it's contents to the temporary subvolume
@ -190,7 +188,7 @@ if [[ $type == 'archlinux' ]]; then
# Read package list and install # Read package list and install
readarray packages < $variantdir/package.list readarray packages < $variantdir/package.list
arch-chroot $workdir pacman -S --noconfirm ${packages[*]} || cleanup_and_quit 'Failed to install base packages' arch-chroot $workdir pacman -S --noconfirm ${packages[*]} || cleanup_and_quit 'Failed to install packages'
# Unmount pacman cache # Unmount pacman cache
umount -l $workdir/var/cache/pacman/pkg umount -l $workdir/var/cache/pacman/pkg