Create new root subvolume on boot instead of relying on a blank snapshot.

Also persist /var/lib/nixos by default.
This commit is contained in:
2024-08-05 06:26:10 +01:00
parent 336873063e
commit c4d688a739

View File

@@ -34,41 +34,27 @@
# reset / at each boot # reset / at each boot
# Note `lib.mkBefore` is used instead of `lib.mkAfter` here. # Note `lib.mkBefore` is used instead of `lib.mkAfter` here.
boot.initrd.postDeviceCommands = pkgs.lib.mkBefore '' boot.initrd.postDeviceCommands = pkgs.lib.mkBefore ''
mkdir -p /mnt mkdir /mnt
mount /dev/mapper/luksroot /mnt
if [[ -e /mnt/root ]]; then
mkdir -p /mnt/old_roots
timestamp=$(date --date="@$(stat -c %Y /mnt/root)" "+%Y-%m-%-d_%H:%M:%S")
mv /mnt/root "/mnt/old_roots/$timestamp"
fi
# We first mount the btrfs root to /mnt delete_subvolume_recursively() {
# so we can manipulate btrfs subvolumes. IFS=$'\n'
mount -o subvol=/ /dev/disk/by-label/btrfs /mnt for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do
delete_subvolume_recursively "/mnt/$i"
done
btrfs subvolume delete "$1"
}
# While we're tempted to just delete /root and create for i in $(find /mnt/old_roots/ -maxdepth 1 -mtime +30); do
# a new snapshot from /root-blank, /root is already delete_subvolume_recursively "$i"
# populated at this point with a number of subvolumes, done
# which makes `btrfs subvolume delete` fail.
# So, we remove them first.
#
# /root contains subvolumes:
# - /root/var/lib/portables
# - /root/var/lib/machines
#
# I suspect these are related to systemd-nspawn, but
# since I don't use it I'm not 100% sure.
# Anyhow, deleting these subvolumes hasn't resulted
# in any issues so far, except for fairly
# benign-looking errors from systemd-tmpfiles.
btrfs subvolume list -o /mnt/root |
cut -f9 -d' ' |
while read subvolume; do
echo "deleting /$subvolume subvolume..."
btrfs subvolume delete "/mnt/$subvolume"
done &&
echo "deleting /root subvolume..." &&
btrfs subvolume delete /mnt/root
echo "restoring blank /root subvolume..." btrfs subvolume create /mnt/root
btrfs subvolume snapshot /mnt/root-blank /mnt/root
# Once we're done rolling back to a blank snapshot,
# we can unmount /mnt and continue on the boot process.
umount /mnt umount /mnt
''; '';
} }