X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnspawn.c;fp=src%2Fnspawn.c;h=6f5a9d9547d52931fcd5d5d68aac244e6214c1c4;hb=4d1c38b8072dca18807371170d5e14fa8dc0baa5;hp=b548b126c6e5dccae2a71abcfdc07a5659d64135;hpb=6bc1ce40e531257ae8dd9bbbbcb48e5de0a1187b;p=elogind.git

diff --git a/src/nspawn.c b/src/nspawn.c
index b548b126c..6f5a9d954 100644
--- a/src/nspawn.c
+++ b/src/nspawn.c
@@ -197,7 +197,7 @@ static int mount_all(const char *dest) {
         }
 
         /* Fix the timezone, if possible */
-        if (asprintf(&where, "%s/%s", dest, "/etc/localtime") >= 0) {
+        if (asprintf(&where, "%s/etc/localtime", dest) >= 0) {
 
                 if (mount("/etc/localtime", where, "bind", MS_BIND, NULL) >= 0)
                         mount("/etc/localtime", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
@@ -205,6 +205,14 @@ static int mount_all(const char *dest) {
                 free(where);
         }
 
+        if (asprintf(&where, "%s/etc/timezone", dest) >= 0) {
+
+                if (mount("/etc/timezone", where, "bind", MS_BIND, NULL) >= 0)
+                        mount("/etc/timezone", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
+
+                free(where);
+        }
+
         return r;
 }