kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-08-20 09:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mkfs using the wrong label for the fs label (#556)

Browse Source
This commit is contained in:
Itxaka 2024-09-24 10:08:34 +02:00 committed by GitHub
parent 60af8246ad
commit ded356cf98
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/elemental/elemental.go
View File

@ -110,7 +110,7 @@ func (e *Elemental) PartitionAndFormatDevice(i v1.SharedInstallSpec) error {
continue continue
} }
// we have to match the Fs it was asked with the partition in the system // we have to match the Fs it was asked with the partition in the system
if p.(*gpt.Partition).Name == configPart.FilesystemLabel { if p.(*gpt.Partition).Name == configPart.Name {
e.config.Logger.Debugf("Formatting partition: %s", configPart.FilesystemLabel) e.config.Logger.Debugf("Formatting partition: %s", configPart.FilesystemLabel)
err = partitioner.FormatDevice(e.config.Runner, fmt.Sprintf("%s%d", i.GetTarget(), index+1), configPart.FS, configPart.FilesystemLabel) err = partitioner.FormatDevice(e.config.Runner, fmt.Sprintf("%s%d", i.GetTarget(), index+1), configPart.FS, configPart.FilesystemLabel)
if err != nil { if err != nil {

4
pkg/elemental/elemental_test.go
View File

@ -398,7 +398,7 @@ var _ = Describe("Elemental", Label("elemental"), func() {
// Should be efi type // Should be efi type
Expect(partition.Type).To(Equal(gpt.EFISystemPartition)) Expect(partition.Type).To(Equal(gpt.EFISystemPartition))
// should have boot label // should have boot label
Expect(partition.Name).To(Equal(cnst.EfiLabel)) Expect(partition.Name).To(Equal(cnst.EfiPartName))
// Should have predictable UUID // Should have predictable UUID
Expect(strings.ToLower(partition.UUID())).To(Equal(strings.ToLower(uuid.NewV5(uuid.NamespaceURL, cnst.EfiLabel).String()))) Expect(strings.ToLower(partition.UUID())).To(Equal(strings.ToLower(uuid.NewV5(uuid.NamespaceURL, cnst.EfiLabel).String())))
// Check the rest have the proper types // Check the rest have the proper types
@ -431,7 +431,7 @@ var _ = Describe("Elemental", Label("elemental"), func() {
// Should be BIOS boot type // Should be BIOS boot type
Expect(partition.Type).To(Equal(gpt.BIOSBoot)) Expect(partition.Type).To(Equal(gpt.BIOSBoot))
// should have boot label // should have boot label
Expect(partition.Name).To(Equal(cnst.EfiLabel)) Expect(partition.Name).To(Equal(cnst.BiosPartName))
// Should have predictable UUID // Should have predictable UUID
Expect(strings.ToLower(partition.UUID())).To(Equal(strings.ToLower(uuid.NewV5(uuid.NamespaceURL, cnst.EfiLabel).String()))) Expect(strings.ToLower(partition.UUID())).To(Equal(strings.ToLower(uuid.NewV5(uuid.NamespaceURL, cnst.EfiLabel).String())))
for i := 1; i < len(disk.Table.GetPartitions()); i++ { for i := 1; i < len(disk.Table.GetPartitions()); i++ {

6
pkg/partitioner/disk.go
View File

@ -88,7 +88,7 @@ func kairosPartsToDiskfsGPTParts(parts sdkTypes.PartitionList, diskSize int64) [
Type: gpt.EFISystemPartition, Type: gpt.EFISystemPartition,
Size: size, // partition size in bytes Size: size, // partition size in bytes
GUID: uuid.NewV5(uuid.NamespaceURL, part.FilesystemLabel).String(), // set know predictable UUID GUID: uuid.NewV5(uuid.NamespaceURL, part.FilesystemLabel).String(), // set know predictable UUID
Name: part.FilesystemLabel, Name: part.Name,
Attributes: 0x1, // system partition flag Attributes: 0x1, // system partition flag
}) })
} else if part.Name == cnst.BiosPartName { } else if part.Name == cnst.BiosPartName {
@ -99,7 +99,7 @@ func kairosPartsToDiskfsGPTParts(parts sdkTypes.PartitionList, diskSize int64) [
Type: gpt.BIOSBoot, Type: gpt.BIOSBoot,
Size: size, // partition size in bytes Size: size, // partition size in bytes
GUID: uuid.NewV5(uuid.NamespaceURL, part.FilesystemLabel).String(), // set know predictable UUID GUID: uuid.NewV5(uuid.NamespaceURL, part.FilesystemLabel).String(), // set know predictable UUID
Name: part.FilesystemLabel, Name: part.Name,
Attributes: 0x4, // legacy bios bootable flag Attributes: 0x4, // legacy bios bootable flag
}) })
} else { } else {
@ -110,7 +110,7 @@ func kairosPartsToDiskfsGPTParts(parts sdkTypes.PartitionList, diskSize int64) [
Type: gpt.LinuxFilesystem, Type: gpt.LinuxFilesystem,
Size: size, Size: size,
GUID: uuid.NewV5(uuid.NamespaceURL, part.FilesystemLabel).String(), GUID: uuid.NewV5(uuid.NamespaceURL, part.FilesystemLabel).String(),
Name: part.FilesystemLabel, Name: part.Name,
}) })
} }
} }