From 5d434a94b16756e3a2220bcc473def71c4f01c17 Mon Sep 17 00:00:00 2001 From: bitterhalt Date: Wed, 3 Jul 2024 23:36:14 +0300 Subject: [PATCH 1/4] fsck is not needed on btrfs --- vli.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vli.sh b/vli.sh index 674aa3a..aceb713 100755 --- a/vli.sh +++ b/vli.sh @@ -198,17 +198,17 @@ function initial_configuration { cat <>/etc/fstab # Root subvolume -UUID=$ROOT_UUID / $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@ 0 1 +UUID=$ROOT_UUID / $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@ 0 0 # Home subvolume -UUID=$ROOT_UUID /home $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@home 0 2 +UUID=$ROOT_UUID /home $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@home 0 0 # Snapshots subvolume, uncomment the following line after creating a config for root [/] in snapper -#UUID=$ROOT_UUID /.snapshots $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@snapshots 0 2 +#UUID=$ROOT_UUID /.snapshots $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@snapshots 0 0 # Some applications don't like to have /var/log folders as read only. # Log folders, to allow booting snapshots with rd.live.overlay.overlayfs=1 -UUID=$ROOT_UUID /var/log $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@/var/log 0 2 +UUID=$ROOT_UUID /var/log $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@/var/log 0 0 # TMPfs tmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0 From dac557bed8ae7abc989aa1a3ea2c9bbea1ae3a71 Mon Sep 17 00:00:00 2001 From: bitterhalt Date: Thu, 4 Jul 2024 08:16:27 +0300 Subject: [PATCH 2/4] modified: vli.sh modified: vli.sh --- vli.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vli.sh b/vli.sh index aceb713..1da4dcc 100755 --- a/vli.sh +++ b/vli.sh @@ -2371,9 +2371,9 @@ function format_create_install_system { echo -e -n "\nCreating BTRFS subvolumes and mounting them to /mnt...\n" if [[ "$hdd_ssd" == "ssd" ]]; then - export BTRFS_OPT=rw,noatime,discard=async,compress-force=zstd,space_cache=v2,commit=120 + export BTRFS_OPT=rw,defaults,noatime,compress=zstd elif [[ "$hdd_ssd" == "hdd" ]]; then - export BTRFS_OPT=rw,noatime,compress-force=zstd,space_cache=v2,commit=120 + export BTRFS_OPT=rw,defaults,noatime,compress=zstd fi mount -o "$BTRFS_OPT" "$final_drive" /mnt btrfs subvolume create /mnt/@ From 65315c2b5aad665b6cbba713d17de6c4068577ae Mon Sep 17 00:00:00 2001 From: bitterhalt Date: Thu, 4 Jul 2024 08:27:34 +0300 Subject: [PATCH 3/4] modified: vli.sh --- vli.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vli.sh b/vli.sh index 1da4dcc..aceb713 100755 --- a/vli.sh +++ b/vli.sh @@ -2371,9 +2371,9 @@ function format_create_install_system { echo -e -n "\nCreating BTRFS subvolumes and mounting them to /mnt...\n" if [[ "$hdd_ssd" == "ssd" ]]; then - export BTRFS_OPT=rw,defaults,noatime,compress=zstd + export BTRFS_OPT=rw,noatime,discard=async,compress-force=zstd,space_cache=v2,commit=120 elif [[ "$hdd_ssd" == "hdd" ]]; then - export BTRFS_OPT=rw,defaults,noatime,compress=zstd + export BTRFS_OPT=rw,noatime,compress-force=zstd,space_cache=v2,commit=120 fi mount -o "$BTRFS_OPT" "$final_drive" /mnt btrfs subvolume create /mnt/@ From f6d3d2b074de49ff0069d35239d19fc2a56ba709 Mon Sep 17 00:00:00 2001 From: bitterhalt Date: Thu, 4 Jul 2024 14:07:12 +0300 Subject: [PATCH 4/4] modified: chroot.sh --- old_unused/chroot.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/old_unused/chroot.sh b/old_unused/chroot.sh index 687fe61..514c92c 100644 --- a/old_unused/chroot.sh +++ b/old_unused/chroot.sh @@ -68,17 +68,17 @@ function initial_configuration { cat <>/etc/fstab # Root subvolume -UUID=$ROOT_UUID / $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@ 0 1 +UUID=$ROOT_UUID / $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@ 0 0 # Home subvolume -UUID=$ROOT_UUID /home $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@home 0 2 +UUID=$ROOT_UUID /home $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@home 0 0 # Snapshots subvolume, uncomment the following line after creating a config for root [/] in snapper -#UUID=$ROOT_UUID /.snapshots $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@snapshots 0 2 +#UUID=$ROOT_UUID /.snapshots $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@snapshots 0 0 # Some applications don't like to have /var/log folders as read only. # Log folders, to allow booting snapshots with rd.live.overlay.overlayfs=1 -UUID=$ROOT_UUID /var/log $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@/var/log 0 2 +UUID=$ROOT_UUID /var/log $(blkid --match-tag TYPE --output value "$final_drive") $BTRFS_OPT,subvol=@/var/log 0 0 # TMPfs tmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0