diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a11169..210dadc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Change winesapOS testing repository to be a rolling updates repository. - Change 'asusctl-git' package to use the 'asusctl' package instead. - Remove Xorg support. +- Change file system commit time from 600 seconds to 300 seconds. ## 4.3.0 - The Wayland Update diff --git a/README.md b/README.md index 64be4bd..a6e3462 100644 --- a/README.md +++ b/README.md @@ -219,7 +219,7 @@ These are reasons why macOS is inferior compared to Linux when it comes to gamin - Alternatively, a swap file can be used instead for hibernation support. - For a swap file, the swappiness level is set to 0.5% (down from the default of 30%) as recommended by CryoByte33's [CryoUtilities](https://github.com/CryoByte33/steam-deck-utilities). - Writes are heavily cached in RAM for faster performance. - - Commit file system writes every 600 seconds (10 minutes) to minimize wear and tear. + - Commit file system writes every 300 seconds (5 minutes) to minimize wear and tear. - libeatmydata is used for Firefox ESR and Google Chrome to improve performance and minimize writes. - Despite the name, all data (including bookmarks, history, signed-in profiles, etc.) are kept after exiting the application. - **Full backups** via Btrfs. diff --git a/scripts/winesapos-install.sh b/scripts/winesapos-install.sh index 2ad9821..2654591 100755 --- a/scripts/winesapos-install.sh +++ b/scripts/winesapos-install.sh @@ -397,9 +397,9 @@ if [[ "${WINESAPOS_BUILD_CHROOT_ONLY}" == "false" ]]; then # Instead, manually create the '/etc/fstab' file. # https://github.com/winesapOS/winesapOS/issues/826 #genfstab -L "${WINESAPOS_INSTALL_DIR}" | grep -v tracefs > "${WINESAPOS_INSTALL_DIR}"/etc/fstab - echo "LABEL=winesapos-root / btrfs rw,noatime,nodiratime,commit=600,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos | grep "Subvolume ID" | awk '{print $3}'),subvol=/ 0 0 -LABEL=winesapos-root /home btrfs rw,noatime,nodiratime,commit=600,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos/home | grep "Subvolume ID" | awk '{print $3}'),subvol=/home 0 0 -LABEL=winesapos-root /swap btrfs rw,noatime,nodiratime,commit=600,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos/swap | grep "Subvolume ID" | awk '{print $3}'),subvol=/swap 0 0 + echo "LABEL=winesapos-root / btrfs rw,noatime,nodiratime,commit=300,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos | grep "Subvolume ID" | awk '{print $3}'),subvol=/ 0 0 +LABEL=winesapos-root /home btrfs rw,noatime,nodiratime,commit=300,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos/home | grep "Subvolume ID" | awk '{print $3}'),subvol=/home 0 0 +LABEL=winesapos-root /swap btrfs rw,noatime,nodiratime,commit=300,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos/swap | grep "Subvolume ID" | awk '{print $3}'),subvol=/swap 0 0 LABEL=winesapos-boot /boot ext4 rw,relatime 0 2 LABEL=WOS-EFI /boot/efi vfat rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro 0 2" > "${WINESAPOS_INSTALL_DIR}"/etc/fstab # Add temporary mounts separately instead of using 'genfstab -P' to avoid extra file systems. @@ -407,9 +407,9 @@ LABEL=WOS-EFI /boot/efi vfat rw,relatime,fmask=0022,dmask=0022,co tmpfs /var/log tmpfs rw,nosuid,nodev,inode64 0 0 tmpfs /var/tmp tmpfs rw,nosuid,nodev,inode64 0 0" >> "${WINESAPOS_INSTALL_DIR}"/etc/fstab elif [[ "${WINESAPOS_BOOTLOADER}" == "systemd-boot" ]]; then - echo "LABEL=winesapos-root / btrfs rw,noatime,nodiratime,commit=600,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos | grep "Subvolume ID" | awk '{print $3}'),subvol=/ 0 0 -LABEL=winesapos-root /home btrfs rw,noatime,nodiratime,commit=600,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos/home | grep "Subvolume ID" | awk '{print $3}'),subvol=/home 0 0 -LABEL=winesapos-root /swap btrfs rw,noatime,nodiratime,commit=600,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos/swap | grep "Subvolume ID" | awk '{print $3}'),subvol=/swap 0 0 + echo "LABEL=winesapos-root / btrfs rw,noatime,nodiratime,commit=300,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos | grep "Subvolume ID" | awk '{print $3}'),subvol=/ 0 0 +LABEL=winesapos-root /home btrfs rw,noatime,nodiratime,commit=300,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos/home | grep "Subvolume ID" | awk '{print $3}'),subvol=/home 0 0 +LABEL=winesapos-root /swap btrfs rw,noatime,nodiratime,commit=300,compress-force=zstd:1,discard,space_cache=v2,subvolid=$(btrfs subvolume show /winesapos/swap | grep "Subvolume ID" | awk '{print $3}'),subvol=/swap 0 0 LABEL=WOS-EFI /boot vfat rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro 0 2" > "${WINESAPOS_INSTALL_DIR}"/etc/fstab fi # Add temporary mounts separately instead of using 'genfstab -P' to avoid extra file systems. diff --git a/scripts/winesapos-tests.sh b/scripts/winesapos-tests.sh index d64767e..2cf9ee8 100755 --- a/scripts/winesapos-tests.sh +++ b/scripts/winesapos-tests.sh @@ -165,9 +165,9 @@ if [[ "${WINESAPOS_BUILD_CHROOT_ONLY}" == "false" ]]; then printf "\t\tChecking that each mount exists in /etc/fstab...\n" for i in \ - "^(\/dev\/mapper\/cryptroot|LABEL\=).*\s+/\s+btrfs\s+rw,noatime,nodiratime,commit=600,compress-force=zstd:1,discard" \ - "^(\/dev\/mapper\/cryptroot|LABEL\=).*\s+/home\s+btrfs\s+rw,noatime,nodiratime,commit=600,compress-force=zstd:1" \ - "^(\/dev\/mapper\/cryptroot|LABEL\=).*\s+/swap\s+btrfs\s+rw,noatime,nodiratime,commit=600,compress-force=zstd:1" \ + "^(\/dev\/mapper\/cryptroot|LABEL\=).*\s+/\s+btrfs\s+rw,noatime,nodiratime,commit=300,compress-force=zstd:1,discard" \ + "^(\/dev\/mapper\/cryptroot|LABEL\=).*\s+/home\s+btrfs\s+rw,noatime,nodiratime,commit=300,compress-force=zstd:1" \ + "^(\/dev\/mapper\/cryptroot|LABEL\=).*\s+/swap\s+btrfs\s+rw,noatime,nodiratime,commit=300,compress-force=zstd:1" \ "^(none|tmpfs)\s+/tmp\s+tmpfs\s+rw.*\s+0\s+0" \ "^(none|tmpfs)\s+/var/log\s+tmpfs\s+rw.*\s+0\s+0" \ "^(none|tmpfs)\s+/var/tmp\s+tmpfs\s+rw.*\s+0\s+0"