mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-21 09:33:57 +03:00
units: skip some units in the initrd
I'm working on building initramfs images directly from normal packages, and it doesn't make sense for those units to be started. Pristine system rpms need to behave correctly as much as possible also in the initrd, and those units are enabled by the rpms. There usually isn't enough time for the timer to actually fire, but starting it gives a line on the console and generally looks confusing and sloppy. Flushing the journal means that its actually lost, since the real /var is not available yet. Another approach would be not enable those units, but right now they are statically enabled, and changing that would be more work, and doesn't really seem necessary, since the condition checks are very quick. Checking for /etc/initrd-release is the standard condition that the initrd units use, so let's do the same here.
This commit is contained in:
parent
0557680919
commit
fe7f113c13
@ -15,6 +15,7 @@ Requires=systemd-journald.service
|
||||
After=systemd-journald.service systemd-remount-fs.service
|
||||
Before=systemd-tmpfiles-setup.service
|
||||
RequiresMountsFor=/var/log/journal
|
||||
ConditionPathExists=!/etc/initrd-release
|
||||
|
||||
[Service]
|
||||
ExecStart=journalctl --flush
|
||||
|
@ -17,6 +17,7 @@ After=systemd-remount-fs.service
|
||||
Before=first-boot-complete.target shutdown.target
|
||||
Wants=first-boot-complete.target
|
||||
ConditionVirtualization=!container
|
||||
ConditionPathExists=!/etc/initrd-release
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
|
@ -10,6 +10,7 @@
|
||||
[Unit]
|
||||
Description=Daily Cleanup of Temporary Directories
|
||||
Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
|
||||
ConditionPathExists=!/etc/initrd-release
|
||||
|
||||
[Timer]
|
||||
OnBootSec=15min
|
||||
|
Loading…
Reference in New Issue
Block a user