Merge ~enr0n/ubuntu/+source/systemd:ubuntu-jammy into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-jammy

[Nick Rosbrook]

SRU for a couple of fixes needed in core.

systemd 249.11-0ubuntu3.12~ppa2 (amd64) -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-enr0n-systemd/jammy/amd64/s/systemd/20231025_230203_45b23@/log.gz
systemd 249.11-0ubuntu3.12~ppa2 (arm64) -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-enr0n-systemd/jammy/arm64/s/systemd/20231026_012911_59708@/log.gz
systemd 249.11-0ubuntu3.12~ppa2 (armhf) -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-enr0n-systemd/jammy/armhf/s/systemd/20231025_214455_24363@/log.gz
systemd 249.11-0ubuntu3.12~ppa4 (ppc64el) -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-enr0n-systemd/jammy/ppc64el/s/systemd/20231102_185508_d1128@/log.gz

s390x would not trigger.

[Lukas Märdian (slyon)]

Thanks for executing autopkgtests and test builds in a PPA!

I verified that the patch cherry-picked from upstream matches upstream's logic (lp2037281-core-device-ignore-DEVICE_FOUND_UDEV-bit-on-switching-roo.patch), so that should be fine.

Also the logic in the Ubuntu Core read-only-etc hacks patch is looking good to me. It's sad that we cannot find a better way around this, other than patching systemd. But from reading the bug report comments that seems to be hard. I have one remark about this specific patch:

- bug #2035122 needs to be integrated in Noble's UBUNTU-read-only-etc-hacks.patch.
=> Will this happen with the next systemd merge? Please state your plans in the bug report, so it's clear to the SRU team, also target it to the other missing series (Lunar, Mantic), marking it WONTFIX, as this only applies to Ubuntu Core.

Otherwise, those changes seem to be fine!

review: Approve

[Nick Rosbrook (enr0n)]

> Thanks for executing autopkgtests and test builds in a PPA!
>
> I verified that the patch cherry-picked from upstream matches upstream's logic
> (lp2037281-core-device-ignore-DEVICE_FOUND_UDEV-bit-on-switching-roo.patch),
> so that should be fine.
>
> Also the logic in the Ubuntu Core read-only-etc hacks patch is looking good to
> me. It's sad that we cannot find a better way around this, other than patching
> systemd. But from reading the bug report comments that seems to be hard. I
> have one remark about this specific patch:

We do have an open PR upstream that's some hope of landing soon enough that I can easily backport it to noble (https://github.com/systemd/systemd/pull/29831).

> - bug #2035122 needs to be integrated in Noble's UBUNTU-read-only-etc-
> hacks.patch.
> => Will this happen with the next systemd merge? Please state your plans in
> the bug report, so it's clear to the SRU team, also target it to the other
> missing series (Lunar, Mantic), marking it WONTFIX, as this only applies to
> Ubuntu Core.

Thanks for the reminder about the bug statuses! And yes, I plan to do this on merge if the above PR is not accepted by then.

> Otherwise, those changes seem to be fine!

Thanks for reviewing!

diff --git a/debian/changelog b/debian/changelog
index 0708492..54968bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+systemd (249.11-0ubuntu3.12) UNRELEASED; urgency=medium
+
+  * core/device: ignore DEVICE_FOUND_UDEV bit on switching root (LP: #2037281)
+    File: debian/patches/lp2037281-core-device-ignore-DEVICE_FOUND_UDEV-bit-on-switching-roo.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=00f86f0b20f794f30aabe7181912d2ec2207e292
+  * use read-only /etc hack in more places (LP: #2035122)
+    File: debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c57406e850396a5d446aefe5e70a3aeaad080d72
+  * autopkgtest: do not allow qemu to be used on ppc64el.
+    Almost every run on ppc64el takes 12 to 24 hours, so do this as a last
+    resort to relieve pressure on autopkgtest infrastructure.
+    File: debian/tests/upstream
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d125a1ed3f01e59dba2f370c13801bfb76c16f5d
+
+ -- Nick Rosbrook <[e-mail]>  Thu, 02 Nov 2023 09:52:13 -0400
+
 systemd (249.11-0ubuntu3.11) jammy; urgency=medium
 
   * wait-online: exit early if all links are ignored (LP: #2036358)
diff --git a/debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch b/debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
index 994bd34..b3096ec 100644
--- a/debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
+++ b/debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
@@ -9,11 +9,54 @@ we need to update those files instead if the original files are symlinks into
 
 Forwarded: OMGno, this is a rather nasty hack until we fix system-image to get a writable /etc
 Bug-Ubuntu: https://launchpad.net/bugs/1227520
+Bug-Ubuntu: https://launchpad.net/bugs/2035122
 ---
+ src/core/locale-setup.c  | 22 +++++++++++++++++++++-
  src/hostname/hostnamed.c | 34 +++++++++++++++++++++++++++-------
+ src/locale/keymap-util.c | 35 +++++++++++++++++++++++++++--------
  src/timedate/timedated.c | 31 +++++++++++++++++++++++++------
- 2 files changed, 52 insertions(+), 13 deletions(-)
+ 4 files changed, 100 insertions(+), 22 deletions(-)
 
+diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
+index b4ea9e2..5b4de24 100644
+--- a/src/core/locale-setup.c
++++ b/src/core/locale-setup.c
+@@ -12,6 +12,26 @@
+ #include "strv.h"
+ #include "util.h"
+ #include "virt.h"
++#include "fs-util.h"
++
++/* Hack for Ubuntu Phone/Core: check if path is an existing symlink to
++ * /etc/writable; if it is, update that instead */
++static const char* writable_filename(const char *path) {
++        ssize_t r;
++        static char realfile_buf[PATH_MAX];
++        _cleanup_free_ char *realfile = NULL;
++        const char *result = path;
++        int orig_errno = errno;
++
++        r = readlink_and_make_absolute(path, &realfile);
++        if (r >= 0 && startswith(realfile, "/etc/writable")) {
++                snprintf(realfile_buf, sizeof(realfile_buf), "%s", realfile);
++                result = realfile_buf;
++        }
++
++        errno = orig_errno;
++        return result;
++}
+
+ int locale_setup(char ***environment) {
+         _cleanup_(locale_variables_freep) char *variables[_VARIABLE_LC_MAX] = {};
+@@ -59,7 +79,7 @@ int locale_setup(char ***environment) {
+         }
+
+         if (r <= 0) {
+-                r = parse_env_file(NULL, "/etc/default/locale",
++                r = parse_env_file(NULL, writable_filename("/etc/default/locale"),
+                                    "LANG",              &variables[VARIABLE_LANG],
+                                    "LANGUAGE",          &variables[VARIABLE_LANGUAGE],
+                                    "LC_CTYPE",          &variables[VARIABLE_LC_CTYPE],
 diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
 index 36702f2..a49baec 100644
 --- a/src/hostname/hostnamed.c
@@ -29,7 +72,7 @@ index 36702f2..a49baec 100644
 @@ -92,6 +93,25 @@ static void context_destroy(Context *c) {
          bus_verify_polkit_async_registry_free(c->polkit_registry);
  }
- 
+
 +/* Hack for Ubuntu phone: check if path is an existing symlink to
 + * /etc/writable; if it is, update that instead */
 +static const char* writable_filename(const char *path) {
@@ -53,18 +96,18 @@ index 36702f2..a49baec 100644
          struct stat current_stat = {};
          int r;
 @@ -117,7 +137,7 @@ static void context_read_machine_info(Context *c) {
- 
+
          assert(c);
- 
+
 -        if (stat("/etc/machine-info", &current_stat) >= 0 &&
 +        if (stat(writable_filename("/etc/machine-info"), &current_stat) >= 0 &&
              stat_inode_unmodified(&c->etc_machine_info_stat, &current_stat))
                  return;
- 
+
 @@ -128,7 +148,7 @@ static void context_read_machine_info(Context *c) {
                        (UINT64_C(1) << PROP_DEPLOYMENT) |
                        (UINT64_C(1) << PROP_LOCATION));
- 
+
 -        r = parse_env_file(NULL, "/etc/machine-info",
 +        r = parse_env_file(NULL, writable_filename("/etc/machine-info"),
                             "PRETTY_HOSTNAME", &c->data[PROP_PRETTY_HOSTNAME],
@@ -72,47 +115,143 @@ index 36702f2..a49baec 100644
                             "CHASSIS", &c->data[PROP_CHASSIS],
 @@ -388,14 +408,14 @@ static int context_write_data_static_hostname(Context *c) {
          s = &c->etc_hostname_stat;
- 
+
          if (isempty(c->data[PROP_STATIC_HOSTNAME])) {
 -                if (unlink("/etc/hostname") < 0 && errno != ENOENT)
 +                if (unlink(writable_filename("/etc/hostname")) < 0 && errno != ENOENT)
                          return -errno;
- 
+
                  TAKE_PTR(s);
                  return 0;
          }
- 
+
 -        r = write_string_file_atomic_label("/etc/hostname", c->data[PROP_STATIC_HOSTNAME]);
 +        r = write_string_file_atomic_label(writable_filename("/etc/hostname"), c->data[PROP_STATIC_HOSTNAME]);
          if (r < 0)
                  return r;
- 
+
 @@ -421,7 +441,7 @@ static int context_write_data_machine_info(Context *c) {
           * already, even if we can't make it hit the disk. */
          s = &c->etc_machine_info_stat;
- 
+
 -        r = load_env_file(NULL, "/etc/machine-info", &l);
 +        r = load_env_file(NULL, writable_filename("/etc/machine-info"), &l);
          if (r < 0 && r != -ENOENT)
                  return r;
- 
+
 @@ -434,14 +454,14 @@ static int context_write_data_machine_info(Context *c) {
          }
- 
+
          if (strv_isempty(l)) {
 -                if (unlink("/etc/machine-info") < 0 && errno != ENOENT)
 +                if (unlink(writable_filename("/etc/machine-info")) < 0 && errno != ENOENT)
                          return -errno;
- 
+
                  TAKE_PTR(s);
                  return 0;
          }
- 
+
 -        r = write_env_file_label("/etc/machine-info", l);
 +        r = write_env_file_label(writable_filename("/etc/machine-info"), l);
          if (r < 0)
                  return r;
- 
+
+diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
+index 6d064e2..dad8a27 100644
+--- a/src/locale/keymap-util.c
++++ b/src/locale/keymap-util.c
+@@ -25,6 +25,25 @@
+ #include "strv.h"
+ #include "tmpfile-util.h"
+
++/* Hack for Ubuntu Phone/Core: check if path is an existing symlink to
++ * /etc/writable; if it is, update that instead */
++static const char* writable_filename(const char *path) {
++        ssize_t r;
++        static char realfile_buf[PATH_MAX];
++        _cleanup_free_ char *realfile = NULL;
++        const char *result = path;
++        int orig_errno = errno;
++
++        r = readlink_and_make_absolute(path, &realfile);
++        if (r >= 0 && startswith(realfile, "/etc/writable")) {
++                snprintf(realfile_buf, sizeof(realfile_buf), "%s", realfile);
++                result = realfile_buf;
++        }
++
++        errno = orig_errno;
++        return result;
++}
++
+ static bool startswith_comma(const char *s, const char *prefix) {
+         s = startswith(s, prefix);
+         if (!s)
+@@ -104,7 +123,7 @@ int locale_read_data(Context *c, sd_bus_message *m) {
+
+         r = stat(path, &st);
+         if (r < 0 && errno == ENOENT) {
+-                path = "/etc/default/locale";
++                path = writable_filename("/etc/default/locale");
+                 r = stat(path, &st);
+         }
+         if (r < 0 && errno != ENOENT)
+@@ -213,7 +232,7 @@ int x11_read_data(Context *c, sd_bus_message *m) {
+                 c->x11_cache = sd_bus_message_ref(m);
+         }
+
+-        if (stat("/etc/default/keyboard", &st) < 0) {
++        if (stat(writable_filename("/etc/default/keyboard"), &st) < 0) {
+                 if (errno != ENOENT)
+                         return -errno;
+
+@@ -230,7 +249,7 @@ int x11_read_data(Context *c, sd_bus_message *m) {
+         c->x11_mtime = t;
+         context_free_x11(c);
+
+-        r = parse_env_file(NULL, "/etc/default/keyboard",
++        r = parse_env_file(NULL, writable_filename("/etc/default/keyboard"),
+                            "XKBMODEL",          &c->x11_model,
+                            "XKBLAYOUT",         &c->x11_layout,
+                            "XKBVARIANT",        &c->x11_variant,
+@@ -253,7 +272,7 @@ int locale_write_data(Context *c, char ***settings) {
+
+         r = load_env_file(NULL, path, &l);
+         if (r < 0 && r == -ENOENT) {
+-                path = "/etc/default/locale";
++                path = writable_filename("/etc/default/locale");
+                 r = load_env_file(NULL, path, &l);
+         }
+         if (r < 0 && r != -ENOENT)
+@@ -326,7 +345,7 @@ int x11_write_data(Context *c) {
+         int r;
+         char *t, **l = NULL;
+
+-        r = load_env_file(NULL, "/etc/default/keyboard", &l);
++        r = load_env_file(NULL, writable_filename("/etc/default/keyboard"), &l);
+         if (r < 0 && r != -ENOENT)
+                 return r;
+
+@@ -396,17 +415,17 @@ int x11_write_data(Context *c) {
+         if (strv_isempty(l)) {
+                 strv_free(l);
+
+-                if (unlink("/etc/default/keyboard") < 0)
++                if (unlink(writable_filename("/etc/default/keyboard")) < 0)
+                         return errno == ENOENT ? 0 : -errno;
+
+                 c->vc_mtime = USEC_INFINITY;
+                 return 0;
+         }
+
+-        r = write_env_file("/etc/default/keyboard", l);
++        r = write_env_file(writable_filename("/etc/default/keyboard"), l);
+         strv_free(l);
+
+-        if (r >= 0 && stat("/etc/default/keyboard", &st) >= 0)
++        if (r >= 0 && stat(writable_filename("/etc/default/keyboard"), &st) >= 0)
+                 c->x11_mtime = timespec_load(&st.st_mtim);
+
+         return r;
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
 index 2083c9d..00fb521 100644
 --- a/src/timedate/timedated.c
@@ -120,7 +259,7 @@ index 2083c9d..00fb521 100644
 @@ -290,6 +290,25 @@ static int context_read_data(Context *c) {
          return 0;
  }
- 
+
 +/* Hack for Ubuntu phone: check if path is an existing symlink to
 + * /etc/writable; if it is, update that instead */
 +static const char* writable_filename(const char *path) {
@@ -144,27 +283,27 @@ index 2083c9d..00fb521 100644
          _cleanup_free_ char *p = NULL;
          const char *source;
 @@ -307,10 +326,10 @@ static int context_write_data_timezone(Context *c) {
- 
+
                  if (access("/usr/share/zoneinfo/UTC", F_OK) < 0) {
- 
+
 -                        if (unlink("/etc/localtime") < 0 && errno != ENOENT)
 +                        if (unlink(writable_filename("/etc/localtime")) < 0 && errno != ENOENT)
                                  r = -errno;
- 
+
 -                        if (unlink("/etc/timezone") < 0 && errno != ENOENT)
 +                        if (unlink(writable_filename("/etc/timezone")) < 0 && errno != ENOENT)
                                  r = -errno;
- 
+
                          return r;
 @@ -325,12 +344,12 @@ static int context_write_data_timezone(Context *c) {
                  source = p;
          }
- 
+
 -        r = symlink_atomic(source, "/etc/localtime");
 +        r = symlink_atomic(source, writable_filename("/etc/localtime"));
          if (r < 0)
                  return r;
- 
+
 -        if (stat("/etc/timezone", &st) == 0 && S_ISREG(st.st_mode)) {
 -                r = write_string_file("/etc/timezone", c->zone, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC);
 +        if (stat(writable_filename("/etc/timezone"), &st) == 0 && S_ISREG(st.st_mode)) {
@@ -174,10 +313,10 @@ index 2083c9d..00fb521 100644
          }
 @@ -396,7 +415,7 @@ static int context_write_data_local_rtc(Context *c) {
                  *(char*) mempcpy(stpcpy(stpcpy(mempcpy(w, s, a), prepend), c->local_rtc ? "LOCAL" : "UTC"), e, b) = 0;
- 
+
                  if (streq(w, NULL_ADJTIME_UTC)) {
 -                        if (unlink("/etc/adjtime") < 0)
 +                        if (unlink(writable_filename("/etc/adjtime")) < 0)
                                  if (errno != ENOENT)
                                          return -errno;
- 
+
diff --git a/debian/patches/lp2037281-core-device-ignore-DEVICE_FOUND_UDEV-bit-on-switching-roo.patch b/debian/patches/lp2037281-core-device-ignore-DEVICE_FOUND_UDEV-bit-on-switching-roo.patch
new file mode 100644
index 0000000..1951277
--- /dev/null
+++ b/debian/patches/lp2037281-core-device-ignore-DEVICE_FOUND_UDEV-bit-on-switching-roo.patch
@@ -0,0 +1,116 @@
+From: Yu Watanabe <[e-mail]>
+Date: Fri, 29 Apr 2022 20:29:11 +0900
+Subject: core/device: ignore DEVICE_FOUND_UDEV bit on switching root
+
+Origin: upstream, https://github.com/systemd/systemd/commit/75d7b5989f99125e52d5c0e5656fa1cd0fae2405
+Bug-Ubuntu: https://launchpad.net/bugs/2037281
+
+The issue #12953 is caused by the following:
+On switching root,
+- deserialized_found == DEVICE_FOUND_UDEV | DEVICE_FOUND_MOUNT,
+- deserialized_state == DEVICE_PLUGGED,
+- enumerated_found == DEVICE_FOUND_MOUNT,
+On switching root, most devices are not found by the enumeration process.
+Hence, the device state is set to plugged by device_coldplug(), and then
+changed to the dead state in device_catchup(). So the corresponding
+mount point is unmounted. Later when the device is processed by udevd, it
+will be changed to plugged state again.
+
+The issue #23208 is caused by the fact that generated udev database in
+initramfs and the main system are often different.
+
+So, the two issues have the same root; we should not honor
+DEVICE_FOUND_UDEV bit in the deserialized_found on switching root.
+
+This partially reverts c6e892bc0eebe1d42c282bd2d8bae149fbeba85f.
+
+Fixes #12953 and #23208.
+Replaces #23215.
+
+Co-authored-by: Martin Wilck <[e-mail]>
+---
+ src/core/device.c | 59 +++++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 49 insertions(+), 10 deletions(-)
+
+diff --git a/src/core/device.c b/src/core/device.c
+index e138754..31c503e 100644
+--- a/src/core/device.c
++++ b/src/core/device.c
+@@ -162,14 +162,57 @@ static int device_coldplug(Unit *u) {
+         assert(d->state == DEVICE_DEAD);
+
+         /* First, let's put the deserialized state and found mask into effect, if we have it. */
++        if (d->deserialized_state < 0)
++                return 0;
++
++        Manager *m = u->manager;
++        DeviceFound found = d->deserialized_found;
++        DeviceState state = d->deserialized_state;
++
++        /* On initial boot, switch-root, reload, reexecute, the following happen:
++         * 1. MANAGER_IS_RUNNING() == false
++         * 2. enumerate devices: manager_enumerate() -> device_enumerate()
++         *    Device.enumerated_found is set.
++         * 3. deserialize devices: manager_deserialize() -> device_deserialize()
++         *    Device.deserialize_state and Device.deserialized_found are set.
++         * 4. coldplug devices: manager_coldplug() -> device_coldplug()
++         *    deserialized properties are copied to the main properties.
++         * 5. MANAGER_IS_RUNNING() == true: manager_ready()
++         * 6. catchup devices: manager_catchup() -> device_catchup()
++         *    Device.enumerated_found is applied to Device.found, and state is updated based on that.
++         *
++         * Notes:
++         * - On initial boot, no udev database exists. Hence, no devices are enumerated in the step 2.
++         *   Also, there is no deserialized device. Device units are (a) generated based on dependencies of
++         *   other units, or (b) generated when uevents are received.
++         *
++         * - On switch-root, the udev databse may be cleared, except for devices with sticky bit, i.e.
++         *   OPTIONS="db_persist". Hence, almost no devices are enumerated in the step 2. However, in general,
++         *   we have several serialized devices. So, DEVICE_FOUND_UDEV bit in the deserialized_found must be
++         *   ignored, as udev rules in initramfs and the main system are often different. If the deserialized
++         *   state is DEVICE_PLUGGED, we need to downgrade it to DEVICE_TENTATIVE (or DEVICE_DEAD if nobody
++         *   sees the device). Unlike the other starting mode, Manager.honor_device_enumeration == false
++         *   (maybe, it is better to rename the flag) when device_coldplug() and device_catchup() are called.
++         *   Hence, let's conditionalize the operations by using the flag. After switch-root, systemd-udevd
++         *   will (re-)process all devices, and the Device.found and Device.state will be adjusted.
++         *
++         * - On reload or reexecute, we can trust enumerated_found, deserialized_found, and deserialized_state.
++         *   Of course, deserialized parameters may be outdated, but the unit state can be adjusted later by
++         *   device_catchup() or uevents. */
++
++        if (!m->honor_device_enumeration && !MANAGER_IS_USER(m)) {
++                found &= ~DEVICE_FOUND_UDEV; /* ignore DEVICE_FOUND_UDEV bit */
++                if (state == DEVICE_PLUGGED)
++                        state = DEVICE_TENTATIVE; /* downgrade state */
++                if (found == DEVICE_NOT_FOUND)
++                        state = DEVICE_DEAD; /* If nobody sees the device, downgrade more */
++        }
+
+-        if (d->deserialized_state < 0 ||
+-            (d->deserialized_state == d->state &&
+-             d->deserialized_found == d->found))
++        if (d->found == found && d->state == state)
+                 return 0;
+
+-        d->found = d->deserialized_found;
+-        device_set_state(d, d->deserialized_state);
++        d->found = found;
++        device_set_state(d, state);
+         return 0;
+ }
+
+@@ -682,13 +725,9 @@ static void device_found_changed(Device *d, DeviceFound previous, DeviceFound no
+ }
+
+ static void device_update_found_one(Device *d, DeviceFound found, DeviceFound mask) {
+-        Manager *m;
+-
+         assert(d);
+
+-        m = UNIT(d)->manager;
+-
+-        if (MANAGER_IS_RUNNING(m) && (m->honor_device_enumeration || MANAGER_IS_USER(m))) {
++        if (MANAGER_IS_RUNNING(UNIT(d)->manager)) {
+                 DeviceFound n, previous;
+
+                 /* When we are already running, then apply the new mask right-away, and trigger state changes
diff --git a/debian/patches/series b/debian/patches/series
index 59f0a08..9b099f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -124,3 +124,4 @@ lp1999275/binfmt-util-also-check-if-binfmt-is-mounted-in-read-write.patch
 lp1999275/binfmt-check-if-binfmt-is-mounted-before-applying-rules.patch
 lp1999275/unit-check-more-specific-path-to-be-written-by-systemd-bi.patch
 lp2036358-wait-online-exit-early-if-all-links-are-ignored.patch
+lp2037281-core-device-ignore-DEVICE_FOUND_UDEV-bit-on-switching-roo.patch
diff --git a/debian/tests/upstream b/debian/tests/upstream
index f05f14c..0d60a21 100755
--- a/debian/tests/upstream
+++ b/debian/tests/upstream
@@ -24,4 +24,10 @@ export TEST_SHOW_JOURNAL=warning
 export TEST_REQUIRE_INSTALL_TESTS=0
 export TEST_PREFER_NSPAWN=1
 export NO_BUILD=1
+
+# Temporarily disable tests running in QEMU on ppc64el (LP: #1992178)
+if [ "$DPKGARCH" = "ppc64el" ]; then
+    export TEST_NO_QEMU=1
+fi
+
 test/run-integration-tests.sh