From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Wed, 17 Jun 2026 10:29:26 +0000 (+0100)
Subject: mkosi: clean up generated rpm pre scripts in suse builds
X-Git-Tag: v261~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F42637%2Fhead;p=thirdparty%2Fsystemd.git

mkosi: clean up generated rpm pre scripts in suse builds

 2026-06-17T10:11:08.3789573Z Untracked files:
 2026-06-17T10:11:08.3790064Z   (use "git add <file>..." to include in what will be committed)
 2026-06-17T10:11:08.3790566Z    systemd-network.pre
 2026-06-17T10:11:08.3790908Z    systemd-resolve.pre

Follow-up for db9d7265f5a2fe55e46f8ab408bcff6e0aa97d88
---

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
index 3743dd86b82..14a69456cd1 100755
--- a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
@@ -125,6 +125,9 @@ if ! build; then
     build --noprep --nocheck
 fi
 
+# The %sysusers_generate_pre macro generates these and leaves them behind, clean them up
+rm -f systemd-network.pre systemd-resolve.pre
+
 cp "$BUILDDIR"/*.rpm "$PACKAGEDIR"
 
 make_sysext_unsigned /var/tmp/BUILD/*/BUILDROOT