d/p/bootloader-zipl-No-op-if-run-as-non-root.patch: Drop patch, applied upstream

diff --git a/debian/changelog b/debian/changelog
index 62df319f181e562b95afa047e2947c9b2459b0e6..d4505a279e289feda852feabce9a18f8f4c2c066 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ostree (2023.8-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * d/p/bootloader-zipl-No-op-if-run-as-non-root.patch:
+    Drop patch, applied upstream
 
  -- Simon McVittie <smcv@debian.org>  Fri, 08 Dec 2023 10:15:13 +0000
 

diff --git a/debian/patches/bootloader-zipl-No-op-if-run-as-non-root.patch b/debian/patches/bootloader-zipl-No-op-if-run-as-non-root.patch
deleted file mode 100644 (file)
index d2dd935..0000000
--- a/debian/patches/bootloader-zipl-No-op-if-run-as-non-root.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Colin Walters <walters@verbum.org>
-Date: Tue, 24 Oct 2023 10:40:51 -0400
-Subject: bootloader/zipl: No-op if run as non-root
-
-Not the most elegant fix but should get the job done.
-
-Bug: https://github.com/ostreedev/ostree/issues/3084
-Origin: upstream, 2023.8, commit:75c7e51a8bedb5edeadb9f54e84ccfff2adcc755
----
- src/libostree/ostree-bootloader-zipl.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/libostree/ostree-bootloader-zipl.c b/src/libostree/ostree-bootloader-zipl.c
-index c0a2a14..4579a89 100644
---- a/src/libostree/ostree-bootloader-zipl.c
-+++ b/src/libostree/ostree-bootloader-zipl.c
-@@ -381,6 +381,12 @@ _ostree_bootloader_zipl_post_bls_sync (OstreeBootloader *bootloader, int bootver
- {
-   OstreeBootloaderZipl *self = OSTREE_BOOTLOADER_ZIPL (bootloader);
- 
-+  // This can happen in a unit testing environment; at some point what we want to do here
-+  // is move all of the zipl logic to a systemd unit instead that's keyed of
-+  // ostree-finalize-staged.service.
-+  if (getuid () != 0)
-+    return TRUE;
-+
-   /* Note that unlike the grub2-mkconfig backend, we make no attempt to
-    * chroot().
-    */

diff --git a/debian/patches/series b/debian/patches/series
index f5038c4cf626859f2d3c94534393e75fc6ed3397..78a4e0547fbb9feebe11efa44337bcd1ba1df821 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-bootloader-zipl-No-op-if-run-as-non-root.patch
 debian/Skip-test-pull-repeated-during-CI.patch
 debian/test-sysroot-Skip-on-s390x-by-default.patch
 debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch