X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fvirt.c;fp=src%2Fshared%2Fvirt.c;h=b4368952ffac3d8f3dde431caff786e39f11a5b8;hp=20a8d7c5bfc4287bdb6bbea0da1aac0a7bf4734a;hb=f41925b4e442a34c93ad120ef1426c974a047ed1;hpb=7f035ea56bc0b75327c54e8aa4a56d57ed00dd6d

diff --git a/src/shared/virt.c b/src/shared/virt.c
index 20a8d7c5b..b4368952f 100644
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -220,6 +220,23 @@ int detect_vm(const char **id) {
                 goto finish;
         }
 
+#if defined(__s390__)
+        {
+                _cleanup_free_ char *t = NULL;
+
+                r = get_status_field("/proc/sysinfo", "VM00 Control Program:", &t);
+                if (r >= 0) {
+                        if (streq(t, "z/VM"))
+                                _id = "zvm";
+                        else
+                                _id = "kvm";
+                        r = 1;
+
+                        goto finish;
+                }
+        }
+#endif
+
         r = 0;
 
 finish: