Skip to content

[WIP] feat(format): allow custom partition layout specification in linuxkit format #4104

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

Draft
SmartArray wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[WIP] feat(format): allow custom partition layout specification in linuxkit format #4104

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e29b48
feat(format): allow custom partition layout specification in linuxkit…
SmartArray Feb 7, 2025
24f6a0d
feat(hash): update component SHAs
SmartArray Feb 7, 2025
d517779
fix(go): correct indention
SmartArray Feb 7, 2025
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
Next Next commit
feat(format): allow custom partition layout specification in linuxkit… 
…/format

Signed-off-by: Yoshi Jaeger <github@jaeger.berlin>
  • Loading branch information
@SmartArray
SmartArray committed Feb 7, 2025
commit 8e29b48757222d420420d8a2a0bfb460fa008f94
32 changes: 17 additions & 15 deletions pkg/format/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ const (
)

var (
labelVar string
fsTypeVar string
partTypeVar string
forceVar bool
verboseVar bool
drives map[string]bool
driveKeys []string
labelVar string
fsTypeVar string
partTypeVar string
forceVar bool
verboseVar bool
drives map[string]bool
partitionLayoutVar string
driveKeys []string
)

func hasPartitions(d string) bool {
Expand Down Expand Up @@ -73,7 +74,7 @@ func isEmptyDevice(d string) (bool, error) {
return isEmpty, nil
}

func autoformat(label, fsType string, partType string) error {
func autoformat(label, fsType string, partType string, partitionLayoutVar string) error {
var first string
for _, d := range driveKeys {
if verboseVar {
Expand All @@ -94,7 +95,7 @@ func autoformat(label, fsType string, partType string) error {
return fmt.Errorf("No eligible disks found")
}

return format(first, label, fsType, partType, false)
return format(first, label, fsType, partType, partitionLayoutVar, false)
}

func refreshDevicesAndWaitFor(awaitedDevice string) error {
Expand Down Expand Up @@ -129,15 +130,15 @@ func refreshDevicesAndWaitFor(awaitedDevice string) error {
return nil
}

func format(d, label, fsType string, partType string, forced bool) error {
func format(d, label, fsType string, partType string, partitionLayoutVar string, forced bool) error {
if forced {
// clear partitions on device if forced format and they exist
if hasPartitions(d) {
if verboseVar {
log.Printf("Clearing partitions on %s because forced format was requested", d)
}
partCmd := exec.Command("sfdisk", "--quiet", "--delete", d)
partCmd.Stdin = strings.NewReader(";")
partCmd.Stdin = strings.NewReader(partitionLayoutVar)
if out, err := partCmd.CombinedOutput(); err != nil {
return fmt.Errorf("Error deleting partitions with sfdisk: %v\n%s", err, out)
}
Expand Down Expand Up @@ -169,7 +170,7 @@ func format(d, label, fsType string, partType string, forced bool) error {

// format one large partition
partCmd := exec.Command("sfdisk", "--quiet", d)
partCmd.Stdin = strings.NewReader(";")
partCmd.Stdin = strings.NewReader(partitionLayoutVar)
if out, err := partCmd.CombinedOutput(); err != nil {
return fmt.Errorf("Error running sfdisk: %v\n%s", err, out)
}
Expand Down Expand Up @@ -267,6 +268,7 @@ func init() {
flag.StringVar(&labelVar, "label", "", "Disk label to apply")
flag.StringVar(&fsTypeVar, "type", "ext4", "Type of filesystem to create")
flag.StringVar(&partTypeVar, "partition", "dos", "Type of partition table to create")
flag.StringVar(&partitionLayoutVar, "layout", ";", "Partition layout for sfdisk invocation")
flag.BoolVar(&verboseVar, "verbose", false, "Enable verbose output (default false)")
}

Expand All @@ -292,7 +294,7 @@ func main() {
if flag.NArg() == 0 {
// auto-detect drives if a device to format is not explicitly specified
findDrives()
if err := autoformat(labelVar, fsTypeVar, partTypeVar); err != nil {
if err := autoformat(labelVar, fsTypeVar, partTypeVar, partitionLayoutVar); err != nil {
log.Fatalf("%v", err)
}
} else {
Expand All @@ -303,13 +305,13 @@ func main() {
}

if forceVar == true {
if err := format(candidateDevice, labelVar, fsTypeVar, partTypeVar, forceVar); err != nil {
if err := format(candidateDevice, labelVar, fsTypeVar, partTypeVar, partitionLayoutVar, forceVar); err != nil {
log.Fatalf("%v", err)
}
} else {
// add the deviceVar to the array of devices to consider autoformatting
driveKeys = []string{candidateDevice}
if err := autoformat(labelVar, fsTypeVar, partTypeVar); err != nil {
if err := autoformat(labelVar, fsTypeVar, partTypeVar, partitionLayoutVar); err != nil {
log.Fatalf("%v", err)
}
}
Expand Down