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

[arkdep] Implement autolayer on deploy

Browse source
This commit is contained in:
Dennis ten Hoove 2025-01-19 23:59:58 +01:00
parent e5134bebce
commit 85e9487a8f
No known key found for this signature in database
GPG key ID: 2BA91DC2563B83D1
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
arkdep
View file

@ -1079,10 +1079,6 @@ deploy () {
btrfs property set -f -ts $arkdep_dir/deployments/${data[0]}/rootfs/var ro false || btrfs property set -f -ts $arkdep_dir/deployments/${data[0]}/rootfs/var ro false ||
cleanup_and_quit 'Failed to unlock var' cleanup_and_quit 'Failed to unlock var'
# Lock the root volume again
btrfs property set -f -ts $arkdep_dir/deployments/${data[0]}/rootfs ro true ||
cleanup_and_quit 'Failed to lock root'
# Add overlay if enabled # Add overlay if enabled
if [[ $enable_overlay -eq 1 ]]; then if [[ $enable_overlay -eq 1 ]]; then
# If backup_user_accounts is enabled automatically perform a backup, do not run if custom root is defined # If backup_user_accounts is enabled automatically perform a backup, do not run if custom root is defined
@ -1107,29 +1103,25 @@ deploy () {
chmod 600 $arkdep_dir/overlay/etc/shadow chmod 600 $arkdep_dir/overlay/etc/shadow
fi fi
printf '\e[1;34m-->\e[0m\e[1m Copying overlay to deployment\e[0m\n' printf '\e[1;34m-->\e[0m\e[1m Copying overlay to deployment\e[0m\n'
declare -r overlay_files=($(ls $arkdep_dir/overlay/))
# Check if only /etc is present, if it is we do not have to unlock the root volume
for file in ${overlay_files[*]}; do
if [[ $file != 'etc' ]]; then
printf "\e[1;33m<!>\e[0m\e[1m Non /etc file or directory detected, root will be temporarily unlocked\e[0m\n"
overlay_unlock_root=1
fi
done
# Unlock root if required
if [[ $overlay_unlock_root -eq 1 ]]; then
btrfs property set -f -ts $arkdep_dir/deployments/${data[0]}/rootfs ro false
fi
cp -rv $arkdep_dir/overlay/* $arkdep_dir/deployments/${data[0]}/rootfs/ cp -rv $arkdep_dir/overlay/* $arkdep_dir/deployments/${data[0]}/rootfs/
fi
# Lock root again if required # Layer addition packages if defined
if [[ $overlay_unlock_root -eq 1 ]]; then declare -r layer_list=($(cat $arkdep_dir/layer))
btrfs property set -f -ts $arkdep_dir/deployments/${data[0]}/rootfs ro true
fi if [[ ${#layer_list[@]} -ne 0 ]]; then
printf '\e[1;34m-->\e[0m\e[1m Layering additional packages\e[0m\n'
# Bind mind, otherwise arch-chroot complains
mount --bind $arkdep_dir/deployments/${data[0]}/rootfs $arkdep_dir/deployments/${data[0]}/rootfs
# Install the layer packages
arch-chroot $arkdep_dir/deployments/${data[0]}/rootfs pacman -S --noconfirm ${layer_list[@]} ||
printf "\e[1;33m<!>\e[0m\e[1m Error during package installation, validate your package layer configuration\e[0m\n"
# Unmount the installation target again
unmount $arkdep_dir/deployments/${data[0]}/rootfs
fi fi
# Migrate specified files and directories # Migrate specified files and directories
@ -1142,6 +1134,11 @@ deploy () {
done done
fi fi
printf '\e[1;34m-->\e[0m\e[1m Locking new root partition\e[0m\n'
# Lock the root volume again
btrfs property set -f -ts $arkdep_dir/deployments/${data[0]}/rootfs ro true ||
cleanup_and_quit 'Failed to lock root'
printf '\e[1;34m-->\e[0m\e[1m Installing kernel image to boot\e[0m\n' printf '\e[1;34m-->\e[0m\e[1m Installing kernel image to boot\e[0m\n'
# Get list of all available kernels # Get list of all available kernels
kernels_installed=($(ls $arkdep_dir/deployments/${data[0]}/rootfs/usr/lib/modules/)) kernels_installed=($(ls $arkdep_dir/deployments/${data[0]}/rootfs/usr/lib/modules/))