From: Lennart Poettering Date: Thu, 3 Mar 2011 15:29:50 +0000 (+0100) Subject: dirent: support DT_UNKNOWN where necessary for compat with reiserfs X-Git-Tag: v20~35 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1a6f4df6c9437ed631080b7e006f666326063d36;hp=fc7a744cc44cdb80bf9bc6304fc3f80ca2cb65f9 dirent: support DT_UNKNOWN where necessary for compat with reiserfs --- diff --git a/TODO b/TODO index a7ff18ab9..d94cc2342 100644 --- a/TODO +++ b/TODO @@ -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 3e3ccb0c2..2dd432695 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 0c3b88d35..68af37aab 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 a9d06ac00..35e4d63a8 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;