opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-29 01:28:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

pkg/machine: make mount units hook into local-fs

Browse Source 
The virtiofs mount points do not actually are network mounts so we can
mount them earlier and using multi-user.target to enable them was wrong.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-11-25 17:53:53 +01:00
parent 90a03ca080
commit 200030914f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/machine/apple/apple.go
View File

@@ -78,7 +78,7 @@ func GenerateSystemDFilesForVirtiofsMounts(mounts []machine.VirtIoFs) ([]ignitio
mountUnit.Add("Mount", "Where", "%s") mountUnit.Add("Mount", "Where", "%s")
mountUnit.Add("Mount", "Type", "virtiofs") mountUnit.Add("Mount", "Type", "virtiofs")
mountUnit.Add("Mount", "Options", fmt.Sprintf("context=\"%s\"", machine.NFSSELinuxContext)) mountUnit.Add("Mount", "Options", fmt.Sprintf("context=\"%s\"", machine.NFSSELinuxContext))
mountUnit.Add("Install", "WantedBy", "multi-user.target") mountUnit.Add("Install", "WantedBy", "local-fs.target")
mountUnitFile, err := mountUnit.ToString() mountUnitFile, err := mountUnit.ToString()
if err != nil { if err != nil {
return nil, err return nil, err
@@ -102,7 +102,7 @@ func GenerateSystemDFilesForVirtiofsMounts(mounts []machine.VirtIoFs) ([]ignitio
immutableRootOff.Add("Service", "Type", "oneshot") immutableRootOff.Add("Service", "Type", "oneshot")
immutableRootOff.Add("Service", "ExecStart", "chattr -i /") immutableRootOff.Add("Service", "ExecStart", "chattr -i /")
immutableRootOff.Add("Install", "WantedBy", "remote-fs-pre.target") immutableRootOff.Add("Install", "WantedBy", "local-fs-pre.target")
immutableRootOffFile, err := immutableRootOff.ToString() immutableRootOffFile, err := immutableRootOff.ToString()
if err != nil { if err != nil {
return nil, err return nil, err
@@ -118,12 +118,12 @@ func GenerateSystemDFilesForVirtiofsMounts(mounts []machine.VirtIoFs) ([]ignitio
immutableRootOn := parser.NewUnitFile() immutableRootOn := parser.NewUnitFile()
immutableRootOn.Add("Unit", "Description", "Set / back to immutable after mounts are done") immutableRootOn.Add("Unit", "Description", "Set / back to immutable after mounts are done")
immutableRootOn.Add("Unit", "DefaultDependencies", "no") immutableRootOn.Add("Unit", "DefaultDependencies", "no")
immutableRootOn.Add("Unit", "After", "remote-fs.target") immutableRootOn.Add("Unit", "After", "local-fs.target")
immutableRootOn.Add("Service", "Type", "oneshot") immutableRootOn.Add("Service", "Type", "oneshot")
immutableRootOn.Add("Service", "ExecStart", "chattr +i /") immutableRootOn.Add("Service", "ExecStart", "chattr +i /")
immutableRootOn.Add("Install", "WantedBy", "remote-fs.target") immutableRootOn.Add("Install", "WantedBy", "local-fs.target")
immutableRootOnFile, err := immutableRootOn.ToString() immutableRootOnFile, err := immutableRootOn.ToString()
if err != nil { if err != nil {
return nil, err return nil, err