]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart: Ensure cephadm and NFS does not conflict
authorVarsha Rao <varao@redhat.com>
Mon, 4 May 2020 14:13:12 +0000 (19:43 +0530)
committerVarsha Rao <varao@redhat.com>
Wed, 8 Jul 2020 05:36:34 +0000 (07:36 +0200)
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 31767428fc36f34331b75dd899ed0b9ae6b3ecaf)

src/vstart.sh

index 9e459c875805be9ead9582cca562b90e6fcada61..ceeb91145de00cad1d1fbe03a66f36a5cfba3404 100755 (executable)
@@ -1360,7 +1360,7 @@ EOF
 fi
 
 # Ganesha Daemons
-if [ $GANESHA_DAEMON_NUM -gt 0 ]; then
+if [ $GANESHA_DAEMON_NUM -gt 0 ] && [ "$cephadm" -eq 0 ]; then
     start_ganesha
 fi