shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-18 06:03:42 +03:00
Code

units: make sure systemd-tmpfiles-{setup,clean} don't survive switch-root

Browse Source 
Normally, these services are killed because we run isolate. But I booted into
emergency mode (because of a futher bug with us timing out improperly on the
luks password prompt), and then continuted to the host system by running
'systemctl start systemd-switch-root.service'. My error, but the results are
confusing and bad: systemd in the host sees 'systemd-tmpfiles-setup.service'
as started successfully, and doesn't restart it, so the setup for /tmp/.X11 is
not done and gdm.service fails. So while we wouldn't encounter this during
normal successful boot, I think it's good to make this more robust.

The dep is added to systemd-tmpfiles-{setup,clean}, because /tmp is not
propagated over switch-root. /dev is, so I didn't touch
systemd-tmpfiles-setup-dev.service.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-08-05 13:22:58 +02:00 committed by Luca Boccassi
parent 32a2ee2bb4
commit 2525682565
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
units/systemd-tmpfiles-clean.service
View File

@ -11,7 +11,7 @@
Description=Cleanup of Temporary Directories Description=Cleanup of Temporary Directories
Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target initrd-switch-root.service
After=local-fs.target time-set.target After=local-fs.target time-set.target
Before=shutdown.target Before=shutdown.target

2
units/systemd-tmpfiles-setup.service
View File

@ -11,7 +11,7 @@
Description=Create Volatile Files and Directories Description=Create Volatile Files and Directories
Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target initrd-switch-root.service
After=local-fs.target systemd-sysusers.service systemd-journald.service After=local-fs.target systemd-sysusers.service systemd-journald.service
Before=sysinit.target shutdown.target Before=sysinit.target shutdown.target
RefuseManualStop=yes RefuseManualStop=yes