[systemd-commits] 3 commits - TODO src/update-done

[Lennart Poettering]

 TODO                          |    8 ++++++++
 src/update-done/update-done.c |   23 +++++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)

New commits:
commit 329c542585cd92cb905990e3bf59eda16fd88cfb
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Apr 27 17:25:57 2015 +0200

    update-done: ignore nanosecond file timestamp components, they are not reliable
    
    https://bugs.freedesktop.org/show_bug.cgi?id=90192

diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
index fb7ff98..01bbde8 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 */

commit 0a2f9085e29c855ec1aaa996ded00fc36b06210c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Apr 27 17:22:55 2015 +0200

    update-done: minor simplification

diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
index 44caf84..fb7ff98 100644
--- a/src/update-done/update-done.c
+++ b/src/update-done/update-done.c
@@ -28,7 +28,10 @@
         "was updated. See systemd-update-done.service(8).\n"
 
 static int apply_timestamp(const char *path, struct timespec *ts) {
-        struct timespec twice[2];
+        struct timespec twice[2] = {
+                *ts,
+                *ts
+        };
         struct stat st;
 
         assert(path);
@@ -41,9 +44,6 @@ static int apply_timestamp(const char *path, struct timespec *ts) {
                         return 0;
 
                 /* It is older? Then let's update it */
-                twice[0] = *ts;
-                twice[1] = *ts;
-
                 if (utimensat(AT_FDCWD, path, twice, AT_SYMLINK_NOFOLLOW) < 0) {
 
                         if (errno == EROFS)
@@ -74,9 +74,6 @@ static int apply_timestamp(const char *path, struct timespec *ts) {
 
                 (void) loop_write(fd, MESSAGE, strlen(MESSAGE), false);
 
-                twice[0] = *ts;
-                twice[1] = *ts;
-
                 if (futimens(fd, twice) < 0)
                         return log_error_errno(errno, "Failed to update timestamp on %s: %m", path);
         } else

commit d72bc5973465018e077fcecdcc720840bc1e9cfd
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Apr 27 17:22:30 2015 +0200

    update TODO

diff --git a/TODO b/TODO
index 48ecd06..a5211c5 100644
--- a/TODO
+++ b/TODO
@@ -46,6 +46,14 @@ Before 220:
 
 Features:
 
+* journalctl: -m should access container journals directly by enumerating them via machined, and also watch containers coming and going. Benefit: nspawn --ephemeral would start working nicely with the journal.
+
+* nspawn: don't copy /etc/resolv.conf from host into container unless we are in shared-network mode
+
+* nspawn: optionally automatically add FORWARD rules to iptables whenever nspawn is running, remove them when shut down.
+
+* importd: generate a nice warning if mkfs.btrfs is missing
+
 * nspawn: add a logic for cleaning up read-only, hidden container images in /var/lib/machines that are not ancestors of any non-hidden containers
 
 * nspawn: Improve error message when --bind= is used on a non-existing source directory