michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use forward slashes for CIFS when saving too https://github.com/webmin/webmin/issues/68

Browse Source
This commit is contained in:
Jamie Cameron
2013-11-14 13:55:40 -08:00
parent a3da5b5826
commit 2ae5a38e15
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mount/linux-lib.pl
View File

@@ -247,7 +247,10 @@ foreach (@fstab) {
if ($line =~ /\S/ && $line !~ /\signore\s/ && $i++ == $_[0]) {
# Found the line to replace
local $dev = $_[2];
$dev =~ s/ /\\040/g;
if ($_[3] eq $smbfs_fs || $_[3] eq "cifs") {
$dev =~ s/\\/\//g;
$dev =~ s/ /\\040/g;
}
&print_tempfile(FSTAB, $dev."\t".$_[1]."\t".$_[3]);
local @opts = $_[4] eq "-" ? ( ) : split(/,/, $_[4]);
if ($_[6] eq "no") {
@@ -679,7 +682,7 @@ elsif ($_[2] eq $smbfs_fs || $_[2] eq "cifs") {
# SMB filesystem mounted with mount command
local $temp = &transname();
local $ex = &system_logged("mount -t $_[2] $opts $qshar $_[0] >$temp 2>&1 </dev/null");
local $out = `cat $temp`;
local $out = &read_file_contents($temp);
unlink($temp);
if ($ex || $out =~ /failed|error/i) {
&system_logged("umount $_[0] >/dev/null 2>&1");