Merge lp:~james-page/ubuntu/quantal/samba/cups-integration into lp:ubuntu/quantal/samba

[James Page]

Refactored integration with cups to ensure that samba configuration is reloaded after cups has started.

[Steve Langasek (vorlon)]

+ - d/samba.reload-smbd.upstart: Add upstart task which reloads smbd
<snip>
=== added file 'debian/samba.reload-smbd.conf'

mismatched names; should really be .upstart.

Also, looks like a change to debian/rules is missing here to get debhelper to install the added script (dh_installinit -psamba --upstart-only --no-start --name reload-smbd)

Otherwise, looks good.

review: Needs Fixing

[James Page (james-page)]

Issues fixed, uploaded to quantal

Thanks for the feedback.

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-07 10:58:08 +0000
+++ debian/changelog	2012-09-10 08:26:17 +0000
@@ -1,3 +1,13 @@
+samba (2:3.6.6-3ubuntu3) quantal; urgency=low
+
+  * Decouple startup of smbd from cups (LP: #1047262):
+    - d/samba.smbd.upstart: Revert changes made in 2:3.6.6-3ubuntu2.
+    - d/samba.reload-smbd.upstart: Add upstart task which reloads smbd
+      once cups has started, ensuring that smbd startup is decoupled
+      from cups.
+
+ -- James Page <[e-mail]>  Mon, 10 Sep 2012 09:23:14 +0100
+
 samba (2:3.6.6-3ubuntu2) quantal; urgency=low
 
   * Ensure samba can query cups for printer information on startup

=== added file 'debian/samba.reload-smbd.conf'
--- debian/samba.reload-smbd.conf	1970-01-01 00:00:00 +0000
+++ debian/samba.reload-smbd.conf	2012-09-10 08:26:17 +0000
@@ -0,0 +1,12 @@
+description "Samba Auto-reload Integration"
+author      "James Page <[e-mail]>"
+
+start on started cups
+
+task
+
+script
+    if status smbd | grep -q "running"; then
+        reload smbd
+    fi
+end script

=== modified file 'debian/samba.smbd.upstart'
--- debian/samba.smbd.upstart	2012-09-07 10:58:08 +0000
+++ debian/samba.smbd.upstart	2012-09-10 08:26:17 +0000
@@ -14,10 +14,6 @@
 	[ "$RUN_MODE" = inetd ] && { stop; exit 0; }
 
 	install -o root -g root -m 755 -d /var/run/samba
-
-	if status cups >/dev/null ; then
-		start wait-for-state WAITER=smbd WAIT_FOR=cups WAIT_STATE=running
-	fi
 end script
 
 exec smbd -F