/[smeserver]/rpms/e-smith-backup/sme7/e-smith-backup-2.0.0-mount_usb.patch
ViewVC logotype

Contents of /rpms/e-smith-backup/sme7/e-smith-backup-2.0.0-mount_usb.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Sat Oct 25 07:21:44 2008 UTC (16 years ago) by dungog
Branch: MAIN
CVS Tags: e-smith-backup-2_0_0-36_el4_sme, e-smith-backup-2_0_0-21_el4_sme, e-smith-backup-2_0_0-35_el4_sme, e-smith-backup-2_0_0-27_el4_sme, e-smith-backup-2_0_0-15_el4_sme, e-smith-backup-2_0_0-23_el4_sme, e-smith-backup-2_0_0-19_el4_sme, e-smith-backup-2_0_0-26_el4_sme, e-smith-backup-2_0_0-38_el4_sme, e-smith-backup-2_0_0-33_el4_sme, e-smith-backup-2_0_0-32_el4_sme, e-smith-backup-2_0_0-29_el4_sme, e-smith-backup-2_0_0-22_el4_sme, e-smith-backup-2_0_0-14_el4_sme, e-smith-backup-2_0_0-20_el4_sme, e-smith-backup-2_0_0-16_el4_sme, e-smith-backup-2_0_0-31_el4_sme, e-smith-backup-2_0_0-18_el4_sme, e-smith-backup-2_0_0-28_el4_sme, e-smith-backup-2_0_0-13_el4_sme, e-smith-backup-2_0_0-30_el4_sme, e-smith-backup-2_0_0-37_el4_sme, e-smith-backup-2_0_0-34_el4_sme, e-smith-backup-2_0_0-24_el4_sme, e-smith-backup-2_0_0-17_el4_sme, e-smith-backup-2_0_0-25_el4_sme, HEAD
* Sat Oct 25 2008 Stephen Noble <support@dungog.net> 2.0.0-13.sme
- correct mounting for usb disks [SME: 4695]

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 {

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed