Skip to content

machine: add SetScratchMkfsArgs to allow customising scratch mkfs options #301

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
obbardc wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

machine: add SetScratchMkfsArgs to allow customising scratch mkfs options #301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 16 additions & 6 deletions machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,12 @@ type Machine struct {
quiet bool
Environ []string

scratchsize int64
scratchpath string
scratchfile string
scratchdev string
initrdpath string
scratchsize int64
scratchpath string
scratchfile string
scratchdev string
scratchMkfsArgs []string
initrdpath string
}

// Create a new machine object with the auto backend
Expand Down Expand Up @@ -537,6 +538,12 @@ func (m *Machine) SetScratch(scratchsize int64, path string) {
}
}

// SetScratchMkfsArgs sets extra arguments passed to mkfs.ext4 when creating
// the scratch filesystem.
func (m *Machine) SetScratchMkfsArgs(args []string) {
m.scratchMkfsArgs = args
}

func (m Machine) generateFstab(w *writerhelper.WriterHelper, backend backend) error {
fstab := []string{"# Generated fstab file by fakemachine"}

Expand Down Expand Up @@ -636,7 +643,10 @@ func (m *Machine) setupscratch() error {
if err != nil {
return err
}
mkfs := exec.Command("mkfs.ext4", "-q", tmpfile.Name())

mkfsArgs := append([]string{"-q"}, m.scratchMkfsArgs...)
mkfsArgs = append(mkfsArgs, tmpfile.Name())
mkfs := exec.Command("mkfs.ext4", mkfsArgs...)
err = mkfs.Run()

return err
Expand Down
Loading