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

Merge pull request #21175 from baude/consolidateIgnitionReadySocket

Browse Source 
consolidate ignition ready socket unit
This commit is contained in:
openshift-merge-bot[bot]
2024-01-06 11:18:57 +00:00
committed by GitHub
parent 8b6d2a6d93 a0a541351d
commit 1697a8bfcf
4 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/machine/qemu/machine.go
View File

@ -215,7 +215,7 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
return false, err
}
readyUnitFile, err := createReadyUnitFile()
readyUnitFile, err := ignition.CreateReadyUnitFile(define.QemuVirt, nil)
if err != nil {
return false, err
}
@ -232,14 +232,6 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
return err == nil, err
}
func createReadyUnitFile() (string, error) {
readyUnit := ignition.DefaultReadyUnitFile()
readyUnit.Add("Unit", "Requires", "dev-virtio\\x2dports-vport1p1.device")
readyUnit.Add("Unit", "After", "systemd-user-sessions.service")
readyUnit.Add("Service", "ExecStart", "/bin/sh -c '/usr/bin/echo Ready >/dev/vport1p1'")
return readyUnit.ToString()
}
func (v *MachineVM) removeSystemConnections() error {
return machine.RemoveConnections(v.Name, fmt.Sprintf("%s-root", v.Name))
}