From 87e09af9417ba7be94e31044b62d7c46deea4cd6 Mon Sep 17 00:00:00 2001 From: Michal Date: Wed, 1 Apr 2026 15:13:53 +0100 Subject: [PATCH] fix: default admin user to 'lab', case-insensitive OS detection for iSCSI - Firstboot script defaults admin user to 'lab' instead of bastion's config.adminUser (which was 'michal' from host system) - iSCSI OS detection uses case-insensitive match for 'fedora' Co-Authored-By: Claude Opus 4.6 (1M context) --- bastion/src/bastion/src/routes/asahi.ts | 2 +- bastion/src/modules/modules/k3s/src/operations/iscsi.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bastion/src/bastion/src/routes/asahi.ts b/bastion/src/bastion/src/routes/asahi.ts index ebdbfff..5a2a06a 100644 --- a/bastion/src/bastion/src/routes/asahi.ts +++ b/bastion/src/bastion/src/routes/asahi.ts @@ -154,7 +154,7 @@ fi const hostname = request.query.hostname ?? "unknown"; const role = (request.query.role ?? "infra") as Role; const mac = request.query.mac ?? "unknown"; - const user = request.query.user ?? config.adminUser; + const user = request.query.user ?? "lab"; const script = renderFirstbootScript({ hostname, diff --git a/bastion/src/modules/modules/k3s/src/operations/iscsi.ts b/bastion/src/modules/modules/k3s/src/operations/iscsi.ts index 551eebd..50e137a 100644 --- a/bastion/src/modules/modules/k3s/src/operations/iscsi.ts +++ b/bastion/src/modules/modules/k3s/src/operations/iscsi.ts @@ -13,7 +13,8 @@ export const enableIscsi: Operation = async (ctx): Promise => { // Install the package (detect distro) const osRelease = await ctx.ssh.exec("cat /etc/os-release", sshOpts(ctx)); - const isFedora = osRelease.stdout.includes("fedora") || osRelease.stdout.includes("rhel") || osRelease.stdout.includes("centos"); + const osLower = osRelease.stdout.toLowerCase(); + const isFedora = osLower.includes("fedora") || osLower.includes("rhel") || osLower.includes("centos"); const pkg = isFedora ? "iscsi-initiator-utils" : "open-iscsi"; const installCmd = isFedora ? `dnf install -y ${pkg}` : `apt-get install -y ${pkg}`;