summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-19 12:07:34 -0400
committerScott Moser <smoser@brickies.net>2016-08-22 13:00:08 -0400
commit99d2da48a2469c870e61e1a5b2c67bdd5d69092b (patch)
tree8b728a2320556b6ffc33c3206cb20356f9d8d05b /debian
parent638f0183265f7345656075d997963de75c0bd1dd (diff)
downloadvyos-cloud-init-99d2da48a2469c870e61e1a5b2c67bdd5d69092b.tar.gz
vyos-cloud-init-99d2da48a2469c870e61e1a5b2c67bdd5d69092b.zip
debian/rules, debian/cloud-init.install: remove install file
Remove the install file and use --destdir=debian/cloud-init. This means we no longer have to maintain debian/cluod-init.install and risk missing some files. One such error occurred with the upstream Azure change that added dchlient-hooks, that were then not picked up by the cloud-init package here. LP: #1615745
Diffstat (limited to 'debian')
-rw-r--r--debian/cloud-init.install11
-rwxr-xr-xdebian/rules5
2 files changed, 5 insertions, 11 deletions
diff --git a/debian/cloud-init.install b/debian/cloud-init.install
deleted file mode 100644
index d985f51e..00000000
--- a/debian/cloud-init.install
+++ /dev/null
@@ -1,11 +0,0 @@
-./tools/21-cloudinit.conf etc/rsyslog.d/
-./tools/Z99-cloud-locale-test.sh etc/profile.d/
-etc/cloud
-etc/init/*.conf
-lib/systemd/*
-lib/udev/*
-usr/bin
-usr/lib/cloud-init
-usr/lib/python*/*-packages/*egg-info
-usr/lib/python*/*-packages/cloudinit
-usr/share/doc/cloud-init
diff --git a/debian/rules b/debian/rules
index 4bf66d90..ef13251f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,3 +14,8 @@ endif
override_dh_systemd_start:
dh_systemd_start --no-restart-on-upgrade --no-start
+
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/cloud-init
+ install -D ./tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf
+ install -D ./tools/Z99-cloud-locale-test.sh debian/cloud-init/etc/profile.d/Z99-cloud-locale-test.sh