]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: patch filelists by opensuse
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 15 Jul 2025 19:55:32 +0000 (04:55 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 15 Jul 2025 20:49:34 +0000 (05:49 +0900)
mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot

index 8ec7500d7b76d29a8c9f00e37e958456cf3ee52d..76a8e08ee1967e5077771438a699a18478deed04 100755 (executable)
@@ -22,7 +22,11 @@ TS="${SOURCE_DATE_EPOCH:-$(date +%s)}"
 # TODO: remove patches for removal of cgroups-agent, renaming pubring file, and removal of sysv files
 # when the upstream spec is updated
 while read -r filelist; do
-    sed -E 's/\.gz$//; /systemd-cgroups-agent/d; s/import-pubring.gpg/import-pubring.pgp/; /(initctl|runlevel|telinit)/ d' "$filelist" >"/tmp/$(basename "$filelist")"
+    sed -E \
+        -e 's/\.gz$//; /systemd-cgroups-agent/d; s/import-pubring.gpg/import-pubring.pgp/' \
+        -e '/(initctl|runlevel|telinit)/ d' \
+        -e 's/systemd-quotacheck.service.8/systemd-quotacheck@.service.8/' \
+        "$filelist" >"/tmp/$(basename "$filelist")"
     mount --bind "/tmp/$(basename "$filelist")" "$filelist"
 done < <(find "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}" -name "files.*")