shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-25 18:50:18 +03:00
Code

path: optionally, create watched directories in .path units

Browse Source
This commit is contained in:
Lennart Poettering 2011-04-10 01:30:14 +02:00
parent bfe95f35bf
commit 0e456f9781
11 changed files with 77 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TODO
View File

@ -13,14 +13,14 @@ F15:
* add fstab fields to add wait timeouts, change Wants to Requires by local-fs.target
* hook emergency.target into local-fs.target in some way as OnFailure with isolate, add warning log message
* bind mounts are ignored
https://bugzilla.redhat.com/show_bug.cgi?id=682662
* 0595f9a1c182a84581749823ef47c5f292e545f9 is borked, freezes shutdown
(path: after installing inotify watches, recheck file again to fix race)
* be nice to ingo
Features:
* fix alsa mixer restore to not print error when no config is stored
@ -95,8 +95,6 @@ Features:
about policy loading. Probably check for available selinux in /proc/filesystems,
and check for active selinux with getcon_raw() == "kernel"
* optionally create watched directories in .path units
* Support --test based on current system state
* consider services with no [Install] section and stored in /lib enabled by "systemctl is-enabled"

22
man/systemd.path.xml
View File

@ -168,6 +168,28 @@
identical, except for the
suffix.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>MakeDirectory=</varname></term>
<listitem><para>Takes a boolean
argument. If true the directories to
watch are created before
watching. This option is ignored for
<varname>PathExists=</varname>
settings. Defaults to
<option>false</option>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>DirectoryMode=</varname></term>
<listitem><para>If
<varname>MakeDirectory=</varname> is
enabled use the mode specified here to
create the directories in
question. Takes an access mode in
octal notation. Defaults to
<option>0755</option>.</para></listitem>
</varlistentry>
</variablelist>
</refsect1>

8
src/dbus-path.c
View File

@ -29,6 +29,8 @@
" <interface name=\"org.freedesktop.systemd1.Path\">\n" \
" <property name=\"Unit\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"Paths\" type=\"a(ss)\" access=\"read\"/>\n" \
" <property name=\"MakeDirectory\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"DirectoryMode\" type=\"u\" access=\"read\"/>\n" \
" </interface>\n"
#define INTROSPECTION \
@ -93,8 +95,10 @@ static int bus_path_append_unit(Manager *m, DBusMessageIter *i, const char *prop
DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
const BusProperty properties[] = {
BUS_UNIT_PROPERTIES,
{ "org.freedesktop.systemd1.Path", "Unit", bus_path_append_unit, "s", u },
{ "org.freedesktop.systemd1.Path", "Paths", bus_path_append_paths, "a(ss)", u },
{ "org.freedesktop.systemd1.Path", "Unit", bus_path_append_unit, "s", u },
{ "org.freedesktop.systemd1.Path", "Paths", bus_path_append_paths, "a(ss)", u },
{ "org.freedesktop.systemd1.Path", "MakeDirectory", bus_property_append_bool, "b", &u->path.make_directory },
{ "org.freedesktop.systemd1.Path", "DirectoryMode", bus_property_append_mode, "u", &u->path.directory_mode },
{ NULL, NULL, NULL, NULL, NULL }
};

2
src/load-fragment.c
View File

@ -1944,6 +1944,8 @@ static int load_from_path(Unit *u, const char *path) {
{ "PathChanged", config_parse_path_spec, 0, &u->path, "Path" },
{ "DirectoryNotEmpty", config_parse_path_spec, 0, &u->path, "Path" },
{ "Unit", config_parse_path_unit, 0, &u->path, "Path" },
{ "MakeDirectory", config_parse_bool, 0, &u->path.make_directory, "Path" },
{ "DirectoryMode", config_parse_mode, 0, &u->path.directory_mode, "Path" },
/* The [Install] section is ignored here. */
{ "Alias", NULL, 0, NULL, "Install" },

1
src/mount-setup.c
View File

@ -260,7 +260,6 @@ int mount_setup(void) {
/* Create a few directories we always want around */
mkdir("/run/systemd", 0755);
mkdir("/run/systemd/ask-password", 0755);
return mount_cgroup_controllers();
}

39
src/path.c
View File

@ -39,6 +39,15 @@ static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
[PATH_FAILED] = UNIT_FAILED
};
static void path_init(Unit *u) {
Path *p = PATH(u);
assert(u);
assert(u->meta.load_state == UNIT_STUB);
p->directory_mode = 0755;
}
static void path_unwatch_one(Path *p, PathSpec *s) {
if (s->inotify_fd < 0)
@ -169,9 +178,13 @@ static void path_dump(Unit *u, FILE *f, const char *prefix) {
fprintf(f,
"%sPath State: %s\n"
"%sUnit: %s\n",
"%sUnit: %s\n"
"%sMakeDirectory: %s\n"
"%sDirectoryMode: %04o\n",
prefix, path_state_to_string(p->state),
prefix, p->unit->meta.id);
prefix, p->unit->meta.id,
prefix, yes_no(p->make_directory),
prefix, p->directory_mode);
LIST_FOREACH(spec, s, p->specs)
fprintf(f,
@ -408,6 +421,25 @@ fail:
path_enter_dead(p, false);
}
static void path_mkdir(Path *p) {
PathSpec *s;
assert(p);
if (!p->make_directory)
return;
LIST_FOREACH(spec, s, p->specs) {
int r;
if (s->type == PATH_EXISTS)
continue;
if ((r = mkdir_p(s->path, p->directory_mode)) < 0)
log_warning("mkdir(%s) failed: %s", s->path, strerror(-r));
}
}
static int path_start(Unit *u) {
Path *p = PATH(u);
@ -417,6 +449,8 @@ static int path_start(Unit *u) {
if (p->unit->meta.load_state != UNIT_LOADED)
return -ENOENT;
path_mkdir(p);
p->failure = false;
path_enter_waiting(p, true, true, false);
@ -639,6 +673,7 @@ DEFINE_STRING_TABLE_LOOKUP(path_type, PathType);
const UnitVTable path_vtable = {
.suffix = ".path",
.init = path_init,
.done = path_done,
.load = path_load,

3
src/path.h
View File

@ -70,6 +70,9 @@ struct Path {
bool failure;
bool inotify_triggered;
bool make_directory;
mode_t directory_mode;
};
void path_unit_notify(Unit *u, UnitActiveState new_state);

2
tmpfiles.d/systemd.conf
View File

@ -21,3 +21,5 @@ d /var/cache/man - - - 30d
r /forcefsck
r /forcequotacheck
r /fastboot
d /run/systemd/ask-password 0755 root root -

1
units/systemd-ask-password-console.path
View File

@ -13,3 +13,4 @@ Before=basic.target shutdown.target
[Path]
DirectoryNotEmpty=/run/systemd/ask-password
MakeDirectory=yes

1
units/systemd-ask-password-plymouth.path
View File

@ -13,3 +13,4 @@ Before=basic.target shutdown.target
[Path]
DirectoryNotEmpty=/run/systemd/ask-password
MakeDirectory=yes

1
units/systemd-ask-password-wall.path
View File

@ -13,3 +13,4 @@ Before=basic.target shutdown.target
[Path]
DirectoryNotEmpty=/run/systemd/ask-password
MakeDirectory=yes