summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-04-27 17:25:57 +0200
committerLennart Poettering <lennart@poettering.net>2015-04-27 17:25:57 +0200
commit329c542585cd92cb905990e3bf59eda16fd88cfb (patch)
treedc5c69c8f8caa7e2e4744c856824290890cb628f
parentupdate-done: minor simplification (diff)
downloadsystemd-329c542585cd92cb905990e3bf59eda16fd88cfb.tar.xz
systemd-329c542585cd92cb905990e3bf59eda16fd88cfb.zip
update-done: ignore nanosecond file timestamp components, they are not reliable
https://bugs.freedesktop.org/show_bug.cgi?id=90192
-rw-r--r--src/update-done/update-done.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
index fb7ff988bb..01bbde8455 100644
--- a/src/update-done/update-done.c
+++ b/src/update-done/update-done.c
@@ -38,9 +38,15 @@ static int apply_timestamp(const char *path, struct timespec *ts) {
assert(ts);
if (stat(path, &st) >= 0) {
- /* Is the timestamp file already newer than the OS? If so, there's nothing to do. */
- if (st.st_mtim.tv_sec > ts->tv_sec ||
- (st.st_mtim.tv_sec == ts->tv_sec && st.st_mtim.tv_nsec >= ts->tv_nsec))
+ /* Is the timestamp file already newer than the OS? If
+ * so, there's nothing to do. We ignore the nanosecond
+ * component of the timestamp, since some file systems
+ * do not support any better accuracy than 1s and we
+ * have no way to identify the accuracy
+ * available. Most notably ext4 on small disks (where
+ * 128 byte inodes are used) does not support better
+ * accuracy than 1s. */
+ if (st.st_mtim.tv_sec > ts->tv_sec)
return 0;
/* It is older? Then let's update it */