summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhagbard <vyosdev@derith.de>2019-07-23 09:36:35 -0700
committerhagbard <vyosdev@derith.de>2019-07-23 09:36:35 -0700
commit8dc58ad405956e5a824b0ccae8a9b1585c9d63de (patch)
treeaea080015d4b462e2634c7479221da4c3723af54
parentb23b07715e3881255c147673bc894400d5ba0887 (diff)
parenteaccf49805adcb8d44bbf6bb282705e66727198b (diff)
downloadvyos-xe-guest-utilities-8dc58ad405956e5a824b0ccae8a9b1585c9d63de.tar.gz
vyos-xe-guest-utilities-8dc58ad405956e5a824b0ccae8a9b1585c9d63de.zip
Merge remote-tracking branch 'origin/current' into equuleus
-rw-r--r--debian/install10
-rwxr-xr-xdebian/rules3
2 files changed, 7 insertions, 6 deletions
diff --git a/debian/install b/debian/install
index dbcac94..bf71c3f 100644
--- a/debian/install
+++ b/debian/install
@@ -1,5 +1,5 @@
-debian/proc-xen.mount lib/systemd/system
-debian/xe-guest-utilities.service etc/systemd/system
-debian/z10_xen-vcpu-hotplug.rules lib/udev/rules.d
-build/stage/usr/sbin usr
-build/stage/usr/bin usr
+debian/proc-xen.mount lib/systemd/system
+debian/xe-guest-utilities.service etc/systemd/system
+debian/z10_xen-vcpu-hotplug.rules lib/udev/rules.d
+build/stage/usr/sbin/xe-linux-distribution usr/sbin
+build/stage/usr/sbin/xe-daemon usr/sbin
diff --git a/debian/rules b/debian/rules
index d1419f1..c9d0d84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
+#export DH_VERBOSE=1
%:
dh $@ --with systemd
@@ -7,4 +8,4 @@ override_dh_installinit:
dh_installinit --no-restart-on-upgrade --name xe-guest-utilities
override_dh_systemd_enable:
- dh_systemd_enable --name xe-guest-utilities xe-guest-utilities.service
+ dh_systemd_enable --name xe-guest-utilities.service