try root reset
This commit is contained in:
RingOfStorms (Joshua Bell)
parent
55fe33f0b4
commit
d3d4ccf9d6
2 changed files with 106 additions and 37 deletions
|
|
@ -138,8 +138,8 @@ lib.mkMerge [
|
||||||
# Make this part of the root-fs chain, not just initrd.target
|
# Make this part of the root-fs chain, not just initrd.target
|
||||||
wantedBy = [
|
wantedBy = [
|
||||||
# "initrd.target"
|
# "initrd.target"
|
||||||
# "sysroot.mount"
|
"sysroot.mount"
|
||||||
# "initrd-root-fs.target"
|
"initrd-root-fs.target"
|
||||||
];
|
];
|
||||||
before = [
|
before = [
|
||||||
"sysroot.mount"
|
"sysroot.mount"
|
||||||
|
|
@ -148,7 +148,7 @@ lib.mkMerge [
|
||||||
|
|
||||||
after = [
|
after = [
|
||||||
# "usb_key.mount"
|
# "usb_key.mount"
|
||||||
# "initrd-root-device.target"
|
"initrd-root-device.target"
|
||||||
];
|
];
|
||||||
requires = [
|
requires = [
|
||||||
"initrd-root-device.target"
|
"initrd-root-device.target"
|
||||||
|
|
@ -225,7 +225,7 @@ lib.mkMerge [
|
||||||
# TODO rotate root
|
# TODO rotate root
|
||||||
}
|
}
|
||||||
# Reset root for erase your darlings/impermanence/preservation
|
# Reset root for erase your darlings/impermanence/preservation
|
||||||
(lib.mkIf false {
|
(lib.mkIf true {
|
||||||
boot.initrd.systemd.services.bcachefs-reset-root = {
|
boot.initrd.systemd.services.bcachefs-reset-root = {
|
||||||
description = "Reset bcachefs root subvolume before pivot";
|
description = "Reset bcachefs root subvolume before pivot";
|
||||||
|
|
||||||
|
|
@ -263,6 +263,7 @@ lib.mkMerge [
|
||||||
pkgs.coreutils
|
pkgs.coreutils
|
||||||
pkgs.util-linux
|
pkgs.util-linux
|
||||||
pkgs.findutils
|
pkgs.findutils
|
||||||
|
pkgs.gawk
|
||||||
pkgs.bcachefs-tools
|
pkgs.bcachefs-tools
|
||||||
]
|
]
|
||||||
}:/bin:/sbin";
|
}:/bin:/sbin";
|
||||||
|
|
@ -270,15 +271,18 @@ lib.mkMerge [
|
||||||
|
|
||||||
script = ''
|
script = ''
|
||||||
# 1. Enable Debugging
|
# 1. Enable Debugging
|
||||||
# This will print every command to the journal so you can see exactly where it fails
|
|
||||||
# View logs with: journalctl -u bcachefs-reset-root -b
|
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
# 2. Define Cleanup Trap
|
# 2. Define Cleanup Trap (Robust)
|
||||||
# This guarantees unmount runs even if the script crashes or fails halfway
|
|
||||||
cleanup() {
|
cleanup() {
|
||||||
if mountpoint -q /primary_tmp; then
|
# If the script failed before creating the new root, make sure we create it
|
||||||
echo "Cleaning up: Unmounting /primary_tmp"
|
if [[ ! -e /primary_tmp/@root ]]; then
|
||||||
|
echo "Cleanup: Creating new @root"
|
||||||
|
bcachefs subvolume create /primary_tmp/@root
|
||||||
|
fi
|
||||||
|
# Robust replacement for 'mountpoint -q'
|
||||||
|
if grep -qs "/primary_tmp " /proc/mounts; then
|
||||||
|
echo "Cleanup: Unmounting /primary_tmp"
|
||||||
umount /primary_tmp
|
umount /primary_tmp
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
@ -286,39 +290,85 @@ lib.mkMerge [
|
||||||
|
|
||||||
mkdir -p /primary_tmp
|
mkdir -p /primary_tmp
|
||||||
|
|
||||||
# 3. Mount
|
# If unlocked, mounts instantly. If locked, prompts for password on TTY.
|
||||||
# If this fails, we exit 0 to allow the boot to proceed (skipping reset)
|
echo "Mounting ${PRIMARY}..."
|
||||||
if ! mount "${PRIMARY}" /primary_tmp; then
|
if ! mount "${PRIMARY}" /primary_tmp; then
|
||||||
echo "Failed to mount ${PRIMARY}. Drive locked or unavailable."
|
echo "Mount failed. Cannot reset root."
|
||||||
exit 0
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 4. Reset Logic
|
# 5. Snapshot & Prune Logic
|
||||||
if [[ -e /primary_tmp/@root ]]; then
|
if [[ -e /primary_tmp/@root ]]; then
|
||||||
# Ensure parent dirs exist
|
mkdir -p /primary_tmp/@snapshots/old_roots
|
||||||
mkdir -p /primary_tmp/@snapshots/old_roots
|
|
||||||
|
# Use safe timestamp format (dashes instead of colons)
|
||||||
# Use safe date format (underscores instead of colons) to avoid filesystem quirks
|
timestamp=$(date --date="@$(stat -c %Y /primary_tmp/@root)" "+%Y-%m-%d_%H-%M-%S")
|
||||||
timestamp=$(date --date="@$(stat -c %Y /primary_tmp/@root)" "+%Y-%m-%d_%H-%M-%S")
|
|
||||||
|
echo "Snapshotting @root to .../$timestamp"
|
||||||
echo "Snapshotting @root to @snapshots/old_roots/$timestamp"
|
bcachefs subvolume snapshot /primary_tmp/@root "/primary_tmp/@snapshots/old_roots/$timestamp"
|
||||||
bcachefs subvolume snapshot /primary_tmp/@root "/primary_tmp/@snapshots/old_roots/$timestamp"
|
|
||||||
|
echo "Deleting current @root"
|
||||||
echo "Deleting current @root"
|
bcachefs subvolume delete /primary_tmp/@root
|
||||||
bcachefs subvolume delete /primary_tmp/@root
|
|
||||||
|
# --- PRUNING LOGIC ---
|
||||||
# Cleanup old snapshots (>30 days)
|
echo "Pruning snapshots..."
|
||||||
# We use 'find' with -print0 and 'xargs -0 -r' to handle filenames safely
|
|
||||||
echo "Pruning old snapshots..."
|
# Get list of snapshots sorted by name (which effectively sorts by date: YYYY-MM-DD...)
|
||||||
find /primary_tmp/@snapshots/old_roots/ -maxdepth 1 -mtime +30 -print0 | \
|
# ls -r puts newest first
|
||||||
xargs -0 -r -I {} sh -c 'echo "Deleting {}"; bcachefs subvolume delete "{}"'
|
snapshots=$(ls -1r /primary_tmp/@snapshots/old_roots | grep -E '^[0-9]{4}-[0-9]{2}-[0-9]{2}')
|
||||||
|
|
||||||
|
declare -A kept_weeks
|
||||||
|
declare -A kept_months
|
||||||
|
processed_count=0
|
||||||
|
|
||||||
|
for snap in $snapshots; do
|
||||||
|
keep=false
|
||||||
|
|
||||||
|
# Parse date from filename (Replace _ with space for date command)
|
||||||
|
date_str=$(echo "$snap" | sed 's/_/ /')
|
||||||
|
|
||||||
|
# Get metadata
|
||||||
|
ts=$(date -d "$date_str" +%s)
|
||||||
|
week_id=$(date -d "$date_str" +%Y-W%U)
|
||||||
|
month_id=$(date -d "$date_str" +%Y-%m)
|
||||||
|
now=$(date +%s)
|
||||||
|
days_old=$(( (now - ts) / 86400 ))
|
||||||
|
|
||||||
|
# RULE 1: Keep 5 most recent (Always)
|
||||||
|
if [ $processed_count -lt 5 ]; then
|
||||||
|
keep=true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# RULE 2: Weekly for last month (Age < 32 days)
|
||||||
|
# "at least 1 root from each week from the last month"
|
||||||
|
if [ $days_old -le 32 ]; then
|
||||||
|
if [ -z "''${kept_weeks[$week_id]}" ]; then
|
||||||
|
keep=true
|
||||||
|
kept_weeks[$week_id]=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# RULE 3: Monthly for older snapshots
|
||||||
|
# "at least 1 root from a month ago" (implies monthly retention indefinitely)
|
||||||
|
if [ $days_old -gt 32 ]; then
|
||||||
|
if [ -z "''${kept_months[$month_id]}" ]; then
|
||||||
|
keep=true
|
||||||
|
kept_months[$month_id]=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$keep" = true ]; then
|
||||||
|
echo "Keeping: $snap"
|
||||||
|
else
|
||||||
|
echo "Deleting: $snap"
|
||||||
|
bcachefs subvolume delete "/primary_tmp/@snapshots/old_roots/$snap"
|
||||||
|
fi
|
||||||
|
|
||||||
|
processed_count=$((processed_count + 1))
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 5. Create Fresh Root
|
# Trap handles creating new root and unmount
|
||||||
echo "Creating empty @root subvolume"
|
|
||||||
bcachefs subvolume create /primary_tmp/@root
|
|
||||||
|
|
||||||
# Trap will handle the unmount automatically on exit
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -122,3 +122,22 @@ echo "test" > /usb_key/key
|
||||||
umount /usb_key && rmdir /usb_key
|
umount /usb_key && rmdir /usb_key
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## TODO remove notes
|
||||||
|
|
||||||
|
```sh
|
||||||
|
BOOT=sda1
|
||||||
|
PRIMARY=sda2
|
||||||
|
SWAP=sda3
|
||||||
|
swapon /dev/$SWAP
|
||||||
|
keyctl link @u @s
|
||||||
|
DEV_B="/dev/disk/by-uuid/"$(lsblk -o name,uuid | grep $BOOT | awk '{print $2}')
|
||||||
|
DEV_P="/dev/disk/by-uuid/"$(lsblk -o name,uuid | grep $PRIMARY | awk '{print $2}')
|
||||||
|
mount -t bcachefs -o X-mount.subdir=@root $DEV_P /mnt
|
||||||
|
mount -t vfat $DEV_B /mnt/boot --mkdir
|
||||||
|
mount -t bcachefs -o X-mount.mkdir,X-mount.subdir=@nix,relatime $DEV_P /mnt/nix
|
||||||
|
mount -t bcachefs -o X-mount.mkdir,X-mount.subdir=@snapshots,relatime $DEV_P /mnt/.snapshots
|
||||||
|
mount -t bcachefs -o X-mount.mkdir,X-mount.subdir=@persist $DEV_P /mnt/persist
|
||||||
|
nixos-install --flake "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=hosts/i001#i001"
|
||||||
|
```
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue