summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--THANKS.in1
-rw-r--r--src/stat.c5
3 files changed, 8 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 8c75a3291..be98796c4 100644
--- a/NEWS
+++ b/NEWS
@@ -25,13 +25,13 @@ GNU coreutils NEWS -*- outline -*-
in all situations on GNU/Linux, by correctly determining the block size.
[df bug since coreutils-5.0.91, stat bug since the initial implementation]
- tail -f no longer tries to use inotify on PanFS file systems
+ tail -f no longer tries to use inotify on AUFS or PanFS file systems
[you might say this was introduced in coreutils-7.5, along with inotify
support, but even now, its magic number isn't in the usual place.]
** New features
- stat -f recognizes the new remote file system type, panfs.
+ stat -f recognizes the new remote file system types: aufs, panfs.
** Changes in behavior
diff --git a/THANKS.in b/THANKS.in
index 2bdeab5e3..28735948f 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -422,6 +422,7 @@ Michael J. Croghan mcroghan@usatoday.com
Michael J. Daniel michael.j.daniel@comcast.net
Michael McFarland sidlon@yahoo.com
Michael McLagan mmclagan@invlogic.com
+Michael Mol mikemol@gmail.com
Michael Piefel piefel@informatik.hu-berlin.de
Michael Steffens michael.steffens@s.netic.de
Michael Stutz stutz@dsl.org
diff --git a/src/stat.c b/src/stat.c
index 94b63f61d..e56f1ffbc 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -249,6 +249,11 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
return "afs";
case S_MAGIC_ANON_INODE_FS: /* 0x09041934 local */
return "anon-inode FS";
+ case S_MAGIC_AUFS: /* 0x61756673 remote */
+ /* FIXME: change syntax or add an optional attribute like "inotify:no".
+ The above is labeled as "remote" so that tail always uses polling,
+ but this isn't really a remote file system type. */
+ return "aufs";
case S_MAGIC_AUTOFS: /* 0x0187 local */
return "autofs";
case S_MAGIC_BEFS: /* 0x42465331 local */