diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-02-08 20:30:10 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-08 20:30:10 +0300 |
| commit | 555b1a621a9a73e8cdead9888375a43a8e59f639 (patch) | |
| tree | ec122c2aedb01e20589509e395f9e764b988ba57 | |
| parent | 4667c169e7d7e3ad2f5cf6803e5747c088bbed17 (diff) | |
| parent | 1fab3979b1f1a0172a06a22c1a238ce400c2dfe5 (diff) | |
Merge branch 'fix-init' into 'master'
Fixed init.d script not working on OS X
-s flag of su doesn't work correctly on OS X, logging in as the user
and not running the requested command. By moving the bash shell init
inside the su command we avoid the issue
Fixes Issue #3309
See merge request !1728
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rwxr-xr-x | lib/support/init.d/gitlab | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7572b6af151..988486e818d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,6 +36,7 @@ v 8.5.0 (unreleased) - Fixed logo animation on Safari (Roman Rott) - Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg) - In seach autocomplete show only groups and projects you are member of + - Fix: init.d script not working on OS X v 8.4.4 - Update omniauth-saml gem to 1.4.2 diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 1981297ecd3..d95e7023d2e 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -49,7 +49,7 @@ test -f /etc/default/gitlab && . /etc/default/gitlab # Switch to the app_user if it is not he/she who is running the script. if [ `whoami` != "$app_user" ]; then - eval su - "$app_user" -s $shell_path -c $(echo \")$0 "$@"$(echo \"); exit; + eval su - "$app_user" -c $(echo \")$shell_path -l -c \'$0 "$@"\'$(echo \"); exit; fi # Switch to the gitlab path, exit on failure. |