diff options
| author | Steve Dickson <steved@redhat.com> | 2009-06-03 13:37:15 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2009-06-03 13:37:15 -0400 |
| commit | 98bbf0650388584e8ef604085ae429879d890273 (patch) | |
| tree | d19d33a34351005ec976882910dddc51e634acd3 /runcthon | |
| parent | a63f4e4635a3e9a729310e26d5995fd8dee3c6ad (diff) | |
| download | cthon04-98bbf0650388584e8ef604085ae429879d890273.tar.gz cthon04-98bbf0650388584e8ef604085ae429879d890273.tar.xz cthon04-98bbf0650388584e8ef604085ae429879d890273.zip | |
Only mount with the minorversion option when minver is set.
Fixed some issues with the --onlykrb5 flag
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'runcthon')
| -rwxr-xr-x | runcthon | 37 |
1 files changed, 24 insertions, 13 deletions
@@ -18,9 +18,17 @@ sec=$5 if [ $vers = "4" ]; then if [ -n "$sec" ] ; then - mntargs="-F nfs4 -o proto=$proto,sec=$sec,minorversion=$minver" + if [ $minver -gt 0 ]; then + mntargs="-F nfs4 -o proto=$proto,sec=$sec,minorversion=$minver" + else + mntargs="-F nfs4 -o proto=$proto,sec=$sec" + fi else - mntargs="-F nfs4 -o proto=$proto,minorversion=$minver" + if [ $minver -gt 0 ]; then + mntargs="-F nfs4 -o proto=$proto,minorversion=$minver" + else + mntargs="-F nfs4 -o proto=$proto" + fi fi else if [ -n "$sec" ] ; then @@ -72,7 +80,7 @@ mkdirs() done exit 0 } -trap 'echo SIGINT; pkill runcthon server; exit 1 ' SIGINT +trap 'echo SIGINT; pkill runcthon; pkill server; exit 1 ' SIGINT trap 'echo; echo -n "Done:"; date; exit 2' SIGTERM Usage="$0 --mkdirs|--unmountall|--server|--serverdir|--noudp|--dokrb5|--onlykrb5|--nov4|--onlyv3|--onlyv4|--minver" @@ -168,33 +176,36 @@ do runtests -$i $SRV 4 tcp "" fi fi + echo -n "Waiting for '$i' to finish..." + wait fi - echo -n "Waiting for '$i' to finish..." - wait - if [ "$dokrb5" -eq 1 ]; then + if [ "$onlykrb5" -eq 1 ]; then for j in krb5 krb5i krb5p do - if ["$noudp" -ne 1 ]; then + if [ "$noudp" -ne 1 ]; then if [ "$onlyv4" -eq 0 ]; then runtests -$i $SRV 3 udp $j - if [ "$onlyv3" -eq 0 ]; then + if [ "$onlyv3" -eq 0 ]; then runtests -$i $SRV 2 udp $j fi fi fi - if [ "$onlyv4" -eq 0 ]; then runtests -$i $SRV 3 tcp $j if [ "$onlyv3" -eq 0 ]; then runtests -$i $SRV 2 tcp $j fi fi - if [ "$nov4" -eq 0 ]; then - runtests -$i $SRV 4 tcp $j + if [ "$onlyv3" -ne 1 ]; then + if [ "$nov4" -eq 0 ]; then + runtests -$i $SRV 4 tcp $j + fi fi + echo -n "Waiting for '$i' to finish..." + wait + echo -n "Done: " + date done fi - echo -n "Done: " - date done |