e-smith-backup/sme7/e-smith-backup-2.0.0-mount_usb.patch

--- e-smith-backup-2.0.0/root/etc/e-smith/web/functions/backup.mountusb 2008-10-21 21:59:54.000000000 +1100
+++ e-smith-backup-2.0.0/root/etc/e-smith/web/functions/backup  2008-10-25 18:00:30.000000000 +1100
@@ -1765,7 +1765,7 @@
                );
        return;
        }
-    elsif ( $VFSType ne 'usb' ) {$mounted = 1}
+    else  {$mounted = 1}
     
     # Test if backup subdirectory for our server
     
@@ -1877,10 +1877,7 @@
                );
        return;
     }
-    elsif ( $VFSType ne 'usb' )
-    {
-       $mounted = 1;
-    }
+    else  {$mounted = 1}
 
     # Test if backup subdirectory for our server
     
@@ -2013,10 +2010,7 @@
            $fm->localise('ERR_MOUNTING_SMBSHARE') . "\n" . $err);
        return;
     }
-    elsif ($VFSType ne 'usb')
-    {
-       $mounted = 1;
-    }
+    else  {$mounted = 1}
 
     # Test if backup subdirectory for our server
     
@@ -2167,10 +2161,7 @@
                );
        return;
     }
-    elsif ($VFSType ne 'usb')
-    {
-       $mounted = 1;
-    }
+    else  {$mounted = 1}
 
     # Test if backup subdirectory for our server
     
@@ -2401,10 +2392,7 @@
                );
        return;
     }
-    elsif ($VFSType ne 'usb')
-    {
-       $mounted = 1;
-    }
+    else  {$mounted = 1}
 
     # Test if backup subdirectory for our server
     
@@ -2629,10 +2617,7 @@
                );
        return;
     }
-    elsif ($VFSType ne 'usb')
-    {
-       $mounted = 1;
-    }
+    else  {$mounted = 1}
 
     # Test if backup subdirectory for our server
     
@@ -2797,10 +2782,7 @@
                );
        return;
     }
-    elsif ($VFSType ne 'usb')
-    {
-       $mounted = 1;
-    }
+    else  {$mounted = 1}
 
     # Test if backup subdirectory for our server
     
@@ -3064,7 +3046,7 @@
     elsif ($VFSType eq 'usb')
     {
        $_[2] = "/" . $share;
-       return
+        return ( qx(/bin/mount "/$share" 2>&1) );
     }
     else
     {
1	--- e-smith-backup-2.0.0/root/etc/e-smith/web/functions/backup.mountusb 2008-10-21 21:59:54.000000000 +1100
2	+++ e-smith-backup-2.0.0/root/etc/e-smith/web/functions/backup 2008-10-25 18:00:30.000000000 +1100
3	@@ -1765,7 +1765,7 @@
4	);
5	return;
6	}
7	- elsif ( $VFSType ne 'usb' ) {$mounted = 1}
8	+ else {$mounted = 1}
9
10	# Test if backup subdirectory for our server
11
12	@@ -1877,10 +1877,7 @@
13	);
14	return;
15	}
16	- elsif ( $VFSType ne 'usb' )
17	- {
18	- $mounted = 1;
19	- }
20	+ else {$mounted = 1}
21
22	# Test if backup subdirectory for our server
23
24	@@ -2013,10 +2010,7 @@
25	$fm->localise('ERR_MOUNTING_SMBSHARE') . "\n" . $err);
26	return;
27	}
28	- elsif ($VFSType ne 'usb')
29	- {
30	- $mounted = 1;
31	- }
32	+ else {$mounted = 1}
33
34	# Test if backup subdirectory for our server
35
36	@@ -2167,10 +2161,7 @@
37	);
38	return;
39	}
40	- elsif ($VFSType ne 'usb')
41	- {
42	- $mounted = 1;
43	- }
44	+ else {$mounted = 1}
45
46	# Test if backup subdirectory for our server
47
48	@@ -2401,10 +2392,7 @@
49	);
50	return;
51	}
52	- elsif ($VFSType ne 'usb')
53	- {
54	- $mounted = 1;
55	- }
56	+ else {$mounted = 1}
57
58	# Test if backup subdirectory for our server
59
60	@@ -2629,10 +2617,7 @@
61	);
62	return;
63	}
64	- elsif ($VFSType ne 'usb')
65	- {
66	- $mounted = 1;
67	- }
68	+ else {$mounted = 1}
69
70	# Test if backup subdirectory for our server
71
72	@@ -2797,10 +2782,7 @@
73	);
74	return;
75	}
76	- elsif ($VFSType ne 'usb')
77	- {
78	- $mounted = 1;
79	- }
80	+ else {$mounted = 1}
81
82	# Test if backup subdirectory for our server
83
84	@@ -3064,7 +3046,7 @@
85	elsif ($VFSType eq 'usb')
86	{
87	$_[2] = "/" . $share;
88	- return
89	+ return ( qx(/bin/mount "/$share" 2>&1) );
90	}
91	else
92	{