summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-01-22 23:15:20 +0100
committerlassulus <lass@lassul.us>2017-01-22 23:15:20 +0100
commit57be590db640eac4a1c34e5ccca3990f9ddfbb74 (patch)
tree04e00e07ef1637ec57879d992b1359da4cd3aba8
parent261f7f7148acb8197b1296b0809342fe681a6d82 (diff)
l 5 init: remove deprecated /boot
-rw-r--r--lass/5pkgs/init/default.nix20
1 files changed, 2 insertions, 18 deletions
diff --git a/lass/5pkgs/init/default.nix b/lass/5pkgs/init/default.nix
index d0339f811..b484d2c38 100644
--- a/lass/5pkgs/init/default.nix
+++ b/lass/5pkgs/init/default.nix
@@ -19,9 +19,7 @@ pkgs.writeText "init" ''
disk=${disk}
- bootdev=${disk}2
-
- luksdev=${disk}3
+ luksdev=${disk}2
luksmap=/dev/mapper/${luksmap}
vgname=${vgname}
@@ -51,13 +49,7 @@ pkgs.writeText "init" ''
mklabel gpt \
mkpart no-fs 0 1024KiB \
set 1 bios_grub on \
- mkpart ext2 1025KiB 1024MiB \
- mkpart primary 1024MiB 100%
- fi
-
- if ! test "$(blkid -o value -s PARTLABEL "$bootdev")" = ext2; then
- echo zonk
- exit 23
+ mkpart primary 1025KiB 100%
fi
if ! test "$(blkid -o value -s PARTLABEL "$luksdev")" = primary; then
@@ -97,10 +89,6 @@ pkgs.writeText "init" ''
# formatting
#
- if ! test "$(blkid -o value -s TYPE "$bootdev")" = ext2; then
- mkfs.ext2 "$bootdev"
- fi
-
if ! test "$(blkid -o value -s TYPE "$rootdev")" = btrfs; then
mkfs.btrfs "$rootdev"
fi
@@ -117,10 +105,6 @@ pkgs.writeText "init" ''
if ! test "$(lsblk -n -o MOUNTPOINT "$rootdev")" = /mnt; then
mount "$rootdev" /mnt
fi
- if ! test "$(lsblk -n -o MOUNTPOINT "$bootdev")" = /mnt/boot; then
- mkdir -m 0000 -p /mnt/boot
- mount "$bootdev" /mnt/boot
- fi
if ! test "$(lsblk -n -o MOUNTPOINT "$homedev")" = /mnt/home; then
mkdir -m 0000 -p /mnt/home
mount "$homedev" /mnt/home