particle-os/debian-forge-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bib: tweak EnsureEnvironment() based on the feedback from Colin

Browse source
This commit is contained in:
Michael Vogt 2024-03-06 16:01:10 +01:00 • committed by Simon de Vlieger
parent 4fa198c18d
commit 1ea8e87fad
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
bib/internal/setup/setup.go
View file

@ -48,18 +48,19 @@ func EnsureEnvironment() error {
if err := util.RunCmdSync("chcon", installType, destPath); err != nil { if err := util.RunCmdSync("chcon", installType, destPath); err != nil {
return err return err
} }
// Ensure we have devfs inside the container to get dynamic loop
// loop devices inside the container.
if err := util.RunCmdSync("mount", "-t", "devtmpfs", "devtmpfs", "/dev"); err != nil {
return err
}
// Create a bind mount into our target location; we can't copy it because // Create a bind mount into our target location; we can't copy it because
// again we have to perserve the SELinux label. // again we have to perserve the SELinux label.
if err := util.RunCmdSync("mount", "--bind", destPath, osbuildPath); err != nil { if err := util.RunCmdSync("mount", "--bind", destPath, osbuildPath); err != nil {
return err return err
} }
// NOTE: Don't add new code here, do it before the bind mount which acts as the final success indicator
// Ensure we have devfs inside the container to get dynamic loop
// loop devices inside the container.
devMnt := "/dev/"
if err := util.RunCmdSync("mount", "-t", "devtmpfs", "devtmpfs", devMnt); err != nil {
return err
}
return nil return nil
} }