rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Add 0001-detect-s390-virt.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=679
This commit is contained in:
Dr. Werner Fink 2014-06-18 13:37:26 +00:00 committed by Git OBS Bridge
parent bd651eeb8d
commit 09aaae7186
5 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-detect-s390-virt.patch Normal file
View File

@ -0,0 +1,34 @@
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-17 08:03:30.152489353 +0000
@@ -196,6 +196,29 @@
} 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";
+
+ break;
+ }
+ }
+ }
+
+ goto finish;
+#endif
+
/* this will set _id to "other" and return 0 for unknown hypervisors */
r = detect_vm_cpuid(&_id);
if (r != 0)

6
systemd-mini.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 18 13:35:58 UTC 2014 - werner@suse.de
- Add patch 0001-detect-s390-virt.patch from Thomas Blume (bnc#880438)
to detect the virtualization layers on s390x as well
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 18 12:58:42 UTC 2014 - werner@suse.de Wed Jun 18 12:58:42 UTC 2014 - werner@suse.de

3
systemd-mini.spec
View File

@ -564,6 +564,8 @@ Patch278: 0001-core-fix-invalid-free-in-killall.patch
Patch279: 0002-udev-fix-invalid-free-in-enable_name_policy.patch Patch279: 0002-udev-fix-invalid-free-in-enable_name_policy.patch
# PATCH-FIX-UPSTREAM added at 2014/06/17 # PATCH-FIX-UPSTREAM added at 2014/06/17
Patch280: 0003-install-fix-invalid-free-in-unit_file_mask.patch Patch280: 0003-install-fix-invalid-free-in-unit_file_mask.patch
# PATCH-FIX-SUSE detect virtualization layers on S390 (bnc#880438)
Patch281: 0001-detect-s390-virt.patch
# UDEV PATCHES # UDEV PATCHES
# ============ # ============
@ -1083,6 +1085,7 @@ cp %{SOURCE7} m4/
%patch278 -p0 %patch278 -p0
%patch279 -p0 %patch279 -p0
%patch280 -p0 %patch280 -p0
%patch281 -p1
# udev patches # udev patches
%patch1001 -p1 %patch1001 -p1

6
systemd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 18 13:35:58 UTC 2014 - werner@suse.de
- Add patch 0001-detect-s390-virt.patch from Thomas Blume (bnc#880438)
to detect the virtualization layers on s390x as well
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 18 12:58:42 UTC 2014 - werner@suse.de Wed Jun 18 12:58:42 UTC 2014 - werner@suse.de

3
systemd.spec
View File

@ -559,6 +559,8 @@ Patch278: 0001-core-fix-invalid-free-in-killall.patch
Patch279: 0002-udev-fix-invalid-free-in-enable_name_policy.patch Patch279: 0002-udev-fix-invalid-free-in-enable_name_policy.patch
# PATCH-FIX-UPSTREAM added at 2014/06/17 # PATCH-FIX-UPSTREAM added at 2014/06/17
Patch280: 0003-install-fix-invalid-free-in-unit_file_mask.patch Patch280: 0003-install-fix-invalid-free-in-unit_file_mask.patch
# PATCH-FIX-SUSE detect virtualization layers on S390 (bnc#880438)
Patch281: 0001-detect-s390-virt.patch
# UDEV PATCHES # UDEV PATCHES
# ============ # ============
@ -1078,6 +1080,7 @@ cp %{SOURCE7} m4/
%patch278 -p0 %patch278 -p0
%patch279 -p0 %patch279 -p0
%patch280 -p0 %patch280 -p0
%patch281 -p1
# udev patches # udev patches
%patch1001 -p1 %patch1001 -p1