Hi Stephen

Am 7. Juli 2011 15:21 schrieb Stephen Fromm <steph...@nero.net>:
> Thanks for the feedback.  Patch updated and attached.

Thanks a lot for the update! I made small modifications to the patch,
as you can see below, and was about to push it when I noticed that you
haven't signed the CLA yet. Could you please sign the Individual
Contributor License Agreement (or get your employer to sign the
corporate version)? You find links to both on
<http://code.google.com/p/ganeti/wiki/DeveloperGuidelines>.

--- a/daemons/daemon-util.in
+++ b/daemons/daemon-util.in
@@ -42,8 +42,8 @@ if [[ -s $defaults_file ]]; then
   . $defaults_file
 fi

-# Meant to facilitate use of /etc/rc.d/init.d/functions
-# in case start-stop-daemon is not available.
+# Meant to facilitate use utilities in /etc/rc.d/init.d/functions in case
+# start-stop-daemon is not available.
 _ignore_error() {
   set +e
   eval "$@"
@@ -195,6 +195,8 @@ start() {
       --chuid $usergroup \
       -- $args "$@"
   else
+    # TODO: Find a way to start daemon with a group, until then the group must
+    # be removed
     _ignore_error daemon \
       --pidfile $pidfile \
       --user ${usergroup%:*} \
@@ -272,8 +274,8 @@ reload_ssh_keys() {

 # Read /etc/rc.d/init.d/functions if start-stop-daemon not available
 if ! type -p start-stop-daemon >/dev/null && \
-  [[ -f @SYSCONFDIR@/rc.d/init.d/functions ]]; then
-    _ignore_error . @SYSCONFDIR@/rc.d/init.d/functions
+   [[ -f @SYSCONFDIR@/rc.d/init.d/functions ]]; then
+  _ignore_error . @SYSCONFDIR@/rc.d/init.d/functions
 fi

 if [[ "$#" -lt 1 ]]; then


Michael

Reply via email to