Merge ~xnox/casper:skip-quick-boot into casper:devel

[Dimitri John Ledkov]

caser: revert changes to quick-boot

It appers there are regressions in bootability reported in the bugreport.

LP: #1883040

[Michael Hudson-Doyle (mwhudson)]

Seems worth a try

review: Approve

diff --git a/scripts/casper b/scripts/casper
index 87f72ce..cd03800 100644
--- a/scripts/casper
+++ b/scripts/casper
@@ -898,9 +898,11 @@ mountroot() {
             if [ "${livefs_root}" ]; then
                 break
             fi
-            # No more udev events, no more devices, nothing to wait for
-            if udevadm settle --timeout 0 2>/dev/null; then
-                break
+            if [ "$DPKG_ARCH" = "s390x" ]; then
+                # No more udev events, no more devices, nothing to wait for
+                if udevadm settle --timeout 0 2>/dev/null; then
+                    break
+                fi
             fi
             sleep 1
             i="$(($i + 1))"