Merge lp:~clint-fewbar/ubuntu/natty/portmap/new-boot-events into lp:ubuntu/natty/portmap

[Clint Byrum]

This changes the way portmap is started on bootup so that it includes the ON_BOOT=y flag, which is needed to satisfy statd's very specific startup needs. It also adds the 'portmap-wait' job that allows starting and/or waiting on portmap to startup without using its started event.

[Steve Langasek (vorlon)]

On Wed, Jan 05, 2011 at 08:44:10PM -0000, Clint Byrum wrote:
> === renamed file 'debian/upstart' => 'debian/portmap.portmap.upstart'
> --- debian/upstart 2010-04-17 01:42:21 +0000
> +++ debian/portmap.portmap.upstart 2011-01-05 20:44:09 +0000
> @@ -7,8 +7,8 @@
> description "RPC port mapper"
> author "Steve Langasek <email address hidden>"
>
> -start on (virtual-filesystems
> - and net-device-up IFACE=lo)
> +# Note that portmap is started by portmap-boot.conf and so intentionally
> +# has no start on
>
> expect fork
> respawn
>

The previous job had 'and net-device-up IFACE=lo' as a start condition, but
this has been dropped from the new portmap-boot job without explanation.
Have you confirmed that the interface doesn't need to be up for portmap to
start successfully? If not, this condition should be reintroduced.

Please wrap changelog entries at 80 characters - you should find that
lintian reports an error for over-long changelog lines here.

--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
<email address hidden> <email address hidden>

[Steve Langasek (vorlon)]

review: Needs Fixing

[Clint Byrum (clint-fewbar)]

Steve thanks for the review. I realize now that I had proposed merging without pushing my latest changes.

The latest version has fixed upstart jobs, including net-device-up IFACE=lo and the appropriate initctl command.

I've also wrapped all of the changelog lines at 72 chars (to allow room for nesting later)

[Steve Langasek (vorlon)]

Hi Clint,

One last round of nits:

- dh_installinit -- start 43 S 2 3 4 5 . start 32 0 6 . stop 81 1 .
+ dh_installinit -pportmap --upstart-only --no-start --name portmap-boot
+ dh_installinit -pportmap --upstart-only --no-start --name portmap-wait
+ dh_installinit -pportmap --upstart-only -R --name portmap

* For this to be mergeable with Debian later, we should keep the start, stop arguments to dh_installinit here. They're not relevant in an upstart case, but Debian has ports that aren't upstart-able so we should maintain backwards-compatibility with sysvinit-only startup.

* The '-pportmap' is correct, but redundant given that we're only building one binary package here; I suggest omitting this.

* --upstart-only: this option says to not anything to the maintainer scripts. For two of these scripts, --no-start + --upstart-only is redundant and you only need one of them. For the third script, --upstart-only and -R are contradictory, and I think *both* should be omitted.

So I think the final installinit calls should be:

       dh_installinit --upstart-only --name portmap-boot
       dh_installinit --upstart-only --name portmap-wait
       dh_installinit --name portmap

review: Needs Fixing

[Steve Langasek (vorlon)]

 --upstart-only: sorry, I'm apparently having difficulty reading my own manpage scribblings! Yes, you should definitely be passing both --upstart-only and --no-start for the portmap-boot and portmap-wait jobs. For the portmap job, you should pass neither --upstart-only nor -R.

[lp:~clint-fewbar/ubuntu/natty/portmap/new-boot-events]

19. By Clint Byrum on 2011-01-11

simplifying dh_installinit and re-introducing sysv args to ease merge to Debian

[Clint Byrum (clint-fewbar)]

Ok, I originally used the flags I did because the rcX.d links were created for some reason, but I think that was a big of thrashing on my part.

I've pushed up the latest version with the start and stop arguments added back in, and the suggested argument simplifications.

Thanks for the nits. Lets hope there are less and less as I learn what to pay attention to. ;)

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-04 10:01:08 +0000
+++ debian/changelog	2011-01-11 16:13:04 +0000
@@ -1,3 +1,15 @@
+portmap (6.0.0-2ubuntu2) natty; urgency=low
+
+  * debian/upstart renamed to debian/portmap.portmap.upstart,
+    debian/portmap.portmap-boot.upstart, debian/rules: Added to set
+    special ON_BOOT flag during boot, which allows statd to use an
+    AND with 'started portmap ON_BOOT=y'. This version of portmap is a
+    dependency of nfs-utils to fix LP: #525154
+  * debian/portmap.portmap-wait.upstart: job to wait for portmap to
+    finish starting. also dependedon on by nfs-utils.
+
+ -- Clint Byrum <[e-mail]>  Wed, 05 Jan 2011 11:47:26 -0800
+
 portmap (6.0.0-2ubuntu1) maverick; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:

=== added file 'debian/portmap.portmap-boot.upstart'
--- debian/portmap.portmap-boot.upstart	1970-01-01 00:00:00 +0000
+++ debian/portmap.portmap-boot.upstart	2011-01-11 16:13:04 +0000
@@ -0,0 +1,10 @@
+# portmap-boot
+
+description "Upstart job to start portmap on boot only"
+author "Clint Byrum"
+
+start on virtual-filesystems and net-device-up IFACE=lo
+
+task
+
+exec initctl emit --no-wait start-portmap ON_BOOT=y

=== added file 'debian/portmap.portmap-wait.upstart'
--- debian/portmap.portmap-wait.upstart	1970-01-01 00:00:00 +0000
+++ debian/portmap.portmap-wait.upstart	2011-01-11 16:13:04 +0000
@@ -0,0 +1,22 @@
+# portmap-wait 
+
+description "Start this job to wait until portmap is started or fails to start"
+author "Clint Byrum <[e-mail]>"
+
+stop on started portmap or stopped portmap
+
+# Needed to make starting the job successful despite being killed
+normal exit 2
+task
+
+script
+
+  status portmap | grep -q "start/running" && exit 0
+
+  start portmap || true
+
+  # Waiting forever is ok.. upstart will kill this job when
+  # the portmap we tried to start above either starts or stops
+  while sleep 3600; do;:;done
+
+end script

=== renamed file 'debian/upstart' => 'debian/portmap.portmap.upstart'
--- debian/upstart	2010-04-17 01:42:21 +0000
+++ debian/portmap.portmap.upstart	2011-01-11 16:13:04 +0000
@@ -7,8 +7,11 @@
 description	"RPC port mapper"
 author		"Steve Langasek <[e-mail]>"
 
-start on (virtual-filesystems
-          and net-device-up IFACE=lo)
+start on start-portmap
+
+# ON_BOOT is set on start-portmap in portmap-boot.conf
+# Used by statd which must not start on started portmap during boot
+export ON_BOOT
 
 expect fork
 respawn

=== modified file 'debian/rules'
--- debian/rules	2010-02-25 09:05:08 +0000
+++ debian/rules	2011-01-11 16:13:04 +0000
@@ -45,7 +45,9 @@
 	dh_installdebconf
 	dh_installdocs
 	dh_installexamples
-	dh_installinit -- start 43 S 2 3 4 5 . start 32 0 6 . stop 81 1 .
+	dh_installinit --upstart-only --no-start --name portmap-boot
+	dh_installinit --upstart-only --no-start --name portmap-wait
+	dh_installinit --name portmap -- start 43 S 2 3 4 5 . start 32 0 6 . stop 81 1 .
 	dh_installcron
 	dh_installman
 	dh_installinfo