dirent: support DT_UNKNOWN where necessary for compat with reiserfs

diff --git a/TODO b/TODO
index a7ff18ab97241ceb28dae3c52874ea24e2589a06..d94cc2342a67181222b47ecefd9c4a2f9e384fff 100644 (file)
--- 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 3e3ccb0c2f2f188b3939497b8d0b1db091b57aa1..2dd432695f5f4c028264cd111b5f5912cfcbb567 100644 (file)
--- 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 0c3b88d35b19a1aaf56247802e95b88665911c7c..68af37aab0eb43f27edb0fb3062a0ff08cbebb3d 100644 (file)
--- 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 a9d06ac001943c63693b6bf453552a04268721a7..35e4d63a8a4b7980e2ec247b4384ccf00251cb3c 100644 (file)
--- 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;