containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12449 from vrothberg/fix-12438 

systemd: replace multi-user with default.target
This commit is contained in:
OpenShift Merge Robot 2021-11-30 17:09:33 +01:00 committed by GitHub
parent 771f8c628b 9a10e2124b
commit 3fac03cf04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/systemd/auto-update/podman-auto-update.service.in
View File

@ -10,4 +10,4 @@ ExecStart=@@PODMAN@@ auto-update
ExecStartPost=@@PODMAN@@ image prune -f ExecStartPost=@@PODMAN@@ image prune -f
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target

2
contrib/systemd/system/podman-restart.service.in
View File

@ -10,4 +10,4 @@ Environment=LOGGING="--log-level=info"
ExecStart=@@PODMAN@@ $LOGGING start --all --filter restart-policy=always ExecStart=@@PODMAN@@ $LOGGING start --all --filter restart-policy=always
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target

2
contrib/systemd/system/podman.service.in
View File

@ -12,4 +12,4 @@ Environment=LOGGING="--log-level=info"
ExecStart=@@PODMAN@@ $LOGGING system service ExecStart=@@PODMAN@@ $LOGGING system service
[Install] [Install]
WantedBy=multi-user.target WantedBy=default.target

6
docs/source/markdown/podman-generate-systemd.1.md
View File

@ -98,7 +98,7 @@ Type=forking
PIDFile=/run/user/1000/overlay-containers/de1e3223b1b888bc02d0962dd6cb5855eb00734061013ffdd3479d225abacdc6/userdata/conmon.pid PIDFile=/run/user/1000/overlay-containers/de1e3223b1b888bc02d0962dd6cb5855eb00734061013ffdd3479d225abacdc6/userdata/conmon.pid
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
``` ```
### Generate systemd unit file for a container with `--new` flag ### Generate systemd unit file for a container with `--new` flag
@ -130,7 +130,7 @@ KillMode=none
Type=forking Type=forking
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
``` ```
### Generate systemd unit files for a pod with two simple alpine containers ### Generate systemd unit files for a pod with two simple alpine containers
@ -169,7 +169,7 @@ Type=forking
PIDFile=/run/user/1000/overlay-containers/ccfd5c71a088768774ca7bd05888d55cc287698dde06f475c8b02f696a25adcd/userdata/conmon.pid PIDFile=/run/user/1000/overlay-containers/ccfd5c71a088768774ca7bd05888d55cc287698dde06f475c8b02f696a25adcd/userdata/conmon.pid
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
``` ```
### Installation of generated systemd unit files. ### Installation of generated systemd unit files.

4
pkg/machine/ignition.go
View File

