[Pkg-sssd-devel] sssd: Changes to 'ubuntu-xenial'

[Victor Tapia King]

 debian/changelog                          |   13 +++++++++++++
 debian/rules                              |    2 ++
 debian/sssd-common.sssd-autofs.upstart.in |    8 ++++++++
 debian/sssd-common.sssd.upstart.in        |    2 +-
 4 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit ccd976502f603a816cbbe0ee34dbd00a1b79774a
Author: Victor Tapia <victor.tapia at canonical.com>
Date:   Tue Jul 4 11:19:28 2017 +0200

    Fix regression (LP: #1695870); SSSD does not start on boot if autofs is not installed.

diff --git a/debian/changelog b/debian/changelog
index 5a5156c..947028a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+sssd (1.13.4-1ubuntu1.6) xenial; urgency=medium
+
+  * Fix regression where SSSD doesn't start on boot if autofs is not
+    installed (LP: #1695870):
+    - rules: Support new service
+    - sssd-common.sssd-autofs.upstart.in: Restart autofs to read direct mounts
+    after SSSD and autofs have started (only on startup). This keeps the fix
+    for the autofs and SSSD race condition (LP: #1566508)
+    - sssd-common.sssd.upstart.in: Remove "starting autofs" to allow SSSD to
+    start without autofs.
+
+ -- Victor Tapia <victor.tapia at canonical.com>  Mon, 05 Jun 2017 12:41:12 +0200
+
 sssd (1.13.4-1ubuntu1.5) xenial; urgency=medium
 
   * d/p/pidfile-creation.diff: Delay the pidfile creation until the
diff --git a/debian/rules b/debian/rules
index 4ba4129..d56db48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,6 +63,7 @@ override_dh_install:
 		$(CURDIR)/debian/sssd-common/etc/apparmor.d/usr.sbin.sssd
 
 	cat $(CURDIR)/debian/sssd-common.sssd.$(INIT).in > $(CURDIR)/debian/sssd-common.sssd.$(INIT)
+	cat $(CURDIR)/debian/sssd-common.sssd-autofs.$(INIT).in > $(CURDIR)/debian/sssd-common.sssd-autofs.$(INIT)
 
 	# remove files we don't want to install
 	find $(CURDIR)/debian/tmp/ -name '*.la' -exec rm '{}' ';'
@@ -81,6 +82,7 @@ override_dh_python2:
 override_dh_installinit:
 	dh_apparmor -psssd-common --profile-name=usr.sbin.sssd
 	dh_installinit --name sssd --error-handler=invoke_failure
+	dh_installinit --name sssd-autofs --error-handler=invoke_failure
 
 override_dh_installdeb:
 	dh_installdeb
diff --git a/debian/sssd-common.sssd-autofs.upstart.in b/debian/sssd-common.sssd-autofs.upstart.in
new file mode 100644
index 0000000..d10ebe3
--- /dev/null
+++ b/debian/sssd-common.sssd-autofs.upstart.in
@@ -0,0 +1,8 @@
+description "Restart Autofs after SSSD starts on boot"
+author      "Victor Tapia <victor.tapia at canonical.com>"
+
+start on startup and (started sssd and started autofs)
+
+script
+	restart autofs
+end script
diff --git a/debian/sssd-common.sssd.upstart.in b/debian/sssd-common.sssd.upstart.in
index 312de6f..11add8f 100644
--- a/debian/sssd-common.sssd.upstart.in
+++ b/debian/sssd-common.sssd.upstart.in
@@ -7,7 +7,7 @@
 
 description	"System Security Services Daemon"
 
-start on (filesystem and net-device-up and starting autofs)
+start on (filesystem and net-device-up)
 stop on runlevel [06]
 
 expect fork