chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: implicitly add code location to all messages logged with the native interface
[elogind.git]
/
src
/
nspawn.c
diff --git
a/src/nspawn.c
b/src/nspawn.c
index b548b126c6e5dccae2a71abcfdc07a5659d64135..6f5a9d9547d52931fcd5d5d68aac244e6214c1c4 100644
(file)
--- a/
src/nspawn.c
+++ b/
src/nspawn.c
@@
-197,7
+197,7
@@
static int mount_all(const char *dest) {
}
/* Fix the timezone, if possible */
}
/* 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);
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);
}
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;
}
return r;
}