losurdo: booting on that specific NVMe M.2 is not (yet?) supported

[sourcephile-nix.git] / servers / losurdo / Makefile

diff --git a/servers/losurdo/Makefile b/servers/losurdo/Makefile
index c7d2cbbc5d5dc73014253eb47963a3ad46482754..55725f2d62e683c43563d73d6662f17612d6c2a7 100644 (file)
--- a/servers/losurdo/Makefile
+++ b/servers/losurdo/Makefile
@@ -3,7 +3,7 @@
 #disk       := /dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_250GB_S4EUNJ0N211426T
 server      := losurdo
 disk        := $(shell sourcephile-nix-get nodes.$(server).config.boot.loader.grub.devices.0)
-partlabel   := $(server)_nvme
+partlabel   := $(server)_sd
 rpool       := $(partlabel)
 cipher      := aes-128-gcm
 autotrim    := on
@@ -11,22 +11,22 @@ reservation := 1G
 
 wipeout:
        sudo modprobe zfs
-       sudo zpool labelclear -f $(disk)-part5 || true
+       sudo zpool labelclear -f $(disk)-part4 || true
        sudo $$(which sgdisk) --zap-all $(disk)
 
 partition: wipeout
-       sudo $$(which sgdisk) -a1 -n0:34:2047 -t0:EF02 -c0:"$(partlabel)_bios"  $(disk)
-       sudo $$(which sgdisk)     -n0:1M:+8M  -t0:EF00 -c0:"$(partlabel)_efi"   $(disk)
-       sudo $$(which sgdisk)     -n0:0:+256M -t0:8300 -c0:"$(partlabel)_boot"  $(disk)
-       sudo $$(which sgdisk)     -n0:0:+8G   -t0:8200 -c0:"$(partlabel)_swap"  $(disk)
-       sudo $$(which sgdisk)     -n0:0:0     -t0:BF01 -c0:"$(partlabel)_rpool" $(disk)
+       sudo $$(which sgdisk) -a1 -n0:34:2047  -t0:EF02 -c0:"$(partlabel)_bios"  $(disk)
+       sudo $$(which sgdisk)     -n0:1M:+100M -t0:EF00 -c0:"$(partlabel)_efi"   $(disk)
+       sudo $$(which sgdisk)     -n0:0:+256M  -t0:8300 -c0:"$(partlabel)_boot"  $(disk)
+       #sudo $$(which sgdisk)     -n0:0:+8G    -t0:8200 -c0:"$(partlabel)_swap"  $(disk)
+       sudo $$(which sgdisk)     -n0:0:0      -t0:BF01 -c0:"$(partlabel)_rpool" $(disk)
        sudo $$(which sgdisk) --randomize-guids $(disk)
-       sudo $$(which sgdisk) --backup=sgdisk.backup $(disk)
+       sudo $$(which sgdisk) --backup=$(partlabel).sgdisk $(disk)
 
-format: format-efi format-boot format-rpool
+format: umount format-efi format-boot format-rpool
 format-efi:
        sudo blkid $(disk)-part2 -t TYPE=vfat || \
-       sudo mkfs.vfat -F 32 -s 1 -n EFI $(disk)-part2
+       sudo mkfs.vfat -F 16 -s 1 -n EFI $(disk)-part2
 format-boot:
        sudo mkdir -p /mnt/$(server)
        sudo blkid -t TYPE=ext2 $(disk)-part3; test $$? != 2 || \
@@ -38,7 +38,7 @@ format-rpool:
         -O keyformat=passphrase \
         -O keylocation=prompt) \
         -O normalization=formD \
-        -R /mnt/$(server) $(rpool) $(disk)-part5
+        -R /mnt/$(server) $(rpool) $(disk)-part4
        sudo zpool set \
         autotrim=$(autotrim) \
         $(rpool)