mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

- yWeb: align mount command

Browse Source 
Conflicts:
	data/y-web/scripts/Y_Tools.sh

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-06-05 19:46:24 +02:00
committed by Thilo Graf
parent 5efbaaf05d
commit 6186fc1766
1 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
data/y-web/scripts/Y_Tools.sh
View File

@@ -227,40 +227,53 @@ do_mount()
fi fi
# default options # default options
if [ "$options1" = "" ] if [ "$options1" = "" -a "$options2" = "" ]
then then
if [ "$options2" = "" ] if [ "$fstype" = "0" ] # nfs
then then
if [ "$fstype" = "0" ] options1="soft"
then options2="nolock"
options1="ro,soft,udp" elif [ "$fstype" = "1" ] # cifs
options2="nolock,rsize=8192,wsize=8192" then
fi options1="ro"
if [ "$fstype" = "1" ] options2=""
then elif [ "$fstype" = "2" ] # lufs
options1="ro" then
fi options1=""
options2=""
fi fi
fi fi
# build mount command # build mount command
case "$fstype" in case "$fstype" in
0) #nfs 0) # nfs
cmd="mount -t nfs $ip:$dir $local_dir -o $options1" cmd="mount -t nfs $ip:$dir $local_dir"
;; ;;
1) 1) # cifs
cmd="mount -t cifs $ip/$dir $local_dir -o username=$username,password=$password,unc=//$ip/$dir,$options1"; cmd="mount -t cifs //$ip/$dir $local_dir -o username=$username,password=$password";
;; ;;
2) 2) # lufs
cmd="lufsd none $local_dir -o fs=ftpfs,username=$username,password=$password,host=$ip,root=/$dir,$options1"; cmd="lufsd none $local_dir -o fs=ftpfs,username=$username,password=$password,host=$ip,root=/$dir";
;; ;;
default) default)
echo "mount type not supported" echo "mount type not supported"
esac esac
if [ "$options1" != "" ]
then
if [ "$fstype" = "0" ] # nfs
then
cmd="$cmd -o $options1"
else
cmd="$cmd,$options1"
fi
fi
if [ "$options2" != "" ] if [ "$options2" != "" ]
then then
cmd="$cmd,$options2" cmd="$cmd,$options2"
fi fi
res=`$cmd` res=`$cmd`
echo "$cmd" >/tmp/mount.log echo "$cmd" >/tmp/mount.log
echo "$res" >>/tmp/mount.log echo "$res" >>/tmp/mount.log