diff --git a/aurora/backup-to-portable b/aurora/backup-to-portable index e7d8f7a..837b85f 100755 --- a/aurora/backup-to-portable +++ b/aurora/backup-to-portable @@ -11,7 +11,8 @@ LUKS_DEVICE="/dev/disk/by-id/usb-Seagate_Portable_NT3D9HDX-0:0-part1" LUKS_KEYFILE="/etc/backup-drive.key" LUKS_NAME="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" SNAP_DIR="snapshots" KEEP_LOCAL=2 # local snapshots (need at least 1 for incremental parent) diff --git a/aurora/restore-from-portable b/aurora/restore-from-portable index 574bbde..73fa4a0 100755 --- a/aurora/restore-from-portable +++ b/aurora/restore-from-portable @@ -10,7 +10,8 @@ LUKS_DEVICE="/dev/disk/by-id/usb-Seagate_Portable_NT3D9HDX-0:0-part1" LUKS_KEYFILE="/etc/backup-drive.key" LUKS_NAME="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" BROWSE_MOUNT="/mnt/backup-browse" @@ -226,7 +227,7 @@ full_restore() { green "═══════════════════════════════════════════" echo "" 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 ""