From 6824a9a3f8d08af22800b5f547c2cafa6be47bda Mon Sep 17 00:00:00 2001
From: Key Night <keynight@users.noreply.github.com>
Date: Sun, 30 Mar 2025 18:50:17 -0400
Subject: [PATCH 1/2] Update presets.go

fix: Default to /dev/sda if no disk is found

Updated the disk selection logic to use /dev/sda as the default value when no disk is discovered. This ensures that the installation process has a fallback option, improving reliability in environments where disks may not be detected.
---
 pkg/generated/presets.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/generated/presets.go b/pkg/generated/presets.go
index e12cc0a1..ebde93eb 100644
--- a/pkg/generated/presets.go
+++ b/pkg/generated/presets.go
@@ -64,7 +64,12 @@ machine:
     image: {{ . }}
     {{- end }}
     {{- (include "talm.discovered.disks_info" .) | nindent 4 }}
-    disk: {{ include "talm.discovered.system_disk_name" . | quote }}
+    disk: {{- $disk := include "talm.discovered.system_disk_name" . }}
+    {{- if eq $disk "" }}
+    /dev/sda
+    {{- else }}
+    {{ $disk | quote }}
+    {{- end }}
   network:
     hostname: {{ include "talm.discovered.hostname" . | quote }}
     nameservers: {{ include "talm.discovered.default_resolvers" . }}

From 383f2f4e4522437d31e68f1cee23654ef08e0233 Mon Sep 17 00:00:00 2001
From: Andrei Kvapil <kvapss@gmail.com>
Date: Mon, 31 Mar 2025 09:41:25 +0200
Subject: [PATCH 2/2] Default to /dev/sda if no disk is found

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
---
 charts/cozystack/templates/_helpers.tpl |  7 ++++++-
 charts/generic/templates/_helpers.tpl   |  7 ++++++-
 pkg/generated/presets.go                | 13 +++++++++----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/charts/cozystack/templates/_helpers.tpl b/charts/cozystack/templates/_helpers.tpl
index d3843255..5d4daffe 100644
--- a/charts/cozystack/templates/_helpers.tpl
+++ b/charts/cozystack/templates/_helpers.tpl
@@ -34,7 +34,12 @@ machine:
     image: {{ . }}
     {{- end }}
     {{- (include "talm.discovered.disks_info" .) | nindent 4 }}
-    disk: {{ include "talm.discovered.system_disk_name" . | quote }}
+    {{- $disk := include "talm.discovered.system_disk_name" . }}
+    {{- if eq $disk "" }}
+    disk: /dev/sda
+    {{- else }}
+    disk: {{ $disk | quote }}
+    {{- end }}
   network:
     hostname: {{ include "talm.discovered.hostname" . | quote }}
     nameservers: {{ include "talm.discovered.default_resolvers" . }}
diff --git a/charts/generic/templates/_helpers.tpl b/charts/generic/templates/_helpers.tpl
index e55dab0c..86f25554 100644
--- a/charts/generic/templates/_helpers.tpl
+++ b/charts/generic/templates/_helpers.tpl
@@ -7,7 +7,12 @@ machine:
         {{- toYaml .Values.advertisedSubnets | nindent 8 }}
   install:
     {{- (include "talm.discovered.disks_info" .) | nindent 4 }}
-    disk: {{ include "talm.discovered.system_disk_name" . | quote }}
+    {{- $disk := include "talm.discovered.system_disk_name" . }}
+    {{- if eq $disk "" }}
+    disk: /dev/sda
+    {{- else }}
+    disk: {{ $disk | quote }}
+    {{- end }}
   network:
     hostname: {{ include "talm.discovered.hostname" . | quote }}
     nameservers: {{ include "talm.discovered.default_resolvers" . }}
diff --git a/pkg/generated/presets.go b/pkg/generated/presets.go
index ebde93eb..855861ab 100644
--- a/pkg/generated/presets.go
+++ b/pkg/generated/presets.go
@@ -64,11 +64,11 @@ machine:
     image: {{ . }}
     {{- end }}
     {{- (include "talm.discovered.disks_info" .) | nindent 4 }}
-    disk: {{- $disk := include "talm.discovered.system_disk_name" . }}
+    {{- $disk := include "talm.discovered.system_disk_name" . }}
     {{- if eq $disk "" }}
-    /dev/sda
+    disk: /dev/sda
     {{- else }}
-    {{ $disk | quote }}
+    disk: {{ $disk | quote }}
     {{- end }}
   network:
     hostname: {{ include "talm.discovered.hostname" . | quote }}
@@ -180,7 +180,12 @@ machine:
         {{- toYaml .Values.advertisedSubnets | nindent 8 }}
   install:
     {{- (include "talm.discovered.disks_info" .) | nindent 4 }}
-    disk: {{ include "talm.discovered.system_disk_name" . | quote }}
+    {{- $disk := include "talm.discovered.system_disk_name" . }}
+    {{- if eq $disk "" }}
+    disk: /dev/sda
+    {{- else }}
+    disk: {{ $disk | quote }}
+    {{- end }}
   network:
     hostname: {{ include "talm.discovered.hostname" . | quote }}
     nameservers: {{ include "talm.discovered.default_resolvers" . }}