Merge lp:~jamesodhunt/ubuntu/natty/upstart/fix-for-770532 into lp:ubuntu/natty/upstart

[James Hunt]

Fixed bug 770532.

[Stéphane Graber (stgraber)]

review: Approve (merged)

=== modified file 'ChangeLog'
--- ChangeLog	2011-04-20 16:45:43 +0000
+++ ChangeLog	2011-04-28 10:58:26 +0000
@@ -1,3 +1,13 @@
[phone]  James Hunt  <[e-mail]>
+
+	* scripts/init-checkconf.sh:
+	  - New function upstart_running.
+	  - We now check to ensure no other instance running.
+	  - Use list command rather than status since the latter requires an
+	    instance variable to be specified (LP: #770532).
+	  - Improve cleanup safety.
+	* scripts/man/init-checkconf.8: Added limitations section.
+
 2011-04-20  James Hunt  <[e-mail]>
 
 	* control_get_job_by_name: Fix to relax session rigidity for user

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-20 16:45:43 +0000
+++ debian/changelog	2011-04-28 10:58:26 +0000
@@ -1,3 +1,10 @@
+upstart (0.9.7-2) natty; urgency=low
+
+  * Merge of upstream lp:~upstart-devel/upstart/0.9: Updates for
+    init-checkconf.
+
+ -- James Hunt <[e-mail]>  Wed, 27 Apr 2011 15:19:47 +0100
+
 upstart (0.9.7-1) natty; urgency=low
 
   * New upstream release 0.9.7: Important session fix (LP: #767053).

=== modified file 'scripts/init-checkconf.sh'
--- scripts/init-checkconf.sh	2011-04-06 16:35:39 +0000
+++ scripts/init-checkconf.sh	2011-04-28 10:58:26 +0000
@@ -37,8 +37,13 @@
 
 cleanup()
 {
-  kill -0 "$upstart_pid" >/dev/null 2>&1 && \
-  kill -9 "$upstart_pid" >/dev/null 2>&1
+  if [ ! -z "$upstart_pid" ]
+  then
+    debug "stopping secondary Upstart (running with PID $upstart_pid)"
+    kill -0 "$upstart_pid" >/dev/null 2>&1 && \
+    kill -9 "$upstart_pid" >/dev/null 2>&1
+  fi
+
   [ -d "$confdir" ] && rm -rf "$confdir"
   [ $file_valid = y ] && exit 0
   exit 1
@@ -86,6 +91,15 @@
   exit 1
 }
 
+# Return 0 if Upstart is running on the D-Bus session bus, else 1.
+upstart_running()
+{
+  dbus-send --session --print-reply \
+    --dest='com.ubuntu.Upstart' /com/ubuntu/Upstart \
+    org.freedesktop.DBus.Properties.GetAll \
+    string:'com.ubuntu.Upstart0_6' >/dev/null 2>&1
+}
+
 trap cleanup EXIT INT TERM
 
 args=$(getopt \
@@ -171,6 +185,10 @@
 cp "$file" "$confdir"
 debug "job=$job"
 
+upstart_running
+[ $? -eq 0 ] && die "Another instance of this program is already running"
+debug "ok - no other running instances detected"
+
 upstart_out="$(mktemp --tmpdir "${script_name}-upstart-output.XXXXXXXXXX")"
 debug "upstart_out=$upstart_out"
 
@@ -191,10 +209,7 @@
 for i in $(seq 1 5)
 do
   debug "Waiting for Upstart to reply over D-Bus (attempt $i)"
-  dbus-send --session --print-reply \
-    --dest='com.ubuntu.Upstart' /com/ubuntu/Upstart \
-    org.freedesktop.DBus.Properties.GetAll \
-    string:'com.ubuntu.Upstart0_6' >/dev/null 2>&1
+  upstart_running
   if [ $? -eq 0 ]
   then
     running=y
@@ -221,7 +236,8 @@
   done
 fi
 
-if "$initctl_path" --session status "$job" >/dev/null 2>&1
+"$initctl_path" --session list|grep -q "^${job}"
+if [ $? -eq 0 ]
 then
   file_valid=y
   echo "File $file: syntax ok"

=== modified file 'scripts/man/init-checkconf.8'
--- scripts/man/init-checkconf.8	2011-04-06 16:35:39 +0000
+++ scripts/man/init-checkconf.8	2011-04-28 10:58:26 +0000
@@ -50,6 +50,13 @@
 Written by James Hunt
 .RB < [e-mail] >
 .\"
+.SH LIMITATIONS
+.IP \(bu 4
+This program will not run as the root user.
+.IP \(bu 4
+It is not possible for a user to run multiple simultaneous
+instances of this program.
+.\"
 .SH REPORTING BUGS
 Report bugs at
 .RB < https://launchpad.net/upstart/+bugs >