From f150afec0a9b3213a732775ede36f720cadd91c8 Mon Sep 17 00:00:00 2001
From: eric <eric@dgren.dev>
Date: Wed, 18 Mar 2026 03:21:10 +0100
Subject: [PATCH] fix: probe correct value

---
 hosts/lab/configuration.nix                   |  30 -----------
 hosts/lab/disko.nix                           |  47 ------------------
 hosts/lab/hardware-configuration.nix          |   5 --
 pkgs/helpers/__pycache__/cli.cpython-313.pyc  | Bin 70382 -> 70098 bytes
 pkgs/helpers/cli.py                           |  35 ++++++-------
 .../__pycache__/test_cli.cpython-313.pyc      | Bin 6652 -> 7628 bytes
 pkgs/helpers/tests/test_cli.py                |  13 +++++
 7 files changed, 29 insertions(+), 101 deletions(-)
 delete mode 100644 hosts/lab/configuration.nix
 delete mode 100644 hosts/lab/disko.nix
 delete mode 100644 hosts/lab/hardware-configuration.nix

diff --git a/hosts/lab/configuration.nix b/hosts/lab/configuration.nix
deleted file mode 100644
index f0de599..0000000
--- a/hosts/lab/configuration.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, ... }:
-{
-  # Generated by nodeiwest host init.
-  imports = [
-    ./disko.nix
-    ./hardware-configuration.nix
-  ];
-
-  networking.hostName = "lab";
-  networking.useDHCP = lib.mkDefault true;
-
-  time.timeZone = "UTC";
-
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.grub = {
-    enable = true;
-    efiSupport = true;
-    device = "nodev";
-  };
-
-  nodeiwest.ssh.userCAPublicKeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE6c2oMkM7lLg9qWHVgbrFaFBDrrFyynFlPviiydQdFi openbao-user-ca"
-  ];
-
-  nodeiwest.tailscale.openbao = {
-    enable = true;
-  };
-
-  system.stateVersion = "25.05";
-}
diff --git a/hosts/lab/disko.nix b/hosts/lab/disko.nix
deleted file mode 100644
index 377830e..0000000
--- a/hosts/lab/disko.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  ...
-}:
-{
-  # Generated by nodeiwest host init.
-  # Replace the disk only if the provider exposes a different primary device.
-  disko.devices = {
-    disk.main = {
-      type = "disk";
-      device = lib.mkDefault "/dev/sda    11";
-      content = {
-        type = "gpt";
-        partitions = {
-          ESP = {
-            priority = 1;
-            name = "ESP";
-            start = "1MiB";
-            end = "512MiB";
-            type = "EF00";
-            content = {
-              type = "filesystem";
-              format = "vfat";
-              mountpoint = "/boot";
-              mountOptions = [ "umask=0077" ];
-            };
-          };
-          swap = {
-            size = "4GiB";
-            content = {
-              type = "swap";
-              resumeDevice = true;
-            };
-          };
-          root = {
-            size = "100%";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/";
-            };
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/hosts/lab/hardware-configuration.nix b/hosts/lab/hardware-configuration.nix
deleted file mode 100644
index 3f6bc7b..0000000
--- a/hosts/lab/hardware-configuration.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-{
-  # Placeholder generated by nodeiwest host init.
-  # nixos-anywhere will replace this with the generated hardware config.
-}
diff --git a/pkgs/helpers/__pycache__/cli.cpython-313.pyc b/pkgs/helpers/__pycache__/cli.cpython-313.pyc
index 4a14814e469cc1633b8515ab751b45246d9079b0..b6559c56458f4b1c9df30ff9e07dace7117a37ee 100644
GIT binary patch
delta 3506
zcmZ`*30PBC7JldD<z<5qQBhe!SgNMD;ZiNwS{JN)k&xCI>nKa8)R-_g!IcWLd@YP3
z)N6gE^NnaXTRVf6XG^VhY1LXC+hM7S5xd$^zg7XIBHGVy?zsWc>CF4S{5kh*_uO;O
zx%XauLu!0Y3cVg0Y82SF!SrGNfOkWG8$C93>YSNr^D-AZ(xzslWv+R^;mRQ{zb!A{
z<<1>po94>PDs=l(Z1-uYFGi>9jf?ANlX@wxLGr0TCT>`0NOAkJ-OFsl)79rn5+#_U
zzWV11pugK~5JN<|m~NQp6o=y6?8`L?!a{A376b>3gCOmKk%B{<4<5}(!6P}vzQPPe
z5InF@rn_%h=_8*R<2~9@f=700nJ9sYbPkPEm&(kuL_wI#+&XnM&eFeF<B-NN4t|B~
zzo2Zv7N>p)8_j({5KMwiaBBJrPa1vVNWq8Ggb0Fnr&C5xx#)>y$!Sa%=bD4s9+SuD
zH1&j^6@Op&T8Es$X1@2Mqh8P^n0l6F792V!OcdF_evGz<>jI}llUMW`>6Cj|Heqg6
zcX(1F3(UrT9?0vVjCq3HFpuiW#?i@T!;JxWgiK+xuCdd?vbf?Lue)%$$7dsNBF|vU
z_t@O|9+!<AWn;T8VDuHZ^Zm&35j$HaF)%(!WK=-QMWhZHKGY5g$lgMKL7_h&p+P{)
z%>ugaIRX;#uJi?Dzjv9-<0Bt3lR%=Dj{=%yuGInUiY#}bD<B8;iI+{{V<{G>>n}FA
zLl13EF8<17X)#CF$7D2_9rb$0cjk<e$D894N~WE&^e>fK`a~#Eo1$LMZ0ZwVDmR-g
zrJ8g7qe|17!@^&FpeZc&tYu*HAZvA0Rn#`eTX9W;hLz1Ko!UGgx>B=#M!P|Xh;BCu
z_EAmYX*+c<=N;<XFlL(a(A&CFU43}kSElfmaGSe1JoSTV2WRe`dFYv@iSz1HpZIKb
z{cjdEELc*%B&*(%eO)8=HMa?3sJTrR451aKGE?Q$)B1t!Q9_@HwrC;5QZl>inq3H;
z4PDowg}&3l7l8{LICY}5s~>|;h8U)S{K;6EA)UWFLcOy-1+-)fO9h=&9uF_6+2uZn
zdIeL%Do(K3NI3f=YZ-&XR<&)TM$`s0zQSyJv+`lsp^ko00sY^Yf?XurX~QNf)T(Wp
z${}t88u3ki4ykff(U6TuS0Gf<ZJQ%uzq)Vpc`a<CRj(Am5jEnkV<giq6cdD6npvF*
zKdNt6pOQdQi(d~F;T>B3<}65{&2Pq=$xBR&dHn#R+(-30Vxn;|J`E4PJNkp@2_Z(E
zyrVz^gVoxdxuUTV*$5L=+dtNTsR_sD5KhxKY7*frJy8=4PpB7bL>SA3r<u?$222HB
zcYe<5#RXaZrQ|H*-IpsXdO&zejoBR|!qaMMZ81#ej<J~STJi;|G%yI5@;$jOkAJb>
zwaQN_k<G)$W5|YIF#TVm03mnNp0|eAprJM|%k6U!Z1J}tXvEk;x4|hiK=9I2dtT^s
znNhdIr{nEF_&To8kM;}%AASD4okm;}L0GA#yl)1mpfl?xKoR|8-S{E6gKSrqph_o$
z;5wHCgL;ikM-bMk-_+Ft6svS^H4H|ZfG#&bFVCHyO>Utn)*$a=yG%Yu`Zmx7`^Ff#
z5J6F2+V?fU>uTZt^$;Vm$|G6^ndD=peOX`{c0D<RmNJbwIB=+r2?N@krOUm!M9=8^
zw|f}QiST!I(ZM?qZTOXj%s2$$J$2>BCq>QWegd6-WEXs--Z;_-tQL=dIvT#9zkGTC
zn$&&A%3)|6TGXQBc%-&5DxiIacnb^c66wOonh+9b!SQ%#ru6tbV55^x#KX60_K9qO
zAL!A4wm?7n>Pb6v(32-uYsqHjgU<PU1$3#0KYvgJE4})!I1p4zeGWh}^*7vt(bU^G
zA5PPc8~ZcynZ`H>Q@a{(0K}?oUpB}vmws~Y5DZfP)RGLAM=`KAjG`T35<PO>31igA
zug1#~%4loLAnLjBBCM?aVI@EfUG?t@*huvkZ^1~axike7b^4|Gps!+au}!zq>dRKB
zQ4d^RuVItVy7DL-pk-I~Ytxyp!|Lp-Mu^T}WOwdMf<>_$Q-m5v>F-<P!9h2--br)*
zf3;&0^AOA8y?I$E5m@x54Dp&EB+nPO&8S>;+7ufcbP)$V)0PQ&bXa@F{jUT1e0#Ob
z8>)&XU3&~NsQX%sychkBpcU7)4$lx-KA6Mn+<B)U=sAaBv))n>Ru;x)9W+_&5Cp>%
zQO&$Q1@zZ31rpgnw{}Fzyeli{fsRCIqThF1f-Usq&#`QifBM<a=&T!7I8RG%ybo1$
zd}k7TPjfmSg7@hwovpL6OoBJs5S9W~{k)SB7|r{D-C$YSE;p$|wV{|KnPmdozNhi|
zL5OgPetENH0{6#VN%y$wHD`+!dX3*jw+J`XOI>H7xE;rM6p%KARt9!m@R;R}d3odg
z8_?ykV=2q+CO8*AGJX|1k2iRb@e}L6Bj1fvAl$~CSjD`mkNt8T<nNJxfj)faS(_DC
zth>A7?xSl6Dj;ao!*`w(EkOfhF2`UziXGrFC{UgS7z>eg)c|fWnK02BQ`)M0zb(g`
z>q@bax0qiNiEO>kpUd72DMn7Y2uU##pE6Nm4?L?vBuFxP(J?}@vO|I{SgUN;!omSX
zjKivcH#R@Q9z>r-$}l6uTKh4Y3Hfc-E3^f<Ta<JeqK9K*f`=csL^Woz{eN;dDpfK#
z<JMs)T>H_WHm__eql4UaN|+8_g|C%b9gH^h3LBJG9rTASidN6o)v2WFAzi!;O1U1!
zLy>Y+4}%9pG2d&9?tGtrVLH3H76m;PDWU-;!8&D%0g{-i#{jEff^yLSiE+=}jV37=
z%`{{n-D8WnU`BI{5E(fGg*+E&xWv(@7J}3|rNjusW!!I4tf)qK9Ez3O%mgZx2ouEe
zEBl^AVHvZ6<LO(c%r`Mbm*QrMvAlKo6#O1RMY8nnv~|i(rj*pH#5-fw-Ec9v>>^om
zcLNfX4in@p?oE0zY8c5=Xu^|Tk5mcHU_z@uAQfB_Qo({i8~r^t!FBd(Dtkj9DKQKg
zW&{CY4?5<xP0%sEcu7A+9||K(D$*Yy98xBSLd_ihe)$Fs@U=p|MT);NzC(&X4)}#1
ze7m3uznd?hl;5#GA;qsnSxGg+@>qVZ@P6lq1aDT}cvH~Ys~j`K2q>+)VP-w1?GKiY
LQFS9Na8UdYt_Gi*

delta 3837
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
b?leLcJbfT!q?=3?3z3&^I}jZK@ACfxVSNdU

diff --git a/pkgs/helpers/cli.py b/pkgs/helpers/cli.py
index 486cd3f..0276e4f 100644
--- a/pkgs/helpers/cli.py
+++ b/pkgs/helpers/cli.py
@@ -584,7 +584,7 @@ def validate_host_name(name: str) -> None:
 
 
 def probe_host(ip: str, user: str) -> ProbeFacts:
-    lsblk_cmd = "lsblk -o NAME,SIZE,TYPE,MODEL,FSTYPE,PTTYPE,MOUNTPOINTS"
+    lsblk_cmd = "lsblk -P -o NAME,SIZE,TYPE,MODEL,FSTYPE,PTTYPE,MOUNTPOINTS"
     boot_cmd = "test -d /sys/firmware/efi && echo UEFI || echo BIOS"
     root_cmd = "findmnt -no SOURCE /"
     swap_cmd = "cat /proc/swaps"
@@ -635,28 +635,25 @@ def probe_host(ip: str, user: str) -> ProbeFacts:
 
 
 def parse_lsblk_output(output: str) -> list[dict[str, str]]:
-    lines = [line.rstrip("\n") for line in output.splitlines() if line.strip()]
-    if len(lines) < 2:
+    lines = [line.strip() for line in output.splitlines() if line.strip()]
+    if not lines:
         raise NodeiwestError("Unexpected lsblk output: not enough lines to parse.")
 
-    header = lines[0]
     columns = ["NAME", "SIZE", "TYPE", "MODEL", "FSTYPE", "PTTYPE", "MOUNTPOINTS"]
-    starts = []
-    for column in columns:
-        index = header.find(column)
-        if index == -1:
-            raise NodeiwestError(f"Unexpected lsblk output: missing {column} column.")
-        starts.append(index)
-    starts.append(len(header) + 20)
-
     rows: list[dict[str, str]] = []
-    for line in lines[1:]:
-        row: dict[str, str] = {}
-        for idx, column in enumerate(columns):
-            start = starts[idx]
-            end = starts[idx + 1] if idx + 1 < len(columns) else len(line)
-            row[column] = line[start:end].strip()
-        row["NAME"] = re.sub(r"^[^0-9A-Za-z]+", "", row["NAME"])
+    for line in lines:
+        tokens = shlex.split(line)
+        row = {}
+        for token in tokens:
+            if "=" not in token:
+                continue
+            key, value = token.split("=", 1)
+            row[key] = value
+        missing = [column for column in columns if column not in row]
+        if missing:
+            raise NodeiwestError(
+                f"Unexpected lsblk output: missing columns {', '.join(missing)} in line {line!r}."
+            )
         rows.append(row)
     return rows
 
diff --git a/pkgs/helpers/tests/__pycache__/test_cli.cpython-313.pyc b/pkgs/helpers/tests/__pycache__/test_cli.cpython-313.pyc
index dba937d410b2bd7fec1b8e7769e3c7c721c8b560..eb5ac18fce1e03661393ecadd9d105e13f1326a7 100644
GIT binary patch
delta 1202
zcma)5OH30{6rDGnDbsdJ`L)Bx&t#I4bOBfmiHcw_6e*v!IIVmnj)j)eQd)ddBsLn{
z;X)IW7ZrA_4DK`}nz(c0%EUBcFcTNJF}lOR%4p(yuY3xLiL*F4@7#OOJu@%!`^@{c
z@@>1_%HZdL?M?ED<7Ih<O~vr>F*C+MpfZqE0W_(i%GNU}4sw{8DC05XC^KWmQ&xtV
znKA*hGRiEN36xnevruMJtx!zZJodFO>|0wkhxeHn25c*UELK4Vpl<64F#=k#K%NYX
zHbqxOgjHD{A5{}Y4*e441Cghq`LI|<MPX00l#E-6xPU#2qK%fsR+esLWG2CQ?1B92
zK<9w3UD0DvMOOWzn0mdJ6*)W-!ZeoDrxkf1*yZbQR|b6p5xJ-HN>`U(?Nj7#wb-M`
zp>UBUW^<%D5(tNa{y<o5R}|~QzP)$PztwwsU~j=}6w(>G;K1|NWE9JLzDG=3#<SU+
zVuj>I43794CLG`3NPNSD;~PAUoVO497D_VzAYa?yaIe>}mE_Fx)Y4;u6{MjGhtlI(
zS|3kOYuUNn>|72yZ~@n=NZnl23=U@Jbsb+UBg-<ZCZ!9xxSrEW=bMVn8jMF{I<6$4
zuFWTNQ&`sYnRpZ?GYM@Xo1UA==tdvXEcFYei~noRi&yK*816A!9Iz+BmWi=Ab_AxP
zdc)x^INU3fA018ixlKXb5NZoT?NZHBbXi()EuUO<uM4L>AJW7BDo86*q0X~<ab0LT
zJW(8ITo=4Y_2Y%QmKV||;T*atHmp4>?`1&{{j5+x2-Q^HHTU7na1cGM%!7`#s;Y0S
zlPdj04iE?u2qC-E-5cINM+m!$Az!}xb(?0h>Ey(17$TJ+0>c<QA|!tv93e1D;2ME3
zbjRs#zD}q{fLtxSfx*Mm`-M>=kRXP6*LNI!a4rHr8ggv{J31=`Z9SxCg1{7dC^di-
zdM+IU&FGz^@HYPZPW{?<$pXX~;=;{DlNp#oe`;&NB68Kea&~|r@Mw6$*;sHk?l9!E
Lb%{k^>l*$7`ZPcl

delta 470
zcmX}o%S!@59Ki9NbywYo7UqOc0wG}!9;6OIPYrt5yDf?^Hj~H=QyJHTLg%i<;2$DF
zMYryChz`Y`I(ZiA7}5NeY7Za2zuykbvX7HrWBw1HPv+QDlJCu+uj8-qM+a<db9s&+
zog=)Ch)Y*=KEj;|L}2A|N@OKC<z^*1<zeM^%FD{*l*G#Gl&nicIh8fF+v6V;IwDHl
zav;Z}4808|P?p-k3->g;n#|Kf+(PN@8}9Mg+04Lt4#)sm`Vt!5S@@q9p_Ujef2!KB
zY7Hw@tCr1TlVst|GLU0vDiNSpfK^}(SO*3fHm3bB9w!s9*aWtK0brY<i6j861Mp$C
z`}dw5+74f$DH@NwBb9zfHfDF>4E#wO8%EtKSZ2{ESQasl8`eqPFi0K_3<E=e@<)(G
yU8C30ME5Q#A=O~BEu0t33dz%_SO_&~FLr~|Xb)ZOzvARGPJVJQ^-G9$;?W<A7Htp!

diff --git a/pkgs/helpers/tests/test_cli.py b/pkgs/helpers/tests/test_cli.py
index 50bc1db..7893708 100644
--- a/pkgs/helpers/tests/test_cli.py
+++ b/pkgs/helpers/tests/test_cli.py
@@ -46,6 +46,19 @@ class HelperCliTests(unittest.TestCase):
         self.assertIn('device = lib.mkDefault "/dev/vda";', rendered)
         self.assertIn('size = "8GiB";', rendered)
 
+    def test_parse_lsblk_output_reads_pairs_without_smearing_columns(self) -> None:
+        output = (
+            'NAME="sda" SIZE="11G" TYPE="disk" MODEL="QEMU HARDDISK" FSTYPE="" PTTYPE="gpt" MOUNTPOINTS=""\n'
+            'NAME="sda1" SIZE="512M" TYPE="part" MODEL="" FSTYPE="vfat" PTTYPE="" MOUNTPOINTS="/boot"\n'
+        )
+        rows = cli.parse_lsblk_output(output)
+
+        self.assertEqual(rows[0]["NAME"], "sda")
+        self.assertEqual(rows[0]["SIZE"], "11G")
+        self.assertEqual(rows[0]["MODEL"], "QEMU HARDDISK")
+        self.assertEqual(rows[1]["NAME"], "sda1")
+        self.assertEqual(rows[1]["MOUNTPOINTS"], "/boot")
+
     def test_bao_kv_get_uses_explicit_kv_mount(self) -> None:
         completed = mock.Mock()
         completed.stdout = '{"data": {"data": {"CLIENT_ID": "x"}}}'