[lxc-devel] [lxd-pkg-ubuntu/dpm-artful] Disable upstart integration on artful+.

[xnox on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 310 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170821/71586b70/attachment.bin>
-------------- next part --------------
From 4f9df8b051c6a998ab4a02aa0955a75fb93cae16 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox at ubuntu.com>
Date: Mon, 21 Aug 2017 21:56:54 +0100
Subject: [PATCH] Disable upstart integration on artful+.

---
 debian/changelog                               |  6 ++++++
 debian/clean                                   |  2 ++
 debian/{lxd.maintscript => lxd.maintscript.in} |  1 +
 debian/{lxd.upstart => lxd.upstart.in}         |  0
 debian/rules                                   | 13 +++++++++++--
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 debian/clean
 rename debian/{lxd.maintscript => lxd.maintscript.in} (53%)
 rename debian/{lxd.upstart => lxd.upstart.in} (100%)

diff --git a/debian/changelog b/debian/changelog
index b2eb5d38..089cbb78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lxd (2.16-0ubuntu4) artful; urgency=medium
+
+  * Disable upstart integration on artful+.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 21 Aug 2017 21:39:05 +0100
+
 lxd (2.16-0ubuntu3) artful; urgency=medium
 
   * Cherry-pick upstream fixes:
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 00000000..36a77388
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+debian/lxd.maintscript
+debian/lxd.upstart
diff --git a/debian/lxd.maintscript b/debian/lxd.maintscript.in
similarity index 53%
rename from debian/lxd.maintscript
rename to debian/lxd.maintscript.in
index 14ceab4b..ecebf8a4 100644
--- a/debian/lxd.maintscript
+++ b/debian/lxd.maintscript.in
@@ -1 +1,2 @@
 rm_conffile /etc/cron.hourly/lxd 2.0.0~rc2-0ubuntu3~
+rm_conffile /etc/init/lxd.conf 2.16-0ubuntu4~
diff --git a/debian/lxd.upstart b/debian/lxd.upstart.in
similarity index 100%
rename from debian/lxd.upstart
rename to debian/lxd.upstart.in
diff --git a/debian/rules b/debian/rules
index 6580968e..7713049f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 
 PKGDIR=debian/tmp
 VERSION=$(shell grep "var Version" $(CURDIR)/shared/version/flex.go | cut -d'"' -f2)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/default.mk
 
 # temporary build path (see http://golang.org/doc/code.html#GOPATH)
 export DH_GOPKG := github.com/lxc/lxd
@@ -121,6 +121,16 @@ override_dh_install:
 	dh_install
 
 override_dh_installinit:
+ifeq (,$(findstring $(DEB_DISTRIBUTION), trusty utopic vivid wily xenial yakkety zesty))
+	# Disable upstart integration on artful+
+	rm -f debian/lxd.upstart
+	cp debian/lxd.maintscript.in debian/lxd.maintscript
+else
+	# Enable upstart integration for backports
+	cp debian/lxd.upstart.in debian/lxd.upstart
+	sed -i "s#@LIBEXECDIR@#/usr/lib/${DEB_HOST_MULTIARCH}#g" debian/lxd.upstart
+	grep -v /etc/init debian/lxd.maintscript.in > debian/lxd.maintscript
+endif
 	# We handle starting and restarting things ourselves
 	dh_systemd_enable -plxd --name=lxd-containers lxd-containers.service
 	dh_installinit -plxd --no-start
@@ -129,7 +139,6 @@ override_dh_installinit:
 
 	# Update arch-specific paths
 	sed -i "s#@LIBEXECDIR@#/usr/lib/${DEB_HOST_MULTIARCH}#g" debian/lxd/lib/systemd/system/lxd.service
-	sed -i "s#@LIBEXECDIR@#/usr/lib/${DEB_HOST_MULTIARCH}#g" debian/lxd/etc/init/lxd.conf
 	sed -i "s#@LIBEXECDIR@#/usr/lib/${DEB_HOST_MULTIARCH}#g" debian/lxd/etc/init.d/lxd
 
 override_dh_systemd_start: