Import patches-unapplied version 235-3ubuntu2 to ubuntu/bionic-proposedimport/235-3ubuntu2

Imported using git-ubuntu import.

Changelog parent: 31b71c4156ab4aab187e5f52bc80ca43812c3d1c

New changelog entries:
  * systemd-fsckd: Fix ADT tests to work on s390x too.

2 files changed, 25 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 1e21763..28c4b34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+systemd (235-3ubuntu2) bionic; urgency=medium
+
+  * systemd-fsckd: Fix ADT tests to work on s390x too.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 21 Nov 2017 16:41:15 +0000
+
 systemd (235-3ubuntu1) bionic; urgency=medium
 
   * Merge 235-3 from debian:
diff --git a/debian/tests/systemd-fsckd b/debian/tests/systemd-fsckd
index b71a8dc..1634b2a 100755
--- a/debian/tests/systemd-fsckd
+++ b/debian/tests/systemd-fsckd
@@ -7,6 +7,7 @@ from contextlib import suppress
 import inspect
 import fileinput
 import os
+import platform
 import subprocess
 import shutil
 import stat
@@ -219,7 +220,7 @@ WantedBy=systemd-fsck-root.service'''.format(PROCESS_KILLER_PATH,
         subprocess.check_call(['systemctl', 'enable', 'process-killer'], stderr=subprocess.DEVNULL)
 
 
-def enable_plymouth(enable=True):
+def enable_plymouth_grub(enable=True):
     '''ensure plymouth is enabled in grub config (doesn't reboot)'''
     plymouth_enabled = 'splash' in open('/boot/grub/grub.cfg').read()
     if enable and not plymouth_enabled:
@@ -238,6 +239,23 @@ def enable_plymouth(enable=True):
     subprocess.check_call(['update-grub'], stderr=subprocess.DEVNULL)
 
 
+def enable_plymouth_zipl(enable=True, ziplconf='/etc/zipl.conf'):
+    '''ensure plymouth is enabled in zipl config (doesn't reboot)'''
+    plymouth_enabled = 'splash' in open(ziplconf).read()
+    if enable and not plymouth_enabled:
+        subprocess.check_call(['sed', '-i', 's/^\(parameters.*\)/\\1 splash quiet/', ziplconf], stderr=subprocess.DEVNULL)
+    elif not enable and plymouth_enabled:
+        subprocess.check_call(['sed', '-i', 's/ splash quiet//g', ziplconf], stderr=subprocess.DEVNULL)
+    subprocess.check_call(['zipl'], stderr=subprocess.DEVNULL)
+
+
+def enable_plymouth(enable=True):
+    if platform.processor() == 's390x':
+        enable_plymouth_zipl(enable)
+    else:
+        enable_plymouth_grub(enable)
+
+
 def boot_with_systemd_distro():
     '''Reboot with systemd as init and distro setup for grub'''
     enable_plymouth()