update guixstrap
This commit is contained in:
parent
ec91773b25
commit
2077911805
2 changed files with 11 additions and 8 deletions
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue