diff options
| author | Freya Murphy <freya@freyacat.org> | 2024-06-21 14:13:42 -0400 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2024-06-21 14:13:42 -0400 |
| commit | 2077911805739bd6ad9a09756aa8165daa9b31c5 (patch) | |
| tree | 9b75b39c8b7e7ff1ec0fd090f48d2292b7aa4625 | |
| parent | update kaworu and start dotfiles update (diff) | |
| download | dotfiles-guix-2077911805739bd6ad9a09756aa8165daa9b31c5.tar.gz dotfiles-guix-2077911805739bd6ad9a09756aa8165daa9b31c5.tar.bz2 dotfiles-guix-2077911805739bd6ad9a09756aa8165daa9b31c5.zip | |
update guixstrap
| -rwxr-xr-x | guix-strap/guix-crypt | 15 | ||||
| -rw-r--r-- | 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 |