From 026bae7a40d2cb7e9d68e634ba064335e7748cfa Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Tue, 22 Jul 2025 14:40:29 +0200
Subject: [PATCH] fixed upgrade for wwBool in disks

---
 internal/pkg/upgrade/node.go      | 11 ++++++-----
 internal/pkg/upgrade/node_test.go |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/internal/pkg/upgrade/node.go b/internal/pkg/upgrade/node.go
index 53cd419c..f9d233e8 100644
--- a/internal/pkg/upgrade/node.go
+++ b/internal/pkg/upgrade/node.go
@@ -12,6 +12,7 @@ import (
 	"github.com/warewulf/warewulf/internal/pkg/node"
 	"github.com/warewulf/warewulf/internal/pkg/util"
 	"github.com/warewulf/warewulf/internal/pkg/wwlog"
+	"github.com/warewulf/warewulf/internal/pkg/wwtype"
 )
 
 var wwinitSplitOverlays = []string{
@@ -710,7 +711,7 @@ func (legacy *Disk) Upgrade() (upgraded *node.Disk) {
 			upgraded.Partitions[name] = partition.Upgrade()
 		}
 	}
-	upgraded.WipeTable, _ = strconv.ParseBool(legacy.WipeTable)
+	upgraded.WipeTable = wwtype.Parse(legacy.WipeTable)
 	return
 }
 
@@ -729,12 +730,12 @@ func (legacy *Partition) Upgrade() (upgraded *node.Partition) {
 	upgraded = new(node.Partition)
 	upgraded.Guid = legacy.Guid
 	upgraded.Number = legacy.Number
-	upgraded.Resize, _ = strconv.ParseBool(legacy.Resize)
-	upgraded.ShouldExist, _ = strconv.ParseBool(legacy.ShouldExist)
+	upgraded.Resize = wwtype.Parse(legacy.Resize)
+	upgraded.ShouldExist = wwtype.Parse(legacy.ShouldExist)
 	upgraded.SizeMiB = legacy.SizeMiB
 	upgraded.StartMiB = legacy.StartMiB
 	upgraded.TypeGuid = legacy.TypeGuid
-	upgraded.WipePartitionEntry, _ = strconv.ParseBool(legacy.WipePartitionEntry)
+	upgraded.WipePartitionEntry = wwtype.Parse(legacy.WipePartitionEntry)
 	return
 }
 
@@ -770,6 +771,6 @@ func (legacy *FileSystem) Upgrade() (upgraded *node.FileSystem) {
 	upgraded.Options = append(upgraded.Options, legacy.Options...)
 	upgraded.Path = legacy.Path
 	upgraded.Uuid = legacy.Uuid
-	upgraded.WipeFileSystem, _ = strconv.ParseBool(legacy.WipeFileSystem)
+	upgraded.WipeFileSystem = wwtype.Parse(legacy.WipeFileSystem)
 	return
 }
diff --git a/internal/pkg/upgrade/node_test.go b/internal/pkg/upgrade/node_test.go
index 4ed513ba..c0de8123 100644
--- a/internal/pkg/upgrade/node_test.go
+++ b/internal/pkg/upgrade/node_test.go
@@ -589,11 +589,11 @@ nodes:
   n1:
     disks:
       /dev/vda:
-        wipe_table: true
+        wipe_table: "true"
         partitions:
           scratch:
             number: "1"
-            should_exist: true
+            should_exist: "true"
           swap:
             number: "2"
             size_mib: "1024"