Skip to content

Commit cfade54

Browse files
committed
chore(debian): rework rules to remove .install files
Signed-off-by: Cedric Hombourger <[email protected]>
1 parent 1cce630 commit cfade54

File tree

7 files changed

+15
-8
lines changed

7 files changed

+15
-8
lines changed

debian/control

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Package: mtda-service
1818
Architecture: all
1919
Multi-Arch: foreign
2020
Depends: mtda-common,
21+
mtda-systemd-helper,
2122
dnsmasq-base,
2223
iptables,
2324
kpartx,
@@ -43,6 +44,13 @@ Description: Multi-Tenant Device Access service
4344
Provide the infrastructure for running MTDA as a systemd
4445
service.
4546

47+
Package: mtda-systemd-helper
48+
Architecture: all
49+
Multi-Arch: foreign
50+
Depends: mtda-common
51+
Description: handle dynamic config fragments and restart mtda-service
52+
on config changes.
53+
4654
Package: mtda
4755
Architecture: all
4856
Multi-Arch: foreign

debian/mtda-service.install

Lines changed: 0 additions & 3 deletions
This file was deleted.

debian/mtda.service renamed to debian/mtda-service.mtda.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Unit]
22
Description=Multi-Tenant Device Access
3-
After=network-online.target mtda-config.service
3+
After=network-online.target mtda-systemd-helper.service
44
Wants=network-online.target
55
ConditionPathExists=/etc/mtda/config
66

File renamed without changes.
File renamed without changes.

debian/mtda-www.install

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/rules

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ override_dh_auto_install:
3737
mv debian/tmp/usr debian/mtda-service/
3838
install -m 0755 -d debian/mtda-service/usr/sbin
3939
mv debian/mtda-service/usr/bin/mtda-service debian/mtda-service/usr/sbin/
40-
mv debian/mtda-service/usr/bin/mtda-systemd-helper debian/mtda-service/usr/sbin/
40+
:
41+
install -m 0755 -d debian/mtda-systemd-helper/usr/sbin
42+
mv debian/mtda-service/usr/bin/mtda-systemd-helper debian/mtda-systemd-helper/usr/sbin/
4143
:
4244
install -m 0755 -d debian/mtda-client/usr/bin
4345
mv debian/mtda-service/usr/bin/mtda-cli debian/mtda-client/usr/bin/
@@ -76,6 +78,7 @@ override_dh_auto_install:
7678
install -m 0644 configs/10-www.conf debian/mtda-www/etc/mtda/config.d/
7779

7880
override_dh_installsystemd:
79-
dh_installsystemd -p mtda-www --name=mtda-www
81+
dh_installsystemd -p mtda-www mtda-www.service
8082
dh_installsystemd -p mtda-service --name=mtda
81-
dh_installsystemd -p mtda-service --name=mtda-config
83+
dh_installsystemd -p mtda-systemd-helper mtda-systemd-helper.path
84+
dh_installsystemd -p mtda-systemd-helper mtda-systemd-helper.service

0 commit comments

Comments
 (0)