chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-daemon: introduce sd_pid_notify() and sd_pid_notifyf()
[elogind.git]
/
src
/
core
/
main.c
diff --git
a/src/core/main.c
b/src/core/main.c
index 77cc2fbbdd93d9b253f575c3aa80ba8ce4a1be94..d5d1ee2b0ceff67aeb66dce923d525d3b41dd34d 100644
(file)
--- a/
src/core/main.c
+++ b/
src/core/main.c
@@
-1261,6
+1261,16
@@
static int status_welcome(void) {
isempty(pretty_name) ? "Linux" : pretty_name);
}
isempty(pretty_name) ? "Linux" : pretty_name);
}
+static int write_container_id(void) {
+ const char *c;
+
+ c = getenv("container");
+ if (isempty(c))
+ return 0;
+
+ return write_string_file("/run/systemd/container", c);
+}
+
int main(int argc, char *argv[]) {
Manager *m = NULL;
int r, retval = EXIT_FAILURE;
int main(int argc, char *argv[]) {
Manager *m = NULL;
int r, retval = EXIT_FAILURE;
@@
-1544,6
+1554,8
@@
int main(int argc, char *argv[]) {
if (virtualization)
log_info("Detected virtualization '%s'.", virtualization);
if (virtualization)
log_info("Detected virtualization '%s'.", virtualization);
+ write_container_id();
+
log_info("Detected architecture '%s'.", architecture_to_string(uname_architecture()));
if (in_initrd())
log_info("Detected architecture '%s'.", architecture_to_string(uname_architecture()));
if (in_initrd())