s390: add personality support

Introduce personality support for Linux on z Systems to run
particular services with a 64-bit or 31-bit personality.

diff --git a/Makefile.am b/Makefile.am
index 41bfdfbeac487cba37f0f6ff1ca718f3ef4c0636..e9ad72333b2fc7b324d09dc598ba4ba733993c95 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1502,6 +1502,7 @@ EXTRA_DIST += \
        test/exec-ignoresigpipe-yes.service \
        test/exec-personality-x86-64.service \
        test/exec-personality-x86.service \
+       test/exec-personality-s390.service \
        test/exec-privatedevices-no.service \
        test/exec-privatedevices-yes.service \
        test/exec-privatetmp-no.service \

diff --git a/src/basic/util.c b/src/basic/util.c
index 18be0bfd5a01e7cf8deb40c1414809fca8c1fde5..40a4b8fbec3158b3a3a3ad3ee4e4ca4469cb2ae8 100644 (file)
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -5261,6 +5261,19 @@ unsigned long personality_from_string(const char *p) {
 
         if (streq(p, "x86"))
                 return PER_LINUX;
+
+#elif defined(__s390x__)
+
+        if (streq(p, "s390"))
+                return PER_LINUX32;
+
+        if (streq(p, "s390x"))
+                return PER_LINUX;
+
+#elif defined(__s390__)
+
+        if (streq(p, "s390"))
+                return PER_LINUX;
 #endif
 
         return PERSONALITY_INVALID;
@@ -5280,6 +5293,20 @@ const char* personality_to_string(unsigned long p) {
 
         if (p == PER_LINUX)
                 return "x86";
+
+#elif defined(__s390x__)
+
+        if (p == PER_LINUX)
+                return "s390x";
+
+        if (p == PER_LINUX32)
+                return "s390";
+
+#elif defined(__s390__)
+
+        if (p == PER_LINUX)
+                return "s390";
+
 #endif
 
         return NULL;

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index dd8ab7dcb8ad8e03f659667a608d7f8bf5b27f68..fa6336f1fbf69b7ac5a99a8090cb9eb7d16f6eb9 100644 (file)
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -77,10 +77,14 @@ static void test_exec_workingdirectory(Manager *m) {
 }
 
 static void test_exec_personality(Manager *m) {
-        test(m, "exec-personality-x86.service", 0, CLD_EXITED);
-
 #if defined(__x86_64__)
         test(m, "exec-personality-x86-64.service", 0, CLD_EXITED);
+
+#elif defined(__s390__)
+        test(m, "exec-personality-s390.service", 0, CLD_EXITED);
+
+#else
+        test(m, "exec-personality-x86.service", 0, CLD_EXITED);
 #endif
 }
 

diff --git a/test/exec-personality-s390.service b/test/exec-personality-s390.service
new file mode 100644 (file)
index 0000000..f3c3b03
--- /dev/null
+++ b/test/exec-personality-s390.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Test for Personality=s390
+
+[Service]
+ExecStart=/bin/sh -c 'echo $(uname -m); exit $(test $(uname -m) = "s390")'
+Type=oneshot
+Personality=s390