picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

binfmt, modules-load, sysctl, tmpfiles: add missing ConditionDirectoryNotEmpty=

This commit is contained in:
Kay Sievers 2011-04-30 23:08:15 +02:00
parent 223a355816
commit adf70c5e4e
7 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TODO
View File

@ -35,11 +35,10 @@ Features:
* add inode stat() check to readahead to suppress preloading changed files
* include /usr/local/lib/tmpfiles.d in tmpfiles tool as search path
(and prefix/lib, in case it isn't one of the listed ones)
* POSIX mqueue support in .socket units
* allow list of pathes in config_parse_condition_path()
* introduce dbus calls for enabling/disabling a service
* support notifications for services being enabled/disabled

2
src/path-lookup.c
View File

@ -190,9 +190,7 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
"/run/systemd/system",
SYSTEM_CONFIG_UNIT_PATH,
"/etc/systemd/system",
"/usr/local/share/systemd/system",
"/usr/local/lib/systemd/system",
"/usr/share/systemd/system",
"/usr/lib/systemd/system",
"/lib/systemd/system",
SYSTEM_DATA_UNIT_PATH,

5
units/systemd-binfmt.service.in
View File

@ -11,7 +11,10 @@ DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount
Before=sysinit.target shutdown.target
ConditionDirectoryNotEmpty=/etc/binfmt.d
ConditionDirectoryNotEmpty=|/usr/lib/binfmt.d
ConditionDirectoryNotEmpty=|/usr/local/lib/binfmt.d
ConditionDirectoryNotEmpty=|/etc/binfmt.d
ConditionDirectoryNotEmpty=|/run/binfmt.d
[Service]
Type=oneshot

6
units/systemd-modules-load.service.in
View File

@ -11,7 +11,11 @@ DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service
Before=sysinit.target shutdown.target
ConditionDirectoryNotEmpty=/etc/modules-load.d
ConditionDirectoryNotEmpty=|/lib/modules-load.d
ConditionDirectoryNotEmpty=|/usr/lib/modules-load.d
ConditionDirectoryNotEmpty=|/usr/local/lib/modules-load.d
ConditionDirectoryNotEmpty=|/etc/modules-load.d
ConditionDirectoryNotEmpty=|/run/modules-load.d
[Service]
Type=oneshot

4
units/systemd-sysctl.service.in
View File

@ -12,7 +12,11 @@ Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service
Before=sysinit.target shutdown.target
ConditionPathExists=|/etc/sysctl.conf
ConditionDirectoryNotEmpty=|/lib/sysctl.d
ConditionDirectoryNotEmpty=|/usr/lib/sysctl.d
ConditionDirectoryNotEmpty=|/usr/local/lib/sysctl.d
ConditionDirectoryNotEmpty=|/etc/sysctl.d
ConditionDirectoryNotEmpty=|/run/sysctl.d
[Service]
Type=oneshot

5
units/systemd-tmpfiles-clean.service.in
View File

@ -11,7 +11,10 @@ DefaultDependencies=no
Wants=local-fs.target
After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
Before=sysinit.target shutdown.target
ConditionPathExists=/etc/tmpfiles.d
ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d
ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d
ConditionDirectoryNotEmpty=|/etc/tmpfiles.d
ConditionDirectoryNotEmpty=|/run/tmpfiles.d
[Service]
Type=oneshot

5
units/systemd-tmpfiles-setup.service.in
View File

@ -11,7 +11,10 @@ DefaultDependencies=no
Wants=local-fs.target
After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
Before=sysinit.target shutdown.target
ConditionPathExists=/etc/tmpfiles.d
ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d
ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d
ConditionDirectoryNotEmpty=|/etc/tmpfiles.d
ConditionDirectoryNotEmpty=|/run/tmpfiles.d
[Service]
Type=oneshot