diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-03-03 16:29:50 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-03-03 16:29:50 +0100 |
| commit | 1a6f4df6c9437ed631080b7e006f666326063d36 (patch) | |
| tree | e31c6ceec9cb5e6fac75def731c9b80a67680bdd | |
| parent | fc7a744cc44cdb80bf9bc6304fc3f80ca2cb65f9 (diff) | |
dirent: support DT_UNKNOWN where necessary for compat with reiserfs
| -rw-r--r-- | TODO | 6 | ||||
| -rw-r--r-- | src/modules-load.c | 3 | ||||
| -rw-r--r-- | src/tmpfiles.c | 3 | ||||
| -rw-r--r-- | src/tty-ask-password-agent.c | 3 |
4 files changed, 13 insertions, 2 deletions
@@ -24,6 +24,12 @@ F15: Features: +* failure error string in "systemctl status" + +* send SIGCONT before SIGTERM + +* make sure timeouts are applied to Type=oneshot services. + * maybe implement "systemctl mask" and "systemctl unmask", but not document it? When doing that add switch to make this temporary by placing mask links in /dev. diff --git a/src/modules-load.c b/src/modules-load.c index 3e3ccb0c2f..2dd432695f 100644 --- a/src/modules-load.c +++ b/src/modules-load.c @@ -43,7 +43,8 @@ static int scandir_filter(const struct dirent *d) { return 0; if (d->d_type != DT_REG && - d->d_type != DT_LNK) + d->d_type != DT_LNK && + d->d_type != DT_UNKNOWN) return 0; return endswith(d->d_name, ".conf"); diff --git a/src/tmpfiles.c b/src/tmpfiles.c index 0c3b88d35b..68af37aab0 100644 --- a/src/tmpfiles.c +++ b/src/tmpfiles.c @@ -775,7 +775,8 @@ static int scandir_filter(const struct dirent *d) { return 0; if (d->d_type != DT_REG && - d->d_type != DT_LNK) + d->d_type != DT_LNK && + d->d_type != DT_UNKNOWN) return 0; return endswith(d->d_name, ".conf"); diff --git a/src/tty-ask-password-agent.c b/src/tty-ask-password-agent.c index a9d06ac001..35e4d63a8a 100644 --- a/src/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent.c @@ -507,6 +507,9 @@ static int show_passwords(void) { int q; char *wall; + /* We only support /dev on tmpfs, hence we can rely on + * d_type to be reliable */ + if (de->d_type != DT_REG) continue; |