From da3a639a47f2a9079300210e9bd080df64eff4d7 Mon Sep 17 00:00:00 2001 From: Denis Benato Date: Sat, 3 Aug 2024 03:23:49 +0200 Subject: [PATCH] Do not perform btrfs scrub by default btrfs scrub takes too long: skip it to make the installation faster --- __frzr-deploy | 2 +- test/test-deploy.sh | 1 - test/test-install.sh | 1 - test/test-removal.sh | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/__frzr-deploy b/__frzr-deploy index d25652b..cfdeefa 100644 --- a/__frzr-deploy +++ b/__frzr-deploy @@ -489,7 +489,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 index 3e53edc..63e0b78 100755 --- a/test/test-deploy.sh +++ b/test/test-deploy.sh @@ -79,7 +79,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 index ab61e39..4de3064 100755 --- a/test/test-install.sh +++ b/test/test-install.sh @@ -36,7 +36,6 @@ bash /workdir/frzr bootstrap 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 index 34bd4dd..32a6ecb 100755 --- a/test/test-removal.sh +++ b/test/test-removal.sh @@ -36,7 +36,6 @@ bash /workdir/frzr bootstrap 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