From: Ivan Suzdal <isuzdal@mirantis.com>
Date: Thu, 1 Dec 2016 10:36:12 +0000 (+0300)
Subject: Retrieve upstart file
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0c839203bad862b2d2de0701df7022691eb407f4;p=packages%2Ftrusty%2Fmysql-wsrep-5.6.git

Retrieve upstart file

Add upstart override file

PROD-9065

Change-Id: I055460bcd0a94be2f396c17882caa55e818be270
---

diff --git a/debian/additions/upstart.override b/debian/additions/upstart.override
new file mode 100644
index 00000000..2905494b
--- /dev/null
+++ b/debian/additions/upstart.override
@@ -0,0 +1 @@
+manual
diff --git a/debian/changelog b/debian/changelog
index 7a673291..11a81de2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mysql-wsrep-5.6 (5.6.35-0~u14.04+mcp2) mos; urgency=low
+
+  * Cherry-pick from 262559a56b79e6ec6653b6c58b942b38a98e6fd0
+    - Retrieve upstart file
+    - Add upstart override
+
+ -- Dmitry Teselkin <mos-linux@mirantis.com>  Mon, 13 Mar 2017 16:56:09 +0300
+
 mysql-wsrep-5.6 (5.6.35-0~u14.04+mcp1) mcp; urgency=medium
 
   * Rebuild for trusty-mitaka mcp branch
diff --git a/debian/mysql-server-wsrep-5.6.install b/debian/mysql-server-wsrep-5.6.install
index 009adc41..f7b85da0 100644
--- a/debian/mysql-server-wsrep-5.6.install
+++ b/debian/mysql-server-wsrep-5.6.install
@@ -6,6 +6,7 @@ debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d/
 etc/apparmor.d/usr.sbin.mysqld
 etc/init.d/mysql
 etc/mysql/debian-start
+etc/init/mysql.override
 usr/bin/msql2mysql
 usr/bin/my_print_defaults
 usr/bin/myisamchk
diff --git a/debian/mysql-server-wsrep-5.6.mysql.upstart.disabled b/debian/mysql-server-wsrep-5.6.mysql.upstart
similarity index 100%
rename from debian/mysql-server-wsrep-5.6.mysql.upstart.disabled
rename to debian/mysql-server-wsrep-5.6.mysql.upstart
diff --git a/debian/rules b/debian/rules
index 44ee56cc..fbe3e488 100755
--- a/debian/rules
+++ b/debian/rules
@@ -212,6 +212,8 @@ auto_install-stamp:
 	chmod 0644 $(TMP)/usr/share/mysql-test/suite/innodb_stress/t/load_generator.py
 	chmod 0644 $(TMP)/usr/share/mysql-test/suite/innodb_stress/t/*.test
 	chmod 0644 $(TMP)/usr/share/mysql-test/suite/innodb_stress/t/*.opt
+	# Install upstart override file
+	install -D -m 0644 debian/additions/upstart.override $(TMP)/etc/init/mysql.override
 	touch $@
 
 # Use the --fail-missing to check for stuff that we should be installing