feat: rethink factory reset

Author: TobiPeterG

etc/systemd/system/factory-reset.service

@@ -2,7 +2,7 @@
 Description=Factory Reset
 After=local-fs.target
 Before=first-boot-complete.target
-Wants=first-boot-complete.target
+Wants=first-boot-complete.target.wants
 ConditionFirstBoot=yes
 
 [Service]

etc/systemd/system/first-boot-resize.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=Reboot to resize
 After=first-boot-complete.target systemd-repart.service local-fs.target
+Before=display-manager.service multi-user.target
 Requisite=first-boot-complete.target
 
 [Service]

usr/bin/factory-reset

@@ -1,30 +1,35 @@
 #!/usr/bin/bash
 
-if [ ! -f "/home/.deck_remove" ]; then
+if [ ! -f "/.factory_reset" ]; then
     exit 0
 fi
 
-if w | grep -q "^deck\s"; then
-    echo "User 'deck' is currently logged in. Aborting."
-    exit 1
-fi
-
-echo "User 'deck' is not logged in. Continuing with the process."
-
-rm -rf /home/*
-rm -rf /home/.*
-mkhomedir_helper deck
-
-echo "Home directory reset completed successfully."
+directories=(/home /opt /root /srv /var /usr/local /boot/writable /boot/grub2/i386-pc /boot/grub2/x86_64-efi)
 
-# List all snapshots, exclude snapshots 0 and 1, and filter out non-numeric lines
-snapshots_to_delete=$(snapper list --disable-used-space --columns=number | awk '$1 ~ /^[0-9]+$/ && $1 != 0 && $1 != 1 && $1 != 2 {print $1}')
+rootsource=$(findmnt / -n --output source | sed 's/\[.*\]//g')
+mount -t btrfs -o subvol=/ $rootsource /mnt
 
-# Loop through and delete each snapshot
+for dir in "${directories[@]}"
+do
+  btrfs subvolume delete /mnt/@$dir
+  btrfs subvolume snapshot /mnt/@${dir}ori /mnt/@${dir}
+done
+btrfs subvolume set-default /.snapshots/fr/snapshot
+snapshots_to_delete=$(snapper list --disable-used-space --columns=number | awk '$1 ~ /^[0-9]+$/ {print $1}')
 for snapshot in $snapshots_to_delete; do
     echo "Deleting snapshot: $snapshot"
     snapper delete "$snapshot"
 done
-transactional-update --no-selfupdate cleanup-overlays
 
-echo "All snapshots have been deleted."
+mkdir /.snapshots/1
+btrfs subvolume snapshot -r /.snapshots/ori/snapshot /.snapshots/1/snapshot
+cp /.snapshots/ori/info.xml /.snapshots/1/info.xml
+btrfs subvolume set-default /.snapshots/1/snapshot
+
+rm -rf /boot/efi/*
+rm -rf /boot/efi/.* || true
+cp -r /.snapshots/fr/bori/efi/* /boot/efi/
+cp -r /.snapshots/fr/bori/efi/.* /boot/efi/ || true
+
+umount /mnt
+systemctl reboot

usr/bin/first-boot-resize

@@ -1,4 +1,7 @@
 #!/bin/bash
+if [ -f "/.factory_reset" ]; then
+    exit 0
+fi
 transactional-update --no-selfupdate -c run btrfs filesystem resize max /
 transactional-update --no-selfupdate -c 2 run sleep 1
 snapper modify -c "" 2

usr/bin/steamos-factory-reset-config

@@ -1,7 +1,7 @@
 #! /bin/bash
-if ! snapper list --disable-used-space --columns=number | grep -Eq "^\s*2(-|\*|\+|\s)"; then
-    echo "Snapshot 2 does not exist."
-    exit 1
-fi
-transactional-update --no-selfupdate -c 2 run sleep 1
-touch "/home/.deck_remove"
+
+rm -rf /boot/efi/*
+rm -rf /boot/efi/.* || true
+cp -r /.snapshots/fr/bfr/efi/* /boot/efi/
+cp -r /.snapshots/fr/bfr/efi/.* /boot/efi/ || true
+btrfs subvolume set-default /.snapshots/fr/snapshot

usr/bin/steamos-startup-gamescope

@@ -4,5 +4,3 @@
   echo "[Seat:*]"
   echo "autologin-session=gamescope-session-steam"
 } > "/etc/lightdm/lightdm.conf.d/10-gamescope-session.conf"
-
-snapper modify -c "" 2