fixed upgrade for wwBool in disks
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user