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.

diff --git a/debian/control b/debian/control
index 535da879aab986025409e4f984a9d2c2e1143106..a3b32b1763f9789080ab37a054c83208f418fc09 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
  bsdextrautils <!nocheck>,
  ca-certificates,
  cpio,
+ debhelper (>= 13.11.6~),
  debhelper-compat (= 13),
  docbook-xml <!nodoc>,
  docbook-xsl <!nodoc>,

diff --git a/debian/ostree-boot.install b/debian/ostree-boot.install
index f2ca8a15101db3f018faeff22a8a83fd9d70e67c..3dcc5ba89360e16cedff30cff0d5b3582d9d7bf7 100644 (file)
--- 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 663c9c934d9c94c334e9bb8b8a6c82c1100a2272..1b79603c3ecbe80b0669a1daef0c6fbcc3a38a84 100755 (executable)
--- 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)