From aeb48839709816e162a4cbb7dd6e49c78aa1b67c Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 29 Oct 2020 21:07:57 +0300 Subject: [PATCH] fix: properly initialize manifest in user disks creation This is :facepalm:, I somehow missed that installer Manifest is used here and missed the fact I need to update it. Signed-off-by: Andrey Smirnov --- .../runtime/v1alpha1/v1alpha1_sequencer_tasks.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go index f303c468d..5b0f1cdfc 100644 --- a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go +++ b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go @@ -765,6 +765,7 @@ func MountUserDisks(seq runtime.Sequence, data interface{}) (runtime.TaskExecuti // here. func partitionAndFormatDisks(logger *log.Logger, r runtime.Runtime) (err error) { m := &installer.Manifest{ + Devices: map[string]installer.Device{}, Targets: map[string][]*installer.Target{}, } @@ -800,15 +801,22 @@ func partitionAndFormatDisks(logger *log.Logger, r runtime.Runtime) (err error) } } + m.Devices[disk.Device()] = installer.Device{ + Device: disk.Device(), + ResetPartitionTable: true, + } + if m.Targets[disk.Device()] == nil { m.Targets[disk.Device()] = []*installer.Target{} } for _, part := range disk.Partitions() { extraTarget := &installer.Target{ - Device: disk.Device(), - Size: part.Size(), - Force: true, + Device: disk.Device(), + Size: part.Size(), + Force: true, + PartitionType: installer.LinuxFilesystemData, + FileSystemType: installer.FilesystemTypeXFS, } m.Targets[disk.Device()] = append(m.Targets[disk.Device()], extraTarget)