Merge lp:~jamesodhunt/ubuntu/precise/upstart/bug-974147 into lp:ubuntu/precise/upstart

[James Hunt]

debian/upstart-job: Do not start or restart disabled jobs (LP: #974147)

Hi Steve,

I'm not 100% happy with the restart case, hence my big comment in debian/upstart-job, but I think it's the best we can do. That said, simply calling "exit 0" would be the path of least surprise for users if the job is disabled but is found to be running. Maybe a compromise might be to go with my logic, but add a warning along the lines of:

  WARNING: reload command stopped disabled job '$JOB', but will NOT restart it.

[lp:~jamesodhunt/ubuntu/precise/upstart/bug-974147]

1388. By Serge Hallyn on 2012-04-10

debian/apparmor-profile-load: don't run in a container. This can hopefully
be removed in precise, after stacked profiles are supported. (LP: #978297)

1389. By Colin Watson on 2012-04-12

sync up changelog with upload

1390. By James Hunt on 2012-04-16

* debian/upstart-job: Add in handling for disabled jobs:
  - Do not restart a job if disabled, unless job was forcibly started.
  - Do stop a disabled job that was forcibly started.
  Resolves issue where 'invoke-rc.d restart' erroneously started disabled
  jobs on package upgrade (LP: #974147)

Unmerged revisions

1390. By James Hunt on 2012-04-16

* debian/upstart-job: Add in handling for disabled jobs:
  - Do not restart a job if disabled, unless job was forcibly started.
  - Do stop a disabled job that was forcibly started.
  Resolves issue where 'invoke-rc.d restart' erroneously started disabled
  jobs on package upgrade (LP: #974147)

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-12 09:32:54 +0000
+++ debian/changelog	2012-04-16 08:11:22 +0000
@@ -1,3 +1,13 @@
+upstart (1.5-0ubuntu5) precise; urgency=low
+
+  * debian/upstart-job: Add in handling for disabled jobs:
+    - Do not restart a job if disabled, unless job was forcibly started.
+    - Do stop a disabled job that was forcibly started.
+    Resolves issue where 'invoke-rc.d restart' erroneously started disabled
+    jobs on package upgrade (LP: #974147)
+
+ -- James Hunt <[e-mail]>  Mon, 16 Apr 2012 09:06:46 +0100
+
 upstart (1.5-0ubuntu4) precise; urgency=low
 
   * debian/apparmor-profile-load: don't run in a container. This can
 
=== modified file 'debian/upstart-job'
--- debian/upstart-job	2011-03-08 12:39:34 +0000
+++ debian/upstart-job	2012-04-16 08:11:22 +0000
@@ -37,6 +37,8 @@
 $ECHO "Rather than invoking init scripts through /etc/init.d, use the service(8)"
 $ECHO "utility, e.g. service $INITSCRIPT $COMMAND"
 
+initctl show-config -e "$JOB"|grep -q '^  start on' || DISABLED=1
+
 case $COMMAND in
 status)
     $ECHO
@@ -55,6 +57,8 @@
         exit 0
     elif [ -n "$RUNNING" ] && [ "$COMMAND" = "start" ]; then
         exit 0
+    elif [ -n "$DISABLED" ] && [ "$COMMAND" = "start" ]; then
+        exit 0
     fi
     $COMMAND "$JOB"
     ;;
@@ -69,6 +73,13 @@
     if [ -n "$RUNNING" ] ; then
         stop "$JOB"
     fi
+    # If the job is disabled and is not currently running, the job is
+    # not restarted. However, if the job is disabled but has been forced into the
+    # running state, we *do* stop and restart it since this is expected behaviour
+    # for the admin who forced the start.
+    if [ -n "$DISABLED" ] && [ -z "$RUNNING" ]; then
+        exit 0
+    fi
     start "$JOB"
     ;;
 reload|force-reload)