summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-09-27 15:42:33 +0200
committerlassulus <lassulus@lassul.us>2020-09-27 15:42:33 +0200
commit687ae7ca86bad6648ef53bf8ef5c6f335ad88037 (patch)
treeacaa20d3e825fb123a442a2e7b2ccfd826459960
parente1251ee299af6b00dc81a76560d4810cd0a6126c (diff)
l init: update with local tests, sgdisk, etc..
-rw-r--r--lass/2configs/websites/lassulus.nix2
-rw-r--r--lass/5pkgs/init/default.nix45
-rwxr-xr-xlass/5pkgs/init/run-vm.sh7
-rw-r--r--lass/5pkgs/init/test.nix13
-rwxr-xr-xlass/5pkgs/init/test.sh11
5 files changed, 45 insertions, 33 deletions
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index baeac213b..5a45f03ef 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -61,7 +61,7 @@ in {
pubkey = config.krebs.users.lass.pubkey;
};
in ''
- alias ${initscript};
+ alias ${initscript}/bin/init;
'';
locations."= /blue.pub".extraConfig = ''
alias ${pkgs.writeText "pub" config.krebs.users.lass.pubkey};
diff --git a/lass/5pkgs/init/default.nix b/lass/5pkgs/init/default.nix
index cbcfe2c00..ee49951b1 100644
--- a/lass/5pkgs/init/default.nix
+++ b/lass/5pkgs/init/default.nix
@@ -2,10 +2,10 @@
with lib;
-pkgs.writeScript "init" ''
+pkgs.writeScriptBin "init" ''
#!/usr/bin/env nix-shell
- #! nix-shell -i bash -p jq parted libxfs
- set -efu
+ #! nix-shell -i bash -p cryptsetup gptfdisk jq libxfs
+ set -xefuo pipefail
disk=$1
@@ -14,12 +14,12 @@ pkgs.writeScript "init" ''
exit 2
fi
+ bootdev="$disk"2
luksdev="$disk"3
luksmap=/dev/mapper/${luksmap}
vgname=${vgname}
- bootdev=/dev/sda2
rootdev=/dev/mapper/${vgname}-root
homedev=/dev/mapper/${vgname}-home
@@ -35,15 +35,13 @@ pkgs.writeScript "init" ''
# dd if=/dev/zero bs=512 count=34 of=/dev/sda
# TODO zero last 34 blocks (lsblk -bno SIZE /dev/sda)
if ! test "$(blkid -o value -s PTTYPE "$disk")" = gpt; then
- parted -s -a optimal "$disk" \
- mklabel gpt \
- mkpart no-fs 0 1024KiB \
- set 1 bios_grub on \
- mkpart ESP fat32 1025KiB 1024MiB set 2 boot on \
- mkpart primary 1025MiB 100%
+ sgdisk -og "$disk"
+ sgdisk -n 1:2048:4095 -c 1:"BIOS Boot Partition" -t 1:ef02 "$disk"
+ sgdisk -n 2:4096:+1G -c 2:"EFI System Partition" -t 2:ef00 "$disk"
+ sgdisk -n 3:0:0 -c 3:"LUKS container" -t 3:8300 "$disk"
fi
- if ! test "$(blkid -o value -s PARTLABEL "$luksdev")" = primary; then
+ if ! test "$(blkid -o value -s PARTLABEL "$luksdev")" = "LUKS container"; then
echo zonk2
exit 23
fi
@@ -58,7 +56,6 @@ pkgs.writeScript "init" ''
if ! test -e "$luksmap"; then
echo "$lukspw" | cryptsetup luksOpen "$luksdev" "$(basename "$luksmap")" -
fi
- # cryptsetup close
if ! test "$(blkid -o value -s TYPE "$luksmap")" = LVM2_member; then
pvcreate "$luksmap"
@@ -68,11 +65,7 @@ pkgs.writeScript "init" ''
lvchange -a y /dev/mapper/"$vgname"
- if ! test -e "$rootdev"; then lvcreate -L 7G -n root "$vgname"; fi
- if ! test -e "$homedev"; then lvcreate -L 100M -n home "$vgname"; fi
-
- # lvchange -a n "$vgname"
-
+ if ! test -e "$rootdev"; then lvcreate -L 3G -n root "$vgname"; fi
#
# formatting
@@ -82,35 +75,23 @@ pkgs.writeScript "init" ''
mkfs.vfat "$bootdev"
fi
- if ! test "$(blkid -o value -s TYPE "$rootdev")" = btrfs; then
+ if ! test "$(blkid -o value -s TYPE "$rootdev")" = xfs; then
mkfs.xfs "$rootdev"
fi
- if ! test "$(blkid -o value -s TYPE "$homedev")" = btrfs; then
- mkfs.xfs "$homedev"
- fi
-
-
if ! test "$(lsblk -n -o MOUNTPOINT "$rootdev")" = /mnt; then
+ mkdir -p /mnt
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
- fi
-
- # umount -R /mnt
#
# dependencies for stockholm
#
- nix-env -iA nixos.git
-
# TODO: get sentinal file from target_path
mkdir -p /mnt/var/src
touch /mnt/var/src/.populate
@@ -119,7 +100,7 @@ pkgs.writeScript "init" ''
# print all the infos
#
- parted "$disk" print
+ gdisk -l "$disk"
lsblk "$disk"
echo READY.
diff --git a/lass/5pkgs/init/run-vm.sh b/lass/5pkgs/init/run-vm.sh
new file mode 100755
index 000000000..13914ad5f
--- /dev/null
+++ b/lass/5pkgs/init/run-vm.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nixos-generators
+
+set -efu
+
+WD=$(dirname "$0")
+nixos-generate -I stockholm="$WD"/../../.. -c "$WD"/config.nix -f vm-nogui --run
diff --git a/lass/5pkgs/init/test.nix b/lass/5pkgs/init/test.nix
new file mode 100644
index 000000000..e76e7e009
--- /dev/null
+++ b/lass/5pkgs/init/test.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+{
+ virtualisation.emptyDiskImages = [
+ 8000
+ ];
+ virtualisation.memorySize = 1500;
+ boot.tmpOnTmpfs = true;
+
+ environment.systemPackages = [
+ (pkgs.callPackage ./default.nix {})
+ ];
+ services.mingetty.autologinUser = lib.mkForce "root";
+}
diff --git a/lass/5pkgs/init/test.sh b/lass/5pkgs/init/test.sh
new file mode 100755
index 000000000..0ceaa73ca
--- /dev/null
+++ b/lass/5pkgs/init/test.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nixos-generators
+
+set -xefu
+
+WD=$(realpath $(dirname "$0"))
+TMPDIR=$(mktemp -d)
+cd "$TMPDIR"
+nixos-generate -c "$WD"/test.nix -f vm-nogui --run "$@"
+cd -
+rm -r "$TMPDIR"