jyapayne/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto-detect BTRFS device instead of hardcoding nvme0n1p3

Browse source
This commit is contained in:
Joey Yakimowich-Payne 2026-02-24 20:10:47 -07:00
commit 919caa935d
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
aurora/backup-to-portable
View file

@ -11,7 +11,8 @@ LUKS_DEVICE="/dev/disk/by-id/usb-Seagate_Portable_NT3D9HDX-0:0-part1"
LUKS_KEYFILE="/etc/backup-drive.key" LUKS_KEYFILE="/etc/backup-drive.key"
LUKS_NAME="backup-drive" LUKS_NAME="backup-drive"
BACKUP_MOUNT="/mnt/backup-drive" BACKUP_MOUNT="/mnt/backup-drive"
BTRFS_DEVICE="/dev/nvme0n1p3" BTRFS_DEVICE="$(findmnt -n -o SOURCE /var/home 2>/dev/null | sed 's/\[.*//')"
[ -b "${BTRFS_DEVICE:-}" ] || BTRFS_DEVICE="$(findmnt -n -o SOURCE / 2>/dev/null | sed 's/\[.*//')"
BTRFS_TOP="/mnt/btrfs-root" BTRFS_TOP="/mnt/btrfs-root"
SNAP_DIR="snapshots" SNAP_DIR="snapshots"
KEEP_LOCAL=2 # local snapshots (need at least 1 for incremental parent) KEEP_LOCAL=2 # local snapshots (need at least 1 for incremental parent)

5
aurora/restore-from-portable
View file

@ -10,7 +10,8 @@ LUKS_DEVICE="/dev/disk/by-id/usb-Seagate_Portable_NT3D9HDX-0:0-part1"
LUKS_KEYFILE="/etc/backup-drive.key" LUKS_KEYFILE="/etc/backup-drive.key"
LUKS_NAME="backup-drive" LUKS_NAME="backup-drive"
BACKUP_MOUNT="/mnt/backup-drive" BACKUP_MOUNT="/mnt/backup-drive"
BTRFS_DEVICE="/dev/nvme0n1p3" BTRFS_DEVICE="$(findmnt -n -o SOURCE /var/home 2>/dev/null | sed 's/\[.*//')"
[ -b "${BTRFS_DEVICE:-}" ] || BTRFS_DEVICE="$(findmnt -n -o SOURCE / 2>/dev/null | sed 's/\[.*//')"
BTRFS_TOP="/mnt/btrfs-root" BTRFS_TOP="/mnt/btrfs-root"
BROWSE_MOUNT="/mnt/backup-browse" BROWSE_MOUNT="/mnt/backup-browse"
@ -226,7 +227,7 @@ full_restore() {
green "═══════════════════════════════════════════" green "═══════════════════════════════════════════"
echo "" echo ""
yellow "After reboot, once verified, clean up old home with:" yellow "After reboot, once verified, clean up old home with:"
echo " sudo mount -o subvolid=5 /dev/nvme0n1p3 /mnt/btrfs-root" echo " sudo mount -o subvolid=5 $BTRFS_DEVICE /mnt/btrfs-root"
echo " sudo btrfs subvolume delete /mnt/btrfs-root/home-old-*" echo " sudo btrfs subvolume delete /mnt/btrfs-root/home-old-*"
echo "" echo ""