Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix partitioner not identifying mmc/nvme partitions #563

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Fix partitioner not identifying mmc/nvme partitions #563

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7529c0
Fix partitioner not identifying mmc/nvme partitions
Itxaka Sep 26, 2024
fff14fe
Merge branch 'main' into fix_partitioner_mmc_nvme
Itxaka Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions pkg/elemental/elemental.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (e *Elemental) PartitionAndFormatDevice(i v1.SharedInstallSpec) error {
e.config.Logger.Errorf("Udevadm settle failed: %s", err)
}
// Partitions are in order so we can format them via that
for index, p := range table.GetPartitions() {
for _, p := range table.GetPartitions() {
for _, configPart := range i.GetPartitions().PartitionsByInstallOrder(i.GetExtraPartitions()) {
if configPart.Name == cnst.BiosPartName {
// Grub partition on non-EFI is not formatted. Grub is directly installed on it
Expand All @@ -112,7 +112,16 @@ func (e *Elemental) PartitionAndFormatDevice(i v1.SharedInstallSpec) error {
// we have to match the Fs it was asked with the partition in the system
if p.(*gpt.Partition).Name == configPart.Name {
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)
// Get full partition path by the /dev/disk/by-partlabel/ facility
// So we don't need to infer the actual device under it but get udev to tell us
// So this works for "normal" devices that have the "expected" partitions (i.e. /dev/sda has /dev/sda1, /dev/sda2)
// And "weird" devices that have special subdevices like mmc or nvme
// i.e. /dev/mmcblk0 has /dev/mmcblk0p1, /dev/mmcblk0p2
device, err := filepath.EvalSymlinks(fmt.Sprintf("/dev/disk/by-partlabel/%s", configPart.Name))
if err != nil {
e.config.Logger.Errorf("Failed finding partition %s by partition label: %s", configPart.FilesystemLabel, err)
}
err = partitioner.FormatDevice(e.config.Runner, device, configPart.FS, configPart.FilesystemLabel)
if err != nil {
e.config.Logger.Errorf("Failed formatting partition: %s", err)
return err
Expand Down