Permalink
Browse files

Merge branch 'jdm-sudo-with-home-dir' into 1.2

  • Loading branch information...
2 parents 04cb50d + 911f7bc commit 586d1d37e90b4407394fe247062b1ff406a3027c @jonmeredith jonmeredith committed Jul 31, 2012
Showing with 6 additions and 6 deletions.
  1. +2 −2 rel/files/riak
  2. +2 −2 rel/files/riak-admin
  3. +2 −2 rel/files/search-cmd
View
@@ -36,8 +36,8 @@ if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then
echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
exit 1
fi
- echo "Attempting to restart script through sudo -u $RUNNER_USER"
- exec sudo -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+ echo "Attempting to restart script through sudo -H -u $RUNNER_USER"
+ exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
fi
# Warn the user if ulimit -n is less than 1024
View
@@ -29,8 +29,8 @@ if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then
echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
exit 1
fi
- echo "Attempting to restart script through sudo -u $RUNNER_USER"
- exec sudo -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+ echo "Attempting to restart script through sudo -H -u $RUNNER_USER"
+ exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
fi
# Make sure CWD is set to runner base dir
View
@@ -24,8 +24,8 @@ if [ "$RUNNER_USER" -a "x$LOGNAME" != "x$RUNNER_USER" ]; then
echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
exit 1
fi
- echo "Attempting to restart script through sudo -u $RUNNER_USER"
- exec sudo -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+ echo "Attempting to restart script through sudo -H -u $RUNNER_USER"
+ exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
fi
# Make sure CWD is set to runner base dir

0 comments on commit 586d1d3

Please sign in to comment.