From e139c709d87240b4ade4020eefb3ab21eebe6919 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 23 Oct 2023 10:35:10 +0100 Subject: [PATCH] Install systemd system units into /usr/lib/systemd/system This was allowed by TC resolution #1053901. Build-depend on debhelper 13.11.6~ to ensure that the units are still picked up by dh_installsystemd. --- debian/control | 1 + debian/ostree-boot.install | 14 +++++++------- debian/rules | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian/control b/debian/control index 535da879..a3b32b17 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: bsdextrautils , ca-certificates, cpio, + debhelper (>= 13.11.6~), debhelper-compat (= 13), docbook-xml , docbook-xsl , diff --git a/debian/ostree-boot.install b/debian/ostree-boot.install index f2ca8a15..3dcc5ba8 100644 --- a/debian/ostree-boot.install +++ b/debian/ostree-boot.install @@ -1,14 +1,14 @@ etc/dracut.conf.d/ostree.conf etc/grub.d/15_ostree -lib/systemd/system-generators/ostree-system-generator -lib/systemd/system/ostree-boot-complete.service -lib/systemd/system/ostree-finalize-staged-hold.service -lib/systemd/system/ostree-finalize-staged.path -lib/systemd/system/ostree-finalize-staged.service -lib/systemd/system/ostree-prepare-root.service -lib/systemd/system/ostree-remount.service usr/lib/dracut/modules.d/98ostree usr/lib/ostree/ostree-prepare-root usr/lib/ostree/ostree-remount +usr/lib/systemd/system-generators/ostree-system-generator +usr/lib/systemd/system/ostree-boot-complete.service +usr/lib/systemd/system/ostree-finalize-staged-hold.service +usr/lib/systemd/system/ostree-finalize-staged.path +usr/lib/systemd/system/ostree-finalize-staged.service +usr/lib/systemd/system/ostree-prepare-root.service +usr/lib/systemd/system/ostree-remount.service usr/lib/tmpfiles.d/ostree-tmpfiles.conf usr/libexec/libostree/grub2-15_ostree diff --git a/debian/rules b/debian/rules index 663c9c93..1b79603c 100755 --- a/debian/rules +++ b/debian/rules @@ -23,8 +23,8 @@ configure_options = \ --with-modern-grub \ --with-soup3 \ --with-selinux \ - --with-systemdsystemgeneratordir=/lib/systemd/system-generators \ - --with-systemdsystemunitdir=/lib/systemd/system \ + --with-systemdsystemgeneratordir=/usr/lib/systemd/system-generators \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ --without-composefs \ --without-smack \ $(NULL) -- 2.30.2