projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa08982
)
virt: detect that we are running inside the docker container
author
Michal Sekletar
<msekleta@redhat.com>
Tue, 9 Sep 2014 16:14:25 +0000
(18:14 +0200)
committer
Michal Sekletar
<msekleta@redhat.com>
Thu, 2 Oct 2014 15:15:17 +0000
(17:15 +0200)
src/shared/virt.c
patch
|
blob
|
history
diff --git
a/src/shared/virt.c
b/src/shared/virt.c
index b4368952ffac3d8f3dde431caff786e39f11a5b8..f9c4e67c74c86c7198b4dba66803f2bd2431e881 100644
(file)
--- a/
src/shared/virt.c
+++ b/
src/shared/virt.c
@@
-310,6
+310,8
@@
int detect_container(const char **id) {
_id = "lxc-libvirt";
else if (streq(e, "systemd-nspawn"))
_id = "systemd-nspawn";
+ else if (streq(e, "docker"))
+ _id = "docker";
else
_id = "other";