forked from pool/systemd
9fc3254595
- Update of patch 0001-detect-s390-virt.patch (bnc#880438) - Shut up stupid check scripts crying for not mentioned systemd-mini-rpmlintrc - Add upstream patchs 0001-core-use-correct-format-string-for-UIDs.patch 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch - Add upstream patch 0001-units-order-network-online.target-after-network.targ.patch to make sure that etwork-online.target follows network.target - rules: re-enable dev_id conditionally in persistent rules (bnc#884403 and bnc#882714). Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch - Add upstream patches 0001-vconsole-also-copy-character-maps-not-just-fonts-fro.patch 0002-core-make-sure-Environment-fields-passed-in-for-tran.patch 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch 0005-man-fix-path-in-crypttab-5.patch - Add upstream patch 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch it fixes udevadm settle exit code which may had roken dracut scripts (bnc#884271 comment#18) - Temporary disable patch 1022 (bnc#884271 and bnc#882714). OBS-URL: https://build.opensuse.org/request/show/238853 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=190
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
bnc#880438 - systemd-detect-virt doesn't work on System z
|
|
|
|
--- systemd-210/src/shared/virt.c
|
|
+++ systemd-210/src/shared/virt.c 2014-06-26 07:55:30.081608729 +0000
|
|
@@ -196,6 +196,30 @@
|
|
} else
|
|
return r;
|
|
|
|
+#if defined(__s390x__)
|
|
+ /* First layer virtualization (PR/SM) is always present on s390x */
|
|
+ _id = "PR/SM";
|
|
+ r = 1;
|
|
+
|
|
+ /* Check for second layer virtualization */
|
|
+ _cleanup_fclose_ FILE *f = NULL;
|
|
+ char line[LINE_MAX];
|
|
+ f = fopen("/proc/sysinfo", "re");
|
|
+ if (f) {
|
|
+ FOREACH_LINE(line, f, return -errno) {
|
|
+ if (startswith(line, "VM00 Control Program:")) {
|
|
+ if (strstr(line,"z/VM"))
|
|
+ _id = "z/VM";
|
|
+ else if (strstr(line,"KVM/Linux"))
|
|
+ _id = "KVM";
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ goto finish;
|
|
+#endif
|
|
+
|
|
/* this will set _id to "other" and return 0 for unknown hypervisors */
|
|
r = detect_vm_cpuid(&_id);
|
|
if (r != 0)
|