Merge pull request #65 from NeroReflex/btrfs_scrub_default_disable

Do not perform btrfs scrub by default
ChimeraOS · Aug 13, 2024 · 2848793 · 2848793
2 parents d57b04c + da3a639
commit 2848793
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/__frzr-deploy b/__frzr-deploy
@@ -491,7 +491,7 @@ frzr_deploy() {
 			# verify the subvolume integrity
 			TASK_MSG="Checking integrity of deployed image"
 			send_data
-			if [ -z "$FRZR_SKIP_CHECK" ]; then
+			if [ ! -z "$FRZR_SCRUB" ]; then
 				if ! btrfs scrub start -Bdr "${SUBVOL}"; then
 					TASK_ERROR=1
 					TASK_ERROR_MSG="FS check on btrfs subvolume '$SUBVOL' failed: image integrity compromised"

diff --git a/test/test-deploy.sh b/test/test-deploy.sh
@@ -80,7 +80,6 @@ if btrfs send $MOUNT_POINT/archlinux | xz -e -9 --memory=95% -T0 > $TARGET_FILEN
 	export SKIP_UEFI_CHECK="yes"
 	export MOUNT_PATH="/tmp/frzr_root"
 	export EFI_MOUNT_PATH="/tmp/frzr_root/efi"
-	export FRZR_SKIP_CHECK="yes"
 	export SYSTEMD_RELAX_ESP_CHECKS=1
 
 	# deploy archlinux

diff --git a/test/test-install.sh b/test/test-install.sh
@@ -37,7 +37,6 @@ export SHOW_UI="0"
 export SKIP_UEFI_CHECK="yes"
 export MOUNT_PATH="/tmp/frzr_root"
 export EFI_MOUNT_PATH="/tmp/frzr_root/efi"
-export FRZR_SKIP_CHECK="yes"
 export SYSTEMD_RELAX_ESP_CHECKS=1
 
 # deploy chimeraos-45-1_9a95912

diff --git a/test/test-removal.sh b/test/test-removal.sh
@@ -37,7 +37,6 @@ export SHOW_UI="0"
 export SKIP_UEFI_CHECK="yes"
 export MOUNT_PATH="/tmp/frzr_root"
 export EFI_MOUNT_PATH="/tmp/frzr_root/efi"
-export FRZR_SKIP_CHECK="yes"
 export SYSTEMD_RELAX_ESP_CHECKS=1
 
 # deploy chimeraos-43_6978095