X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnspawn%2Fnspawn.c;h=d181e3b338564c76de9caa57832fdb991005fb85;hp=770019bb8a4e2740bd43cb953d51bba3322f38d8;hb=d40361453be0525a0455d549b2b863931b069358;hpb=ede89845a49c735fa9e8a04bd80f6e94ea84aeb9

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 770019bb8..d181e3b33 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -46,6 +46,7 @@
 #include "log.h"
 #include "util.h"
 #include "mkdir.h"
+#include "macro.h"
 #include "audit.h"
 #include "missing.h"
 #include "cgroup-util.h"
@@ -283,9 +284,9 @@ static int mount_all(const char *dest) {
 
         unsigned k;
         int r = 0;
-        char *where;
 
         for (k = 0; k < ELEMENTSOF(mount_table); k++) {
+                char _cleanup_free_ *where = NULL;
                 int t;
 
                 if (asprintf(&where, "%s/%s", dest, mount_table[k].where) < 0) {
@@ -300,7 +301,6 @@ static int mount_all(const char *dest) {
                 t = path_is_mount_point(where, true);
                 if (t < 0) {
                         log_error("Failed to detect whether %s is a mount point: %s", where, strerror(-t));
-                        free(where);
 
                         if (r == 0)
                                 r = t;
@@ -326,36 +326,67 @@ static int mount_all(const char *dest) {
                         if (r == 0)
                                 r = -errno;
                 }
-
-                free(where);
         }
 
         return r;
 }
 
 static int setup_timezone(const char *dest) {
-        char *where;
+        _cleanup_free_ char *where = NULL, *p = NULL, *q = NULL, *check = NULL, *what = NULL;
+        char *z, *y;
+        int r;
 
         assert(dest);
 
         /* Fix the timezone, if possible */
+        r = readlink_malloc("/etc/localtime", &p);
+        if (r < 0) {
+                log_warning("/etc/localtime is not a symlink, not updating container timezone.");
+                return 0;
+        }
+
+        z = path_startswith(p, "../usr/share/zoneinfo/");
+        if (!z)
+                z = path_startswith(p, "/usr/share/zoneinfo/");
+        if (!z) {
+                log_warning("/etc/localtime does not point into /usr/share/zoneinfo/, not updating container timezone.");
+                return 0;
+        }
+
         where = strappend(dest, "/etc/localtime");
         if (!where)
                 return log_oom();
 
-        if (mount("/etc/localtime", where, "bind", MS_BIND, NULL) >= 0)
-                mount("/etc/localtime", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
+        r = readlink_malloc(where, &q);
+        if (r >= 0) {
+                y = path_startswith(q, "../usr/share/zoneinfo/");
+                if (!y)
+                        y = path_startswith(q, "/usr/share/zoneinfo/");
 
-        free(where);
 
-        where = strappend(dest, "/etc/timezone");
-        if (!where)
+                /* Already pointing to the right place? Then do nothing .. */
+                if (y && streq(y, z))
+                        return 0;
+        }
+
+        check = strjoin(dest, "/usr/share/zoneinfo/", z, NULL);
+        if (!check)
                 return log_oom();
 
-        if (mount("/etc/timezone", where, "bind", MS_BIND, NULL) >= 0)
-                mount("/etc/timezone", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
+        if (access(check, F_OK) < 0) {
+                log_warning("Timezone %s does not exist in container, not updating container timezone.", z);
+                return 0;
+        }
 
-        free(where);
+        what = strappend("../usr/share/zoneinfo/", z);
+        if (!what)
+                return log_oom();
+
+        unlink(where);
+        if (symlink(what, where) < 0) {
+                log_error("Failed to correct timezone of container: %m");
+                return 0;
+        }
 
         return 0;
 }
@@ -382,7 +413,7 @@ static int setup_resolv_conf(const char *dest) {
 }
 
 static int setup_boot_id(const char *dest) {
-        char *from = NULL, *to = NULL;
+        char _cleanup_free_ *from = NULL, *to = NULL;
         sd_id128_t rnd;
         char as_uuid[37];
         int r;
@@ -393,21 +424,14 @@ static int setup_boot_id(const char *dest) {
          * the container gets a new one */
 
         from = strappend(dest, "/dev/proc-sys-kernel-random-boot-id");
-        if (!from) {
-                r = log_oom();
-                goto finish;
-        }
-
         to = strappend(dest, "/proc/sys/kernel/random/boot_id");
-        if (!to) {
-                r = log_oom();
-                goto finish;
-        }
+        if (!from || !to)
+                return log_oom();
 
         r = sd_id128_randomize(&rnd);
         if (r < 0) {
                 log_error("Failed to generate random boot id: %s", strerror(-r));
-                goto finish;
+                return r;
         }
 
         snprintf(as_uuid, sizeof(as_uuid),
@@ -418,7 +442,7 @@ static int setup_boot_id(const char *dest) {
         r = write_one_line_file(from, as_uuid);
         if (r < 0) {
                 log_error("Failed to write boot id: %s", strerror(-r));
-                goto finish;
+                return r;
         }
 
         if (mount(from, to, "bind", MS_BIND, NULL) < 0) {
@@ -428,11 +452,6 @@ static int setup_boot_id(const char *dest) {
                 mount(from, to, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
 
         unlink(from);
-
-finish:
-        free(from);
-        free(to);
-
         return r;
 }
 
@@ -449,7 +468,7 @@ static int copy_devnodes(const char *dest) {
 
         const char *d;
         int r = 0;
-        mode_t u;
+        mode_t _cleanup_umask_ u;
 
         assert(dest);
 
@@ -457,18 +476,13 @@ static int copy_devnodes(const char *dest) {
 
         NULSTR_FOREACH(d, devnodes) {
                 struct stat st;
-                char *from = NULL, *to = NULL;
+                char _cleanup_free_ *from = NULL, *to = NULL;
 
                 asprintf(&from, "/dev/%s", d);
                 asprintf(&to, "%s/dev/%s", dest, d);
 
                 if (!from || !to) {
-                        log_error("Failed to allocate devnode path");
-
-                        free(from);
-                        free(to);
-
-                        from = to = NULL;
+                        log_oom();
 
                         if (r == 0)
                                 r = -ENOMEM;
@@ -486,7 +500,7 @@ static int copy_devnodes(const char *dest) {
 
                 } else if (!S_ISCHR(st.st_mode) && !S_ISBLK(st.st_mode)) {
 
-                        log_error("%s is not a char or block device, cannot copy.", from);
+                        log_error("%s is not a char or block device, cannot copy", from);
                         if (r == 0)
                                 r = -EIO;
 
@@ -496,21 +510,16 @@ static int copy_devnodes(const char *dest) {
                         if (r == 0)
                                 r = -errno;
                 }
-
-                free(from);
-                free(to);
         }
 
-        umask(u);
-
         return r;
 }
 
 static int setup_dev_console(const char *dest, const char *console) {
         struct stat st;
-        char *to = NULL;
+        char _cleanup_free_ *to = NULL;
         int r;
-        mode_t u;
+        mode_t _cleanup_umask_ u;
 
         assert(dest);
         assert(console);
@@ -519,25 +528,21 @@ static int setup_dev_console(const char *dest, const char *console) {
 
         if (stat(console, &st) < 0) {
                 log_error("Failed to stat %s: %m", console);
-                r = -errno;
-                goto finish;
+                return -errno;
 
         } else if (!S_ISCHR(st.st_mode)) {
-                log_error("/dev/console is not a char device.");
-                r = -EIO;
-                goto finish;
+                log_error("/dev/console is not a char device");
+                return -EIO;
         }
 
         r = chmod_and_chown(console, 0600, 0, 0);
         if (r < 0) {
                 log_error("Failed to correct access mode for TTY: %s", strerror(-r));
-                goto finish;
+                return r;
         }
 
-        if (asprintf(&to, "%s/dev/console", dest) < 0) {
-                r = log_oom();
-                goto finish;
-        }
+        if (asprintf(&to, "%s/dev/console", dest) < 0)
+                return log_oom();
 
         /* We need to bind mount the right tty to /dev/console since
          * ptys can only exist on pts file systems. To have something
@@ -548,27 +553,21 @@ static int setup_dev_console(const char *dest, const char *console) {
 
         if (mknod(to, (st.st_mode & ~07777) | 0600, st.st_rdev) < 0) {
                 log_error("mknod() for /dev/console failed: %m");
-                r = -errno;
-                goto finish;
+                return -errno;
         }
 
         if (mount(console, to, "bind", MS_BIND, NULL) < 0) {
                 log_error("Bind mount for /dev/console failed: %m");
-                r = -errno;
-                goto finish;
+                return -errno;
         }
 
-finish:
-        free(to);
-        umask(u);
-
-        return r;
+        return 0;
 }
 
 static int setup_kmsg(const char *dest, int kmsg_socket) {
-        char *from = NULL, *to = NULL;
+        char _cleanup_free_ *from = NULL, *to = NULL;
         int r, fd, k;
-        mode_t u;
+        mode_t _cleanup_umask_ u;
         union {
                 struct cmsghdr cmsghdr;
                 uint8_t buf[CMSG_SPACE(sizeof(int))];
@@ -588,39 +587,30 @@ static int setup_kmsg(const char *dest, int kmsg_socket) {
          * that writing blocks when nothing is reading. In order to
          * avoid any problems with containers deadlocking due to this
          * we simply make /dev/kmsg unavailable to the container. */
-        if (asprintf(&from, "%s/dev/kmsg", dest) < 0) {
-                r = log_oom();
-                goto finish;
-        }
-
-        if (asprintf(&to, "%s/proc/kmsg", dest) < 0) {
-                r = log_oom();
-                goto finish;
-        }
+        if (asprintf(&from, "%s/dev/kmsg", dest) < 0 ||
+            asprintf(&to, "%s/proc/kmsg", dest) < 0)
+                return log_oom();
 
         if (mkfifo(from, 0600) < 0) {
                 log_error("mkfifo() for /dev/kmsg failed: %m");
-                r = -errno;
-                goto finish;
+                return -errno;
         }
 
         r = chmod_and_chown(from, 0600, 0, 0);
         if (r < 0) {
                 log_error("Failed to correct access mode for /dev/kmsg: %s", strerror(-r));
-                goto finish;
+                return r;
         }
 
         if (mount(from, to, "bind", MS_BIND, NULL) < 0) {
                 log_error("Bind mount for /proc/kmsg failed: %m");
-                r = -errno;
-                goto finish;
+                return -errno;
         }
 
         fd = open(from, O_RDWR|O_NDELAY|O_CLOEXEC);
         if (fd < 0) {
                 log_error("Failed to open fifo: %m");
-                r = -errno;
-                goto finish;
+                return -errno;
         }
 
         zero(mh);
@@ -644,19 +634,12 @@ static int setup_kmsg(const char *dest, int kmsg_socket) {
 
         if (k < 0) {
                 log_error("Failed to send FIFO fd: %m");
-                r = -errno;
-                goto finish;
+                return -errno;
         }
 
         /* And now make the FIFO unavailable as /dev/kmsg... */
         unlink(from);
-
-finish:
-        free(from);
-        free(to);
-        umask(u);
-
-        return r;
+        return 0;
 }
 
 static int setup_hostname(void) {