X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fnspawn.c;h=6f5a9d9547d52931fcd5d5d68aac244e6214c1c4;hb=b070e7f3c9ed680c821bd89d42506695f2438506;hp=b548b126c6e5dccae2a71abcfdc07a5659d64135;hpb=52af21063b365f231ee6ae8bac18d690fff85799;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; }