virt: detect LXC+libvirt containers

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 30559b99f891094730c2b6e053dba0a2d03759ad..eecff7373a512e342d7768950df269db1ac44779 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -779,6 +779,7 @@
                                 <varname>chroot</varname>,
                                 <varname>openvz</varname>,
                                 <varname>lxc</varname>,
                                 <varname>chroot</varname>,
                                 <varname>openvz</varname>,
                                 <varname>lxc</varname>,

+                                <varname>lxc-libvirt</varname>,

                                 <varname>systemd-nspawn</varname>,
                                 <varname>pidns</varname> to test
                                 against a specific implementation. If
                                 <varname>systemd-nspawn</varname>,
                                 <varname>pidns</varname> to test
                                 against a specific implementation. If

diff --git a/src/virt.c b/src/virt.c
index 380fabded278184dd33a5ccee9b8c0dd51f35545..3f0912a8a6610b1c971666769608c1aab8b05710 100644 (file)
--- a/src/virt.c
+++ b/src/virt.c
@@ -209,6 +209,13 @@ int detect_container(const char **id) {
                                         *id = "lxc";
                                 return 1;
 
                                         *id = "lxc";
                                 return 1;
 

+                        } else if (streq(line, "container=lxc-libvirt")) {
+                                fclose(f);
+
+                                if (id)
+                                        *id = "lxc-libvirt";
+                                return 1;
+

                         } else if (streq(line, "container=systemd-nspawn")) {
                                 fclose(f);
 
                         } else if (streq(line, "container=systemd-nspawn")) {
                                 fclose(f);