From 2077911805739bd6ad9a09756aa8165daa9b31c5 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Fri, 21 Jun 2024 14:13:42 -0400
Subject: [PATCH] update guixstrap

---
 guix-strap/guix-crypt | 15 +++++++++------
 guix-strap/system.scm |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/guix-strap/guix-crypt b/guix-strap/guix-crypt
index f2afbbd..b25bc99 100755
--- a/guix-strap/guix-crypt
+++ b/guix-strap/guix-crypt
@@ -13,6 +13,9 @@ EVENT "Setting up disk encryption with luks"
 if [[ $DISK == "/dev/sd"* ]]; then
     CRYPT_PARTITION="$DISK""2"
     EFI_PARTITION="$DISK""1"
+elif [[ $DISK == "/dev/vd"* ]]; then
+    CRYPT_PARTITION="$DISK""2"
+    EFI_PARTITION="$DISK""1"
 elif [[ $DISK == "/dev/nvme"* ]]; then
     CRYPT_PARTITION="$DISK""p2"
     EFI_PARTITION="$DISK""p1"
@@ -43,19 +46,19 @@ $PASSWORD
 $PASSWORD_CONFIRM
 EOF
 
-EVENT "Opening cryptroot"
+EVENT "Opening root"
 
-cryptsetup open "$CRYPT_PARTITION" cryptroot <<EOF
+cryptsetup open "$CRYPT_PARTITION" root <<EOF
 $PASSWORD
 EOF
 
-EVENT "Setting up cryptroot btrfs"
+EVENT "Setting up root btrfs"
 
-mkfs.btrfs "/dev/mapper/cryptroot"
+mkfs.btrfs "/dev/mapper/root"
 
-EVENT "Mounting cryptroot"
+EVENT "Mounting root"
 
-mount /dev/mapper/cryptroot /mnt
+mount /dev/mapper/root /mnt
 
 EVENT "Setting up EFI vfat"
 
diff --git a/guix-strap/system.scm b/guix-strap/system.scm
index 722edef..af791c5 100644
--- a/guix-strap/system.scm
+++ b/guix-strap/system.scm
@@ -8,12 +8,12 @@
     (mapped-devices (list (mapped-device
                 (source (uuid
                       "SED_CRYPT_UUID"))
-                (target "cryptroot")
+                (target "root")
                 (type luks-device-mapping))))
   
     (file-systems (cons* (file-system
                             (mount-point "/")
-                            (device "/dev/mapper/cryptroot")
+                            (device "/dev/mapper/root")
                             (type "btrfs")
                             (dependencies mapped-devices))
                          (file-system