vstart: just use ganesha.nfsd that's in $PATH

In an earlier patch, I added a --ganesha-path option, but that left out
ganesha-rados-grace, which also could be in an alternate path. Instead,
just change vstart to run whatever ganesha.nfsd it finds in $PATH. We
already do that for ganesha-rados-grace so it should be fine to do that
for ganesha.nfsd as well.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit eab8c8136dc5379efde28e62f195437997c9db7f)

Conflicts:
	src/vstart.sh

- Removed bluestore-zoned option as pr(#35111) is not backported yet.

diff --git a/src/vstart.sh b/src/vstart.sh
index 0880314ac677582576846d1e48593cc741e3619e..a083309f4555f5a83a93a256981e7f07d66e7390 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -174,7 +174,6 @@ fi
 filestore_path=
 kstore_path=
 bluestore_dev=
-ganesha_path=/usr/bin/ganesha.nfsd
 
 VSTART_SEC="client.vstart.sh"
 
@@ -232,7 +231,6 @@ usage=$usage"\t--bluestore-devs: comma-separated list of blockdevs to use for bl
 usage=$usage"\t--inc-osd: append some more osds into existing vcluster\n"
 usage=$usage"\t--cephadm: enable cephadm orchestrator with ~/.ssh/id_rsa[.pub]\n"
 usage=$usage"\t--no-parallel: dont start all OSDs in parallel\n"
-usage=$usage"\t--ganesha-path: path to ganesha.nfsd binary (defaults to $ganesha_path)\n"
 
 usage_exit() {
     printf "$usage"
@@ -441,10 +439,6 @@ case $1 in
         done
         shift
         ;;
-    --ganesha-path)
-        ganesha_path="$2"
-        shift
-        ;;
     * )
         usage_exit
 esac
@@ -1145,7 +1139,7 @@ EOF
         prun env CEPH_CONF="${conf_fn}" ganesha-rados-grace --userid $test_user -p $pool_name -n $namespace add $name
         prun env CEPH_CONF="${conf_fn}" ganesha-rados-grace --userid $test_user -p $pool_name -n $namespace
 
-        prun env CEPH_CONF="${conf_fn}" $ganesha_path -L "$CEPH_OUT_DIR/ganesha-$name.log" -f "$ganesha_dir/ganesha-$name.conf" -p "$CEPH_OUT_DIR/ganesha-$name.pid" -N NIV_DEBUG
+        prun env CEPH_CONF="${conf_fn}" ganesha.nfsd -L "$CEPH_OUT_DIR/ganesha-$name.log" -f "$ganesha_dir/ganesha-$name.conf" -p "$CEPH_OUT_DIR/ganesha-$name.pid" -N NIV_DEBUG
 
         # Wait few seconds for grace period to be removed
         sleep 2