From: Loic Dachary <loic-201408@dachary.org>
Date: Thu, 13 Nov 2014 20:58:45 +0000 (+0100)
Subject: Merge pull request #2772 from ceph/wip-init-radosgw
X-Git-Tag: v0.90~94
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4509674d79e5fe33966923bd016c72427ece7354;p=ceph.git

Merge pull request #2772 from ceph/wip-init-radosgw

init-radosgw.sysv: set ulimit -n before starting daemon

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

4509674d79e5fe33966923bd016c72427ece7354
diff --cc src/init-radosgw.sysv
index 3285ed925f57,76b83d8a316f..e7c9db570f72
--- a/src/init-radosgw.sysv
+++ b/src/init-radosgw.sysv
@@@ -84,11 -84,11 +84,11 @@@ case "$1" i
                  chown $user $log_file
              fi
  
 -            if [ $SYSTEMD -eq 1 ]; then
 -                systemd-run -r bash -c "ulimit -n 32768; $RADOSGW -n $name"
 +            if [ -n "$SYSTEMD_RUN" ]; then
 +                $SYSTEMD_RUN -r bash -c "ulimit -n 32768; $RADOSGW -n $name"
              else
-                 #start-stop-daemon --start -u $user -x $RADOSGW -- -n $name
-                 daemon --user="$user" "ulimit -n 32768; $RADOSGW -n $name"
+ 		ulimit -n 32768
+                 daemon --user="$user" "$RADOSGW -n $name"
              fi
              echo "Starting $name..."
          done