From 380e5b78e6e6d286960086be2e48d9e6987789cf Mon Sep 17 00:00:00 2001 From: Dennis ten Hoove Date: Tue, 19 Mar 2024 08:12:41 +0100 Subject: [PATCH] Only cleanup and ro var if actually deployed --- arkdep | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arkdep b/arkdep index 48c4787..73d9fb3 100755 --- a/arkdep +++ b/arkdep @@ -745,18 +745,17 @@ deploy () { btrfs receive -f $arkdep_dir/cache/${data[0]}-var.img $arkdep_dir/shared/ || cleanup_and_quit 'Failed to receive var' + + # Make var writable + btrfs property set -f -ts $arkdep_dir/shared/var ro false || + cleanup_and_quit 'Failed to unlock var' + + # Cleanup var image + rm $arkdep_dir/cache/${data[0]}-var.img else # Notify if var is not deployed printf "\e[1;33m\e[0m\e[1m var is already preset, skipping var deployment\e[0m\n" fi - - # Make var writable - btrfs property set -f -ts $arkdep_dir/shared/var ro false || - cleanup_and_quit 'Failed to unlock var' - - # Cleanup var image - rm $arkdep_dir/cache/${data[0]}-var.img - # Add overlay if enabled if [[ $enable_overlay -eq 1 ]]; then