SHA256
1
0
forked from pool/systemd
Dr. Werner Fink 2014-06-27 08:18:35 +00:00 committed by Git OBS Bridge
parent f53707eea3
commit 5cdb3d3914
3 changed files with 14 additions and 3 deletions

View File

@ -1,8 +1,8 @@
bnc#880438 - systemd-detect-virt doesn't work on System z bnc#880438 - systemd-detect-virt doesn't work on System z
--- systemd-210/src/shared/virt.c --- systemd-210/src/shared/virt.c
+++ systemd-210/src/shared/virt.c 2014-06-17 08:03:30.152489353 +0000 +++ systemd-210/src/shared/virt.c 2014-06-26 07:55:30.081608729 +0000
@@ -196,6 +196,29 @@ @@ -196,6 +196,30 @@
} else } else
return r; return r;
@ -20,7 +20,8 @@ bnc#880438 - systemd-detect-virt doesn't work on System z
+ if (startswith(line, "VM00 Control Program:")) { + if (startswith(line, "VM00 Control Program:")) {
+ if (strstr(line,"z/VM")) + if (strstr(line,"z/VM"))
+ _id = "z/VM"; + _id = "z/VM";
+ + else if (strstr(line,"KVM/Linux"))
+ _id = "KVM";
+ break; + break;
+ } + }
+ } + }

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 27 08:17:47 UTC 2014 - werner@suse.de
- Update of patch 0001-detect-s390-virt.patch (bnc#880438)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 26 10:02:26 UTC 2014 - werner@suse.de Thu Jun 26 10:02:26 UTC 2014 - werner@suse.de

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 27 08:17:47 UTC 2014 - werner@suse.de
- Update of patch 0001-detect-s390-virt.patch (bnc#880438)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 26 10:02:26 UTC 2014 - werner@suse.de Thu Jun 26 10:02:26 UTC 2014 - werner@suse.de