Browse Source

usrmerge transition, move everything out of the legacy directories. Closes: #1056960

Christoph Biedl 5 months ago
parent
commit
54c12cd246
4 changed files with 6 additions and 5 deletions
  1. 1 1
      debian/aoetools.aoe-discover.service
  2. 1 1
      debian/aoetools.install
  3. 3 2
      debian/aoetools.links
  4. 1 1
      debian/rules

+ 1 - 1
debian/aoetools.aoe-discover.service

@@ -8,4 +8,4 @@ After=network-online.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/aoe-discover
+ExecStart=/usr/sbin/aoe-discover

+ 1 - 1
debian/aoetools.install

@@ -1,2 +1,2 @@
-debian/60-aoe.rules                 lib/udev/rules.d/
+debian/60-aoe.rules                 usr/lib/udev/rules.d/
 debian/modules-load.d/aoetools.conf usr/lib/modules-load.d/

+ 3 - 2
debian/aoetools.links

@@ -1,2 +1,3 @@
-sbin/aoe-discover   etc/network/if-up.d/aoe-discover
-dev/null            lib/systemd/system/aoetools.service
+
+usr/sbin/aoe-discover   etc/network/if-up.d/aoe-discover
+dev/null                usr/lib/systemd/system/aoetools.service

+ 1 - 1
debian/rules

@@ -6,7 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 	dh $@ --with systemd
 
 override_dh_auto_install:
-	$(MAKE) install PREFIX=debian/aoetools SBINDIR=debian/aoetools/sbin
+	$(MAKE) install PREFIX=debian/aoetools
 	install -D debian/hooks_aoe debian/aoetools/usr/share/initramfs-tools/hooks/aoe
 	install -D debian/local-top_aoe debian/aoetools/usr/share/initramfs-tools/scripts/local-top/aoe