@ -89,7 +89,7 @@ Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=/bin/sh -c '/usr/bin/echo Ready >/dev/%s' ExecStart=/bin/sh -c '/usr/bin/echo Ready >/dev/%s'
[Install] [Install]
RequiredBy=multi-user.target RequiredBy=default.target
` `
deMoby := `[Unit] deMoby := `[Unit]
Description=Remove moby-engine Description=Remove moby-engine
@ -106,7 +106,7 @@ ExecStart=/usr/bin/rpm-ostree ex apply-live --allow-replacement
ExecStartPost=/bin/touch /var/lib/%N.stamp ExecStartPost=/bin/touch /var/lib/%N.stamp
[Install] [Install]
WantedBy=multi-user.target WantedBy=default.target
` `
_ = ready _ = ready
ignSystemd := Systemd{ ignSystemd := Systemd{

2
pkg/systemd/generate/containers.go
View File

@ -134,7 +134,7 @@ NotifyAccess={{{{.NotifyAccess}}}}
{{{{- end}}}} {{{{- end}}}}
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
// ContainerUnit generates a systemd unit for the specified container. Based // ContainerUnit generates a systemd unit for the specified container. Based

40
pkg/systemd/generate/containers_test.go
View File

@ -62,7 +62,7 @@ PIDFile=/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e
Type=forking Type=forking
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodID := serviceInfo + headerInfo + goodIDContent goodID := serviceInfo + headerInfo + goodIDContent
goodIDNoHeaderInfo := serviceInfo + goodIDContent goodIDNoHeaderInfo := serviceInfo + goodIDContent
@ -88,7 +88,7 @@ PIDFile=/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e
Type=forking Type=forking
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodNameBoundTo := `# container-foobar.service goodNameBoundTo := `# container-foobar.service
@ -114,7 +114,7 @@ PIDFile=/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e
Type=forking Type=forking
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodWithNameAndGeneric := `# jadda-jadda.service goodWithNameAndGeneric := `# jadda-jadda.service
@ -139,7 +139,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodWithNameAndSdnotify := `# jadda-jadda.service goodWithNameAndSdnotify := `# jadda-jadda.service
@ -164,7 +164,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodWithExplicitShortDetachParam := `# jadda-jadda.service goodWithExplicitShortDetachParam := `# jadda-jadda.service
@ -189,7 +189,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodNameNewWithPodFile := `# jadda-jadda.service goodNameNewWithPodFile := `# jadda-jadda.service
@ -214,7 +214,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodNameNewDetach := `# jadda-jadda.service goodNameNewDetach := `# jadda-jadda.service
@ -239,7 +239,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodIDNew := `# container-639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401.service goodIDNew := `# container-639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401.service
@ -264,7 +264,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
genGoodNewDetach := func(detachparam string) string { genGoodNewDetach := func(detachparam string) string {
@ -292,7 +292,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
return goodNewDetach return goodNewDetach
} }
@ -319,7 +319,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodNewRootFlags := `# jadda-jadda.service goodNewRootFlags := `# jadda-jadda.service
@ -344,7 +344,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodContainerCreate := `# jadda-jadda.service goodContainerCreate := `# jadda-jadda.service
@ -369,7 +369,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodNewWithJournaldTag := `# jadda-jadda.service goodNewWithJournaldTag := `# jadda-jadda.service
@ -394,7 +394,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodNewWithSpecialChars := `# jadda-jadda.service goodNewWithSpecialChars := `# jadda-jadda.service
@ -419,7 +419,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodNewWithIDFiles := `# jadda-jadda.service goodNewWithIDFiles := `# jadda-jadda.service
@ -444,7 +444,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodNewWithPodIDFiles := `# jadda-jadda.service goodNewWithPodIDFiles := `# jadda-jadda.service
@ -469,7 +469,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodNewWithEnvar := `# jadda-jadda.service goodNewWithEnvar := `# jadda-jadda.service
@ -495,7 +495,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
goodNewWithRestartPolicy := `# jadda-jadda.service goodNewWithRestartPolicy := `# jadda-jadda.service
@ -521,7 +521,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
templateGood := `# container-foo@.service templateGood := `# container-foo@.service
@ -547,7 +547,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
tests := []struct { tests := []struct {
name string name string

2
pkg/systemd/generate/pods.go
View File

@ -103,7 +103,7 @@ PIDFile={{{{.PIDFile}}}}
Type=forking Type=forking
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
// PodUnits generates systemd units for the specified pod and its containers. // PodUnits generates systemd units for the specified pod and its containers.

10
pkg/systemd/generate/pods_test.go
View File

@ -62,7 +62,7 @@ PIDFile=/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e
Type=forking Type=forking
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
podGood := serviceInfo + headerInfo + podContent podGood := serviceInfo + headerInfo + podContent
podGoodNoHeaderInfo := serviceInfo + podContent podGoodNoHeaderInfo := serviceInfo + podContent
@ -92,7 +92,7 @@ PIDFile=%t/pod-123abc.pid
Type=forking Type=forking
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
podGoodNamedNewWithRootArgs := `# pod-123abc.service podGoodNamedNewWithRootArgs := `# pod-123abc.service
@ -120,7 +120,7 @@ PIDFile=%t/pod-123abc.pid
Type=forking Type=forking
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
podGoodNamedNewWithReplaceFalse := `# pod-123abc.service podGoodNamedNewWithReplaceFalse := `# pod-123abc.service
@ -148,7 +148,7 @@ PIDFile=%t/pod-123abc.pid
Type=forking Type=forking
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
podNewLabelWithCurlyBraces := `# pod-123abc.service podNewLabelWithCurlyBraces := `# pod-123abc.service
@ -176,7 +176,7 @@ PIDFile=%t/pod-123abc.pid
Type=forking Type=forking
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
` `
tests := []struct { tests := []struct {

2
test/e2e/systemd_test.go
View File

@ -35,7 +35,7 @@ ExecStart=/usr/bin/podman start -a redis
ExecStop=/usr/bin/podman stop -t 10 redis ExecStop=/usr/bin/podman stop -t 10 redis
KillMode=process KillMode=process
[Install] [Install]
WantedBy=multi-user.target WantedBy=default.target
` `
}) })

11
test/system/250-systemd.bats
View File

@ -34,6 +34,12 @@ function service_setup() {
systemctl daemon-reload systemctl daemon-reload
# Also test enabling services (see #12438).
run systemctl enable "$SERVICE_NAME"
if [ $status -ne 0 ]; then
die "Error enabling systemd unit $SERVICE_NAME, output: $output"
fi
run systemctl start "$SERVICE_NAME" run systemctl start "$SERVICE_NAME"
if [ $status -ne 0 ]; then if [ $status -ne 0 ]; then
die "Error starting systemd unit $SERVICE_NAME, output: $output" die "Error starting systemd unit $SERVICE_NAME, output: $output"
@ -53,6 +59,11 @@ function service_cleanup() {
die "Error stopping systemd unit $SERVICE_NAME, output: $output" die "Error stopping systemd unit $SERVICE_NAME, output: $output"
fi fi
run systemctl disable "$SERVICE_NAME"
if [ $status -ne 0 ]; then
die "Error disbling systemd unit $SERVICE_NAME, output: $output"
fi
if [[ -z "$status" ]]; then if [[ -z "$status" ]]; then
run systemctl is-active "$SERVICE_NAME" run systemctl is-active "$SERVICE_NAME"
if [ $status -ne 0 ]; then if [ $status -ne 0 ]; then

2
test/system/255-auto-update.bats
View File

@ -366,7 +366,7 @@ Type=oneshot
ExecStart=/usr/bin/podman auto-update ExecStart=/usr/bin/podman auto-update
[Install] [Install]
WantedBy=multi-user.target default.target WantedBy=default.target
EOF EOF
echo "podman-auto-update-$cname" >> $SNAME_FILE echo "podman-auto-update-$cname" >> $SNAME_FILE

8
troubleshooting.md
View File

@ -767,7 +767,7 @@ Type=simple
ExecStart=/bin/bash -c '/bin/busctl monitor --system --match "interface=org.fedoraproject.FirewallD1,member=Reloaded" --match "interface=org.fedoraproject.FirewallD1,member=PropertiesChanged" | while read -r line ; do podman network reload --all ; done' ExecStart=/bin/bash -c '/bin/busctl monitor --system --match "interface=org.fedoraproject.FirewallD1,member=Reloaded" --match "interface=org.fedoraproject.FirewallD1,member=PropertiesChanged" | while read -r line ; do podman network reload --all ; done'
[Install] [Install]
WantedBy=multi-user.target WantedBy=default.target
``` ```
2) For "systemctl restart firewalld", create a systemd unit file with the following 2) For "systemctl restart firewalld", create a systemd unit file with the following
``` ```
@ -783,7 +783,7 @@ RemainAfterExit=yes
ExecStart=/usr/bin/podman network reload --all ExecStart=/usr/bin/podman network reload --all
[Install] [Install]
WantedBy=multi-user.target WantedBy=default.target
``` ```
However, If you use busctl monitor then you can't get machine-readable output on `RHEL 8`. However, If you use busctl monitor then you can't get machine-readable output on `RHEL 8`.
Since it doesn't have `busctl -j` as mentioned here by [@yrro](https://github.com/containers/podman/issues/5431#issuecomment-896943018). Since it doesn't have `busctl -j` as mentioned here by [@yrro](https://github.com/containers/podman/issues/5431#issuecomment-896943018).
@ -802,7 +802,7 @@ ExecStart=/bin/bash -c "dbus-monitor --profile --system 'type=signal,sender=org.
Restart=Always Restart=Always
[Install] [Install]
WantedBy=multi-user.target WantedBy=default.target
``` ```
`busctl-monitor` is almost usable in `RHEL 8`, except that it always outputs two bogus events when it starts up, `busctl-monitor` is almost usable in `RHEL 8`, except that it always outputs two bogus events when it starts up,
one of which is (in its only machine-readable format) indistinguishable from the `NameOwnerChanged` that you get when firewalld starts up. one of which is (in its only machine-readable format) indistinguishable from the `NameOwnerChanged` that you get when firewalld starts up.
@ -823,7 +823,7 @@ ExecStart=/usr/bin/python /path/to/python/code/podman-redo-nat.py
Restart=always Restart=always
[Install] [Install]
WantedBy=multi-user.target WantedBy=default.target
``` ```
The code reloads podman network twice when you use `systemctl restart firewalld`. The code reloads podman network twice when you use `systemctl restart firewalld`.
``` ```