Merge lp:~jamesodhunt/upstart/bug-881885 into lp:upstart

[James Hunt]

* scripts/init-checkconf.sh:
  - Check copy is successful.
  - Auto-start dbus-launch if not running and command is available (for
    example in non-desktop environments) (LP: #881885).
  - Auto-stop dbus-daemon if we started it.

[Colin Watson (cjwatson)]

I know this is a bash script, but even in bash scripts I would prefer that we always used the form "[ test ] && [ test ]" rather than "[ test -a test ]"; it's more portable in case somebody wants to convert it to portable /bin/sh later, and the parsing rules are so much clearer.

I'd suggest a slightly simpler approach rather than having to manually kill dbus-launch: move the dbus-launch call as far up the script as is practical, and have the script re-exec itself under dbus-launch (i.e. 'exec dbus-launch "$0" "$@"' or similar). dbus-launch will then automatically exit when the script finishes, and the net result should be much less code.

review: Needs Fixing

[lp:~jamesodhunt/upstart/bug-881885]

1425. By James Hunt on 2013-01-23

* scripts/init-checkconf.sh: use '&&' rather than '-a' for expression
  grouping to make more portable.

[James Hunt (jamesodhunt)]

Hi Colin,

Unfortunately, it looks like we can't use your elegant re-exec solution since although dbus-launch correctly exits, it leaves behind a dbus-daemon process. This appears to be 'working as designed' according to the man page, but irritating nonetheless :)

I've updated the script wrt '-a' though.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-01-21 16:52:57 +0000
+++ ChangeLog	2013-01-23 14:31:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2013-01-21  Dmitrijs Ledkovs  <[e-mail]>
 
 	* init/xdg.[ch]: add xdg_get_cache_home and get_user_log_dir
@@ -26,6 +27,16 @@
 	      directory becomes writeable.
 	    (LP: #1096531).
 
+=======
[phone]  James Hunt  <[e-mail]>
+
+	* scripts/init-checkconf.sh:
+	  - Check copy is successful.
+	  - Auto-start dbus-launch if not running and command is available (for
+	    example in non-desktop environments) (LP: #881885).
+	  - Auto-stop dbus-daemon if we started it.
+
+>>>>>>> MERGE-SOURCE
 2013-01-04  Dmitrijs Ledkovs  <[e-mail]>
 
 	* init/conf.c: add ability to apply override files from higher

=== modified file 'scripts/init-checkconf.sh'
--- scripts/init-checkconf.sh	2011-06-06 12:52:08 +0000
+++ scripts/init-checkconf.sh	2013-01-23 14:31:25 +0000
@@ -34,6 +34,8 @@
 file_valid=n
 running=n
 check_scripts=y
+dbus_cmd=dbus-launch
+started_dbus=n
 
 cleanup()
 {
@@ -44,6 +46,13 @@
     kill -9 "$upstart_pid" >/dev/null 2>&1
   fi
 
+  if [ "$started_dbus" = y ] && [ -n "$DBUS_SESSION_BUS_PID" ]
+  then
+    debug "stopping dbus-daemon (running with PID $DBUS_SESSION_BUS_PID)"
+    kill -0 "$DBUS_SESSION_BUS_PID" >/dev/null 2>&1 && \
+    kill -9 "$DBUS_SESSION_BUS_PID" >/dev/null 2>&1
+  fi
+
   [ -d "$confdir" ] && rm -rf "$confdir"
   [ $file_valid = y ] && exit 0
   exit 1
@@ -182,7 +191,7 @@
 
 job="${filename%.conf}"
 
-cp "$file" "$confdir"
+cp "$file" "$confdir" || die "failed to copy file $file to $confdir"
 debug "job=$job"
 
 upstart_running
@@ -192,6 +201,15 @@
 upstart_out="$(mktemp --tmpdir "${script_name}-upstart-output.XXXXXXXXXX")"
 debug "upstart_out=$upstart_out"
 
+# auto-start dbus if it isn't already running (required in non-desktop
+# environments).
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+  [ -z "$(which $dbus_cmd)" ] && die "cannot find $dbus_cmd"
+  eval $($dbus_cmd --auto-syntax)
+  started_dbus=y
+  debug "started $dbus_cmd"
+fi
+
 upstart_cmd=$(printf \
    "%s --session --no-sessions --no-startup-event --verbose --confdir %s" \
   "$upstart_path" \