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

Annotation of /rpms/e-smith-backup/sme7/e-smith-backup-2.0.0-smbfs.patch

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

Revision 1.2 - (hide annotations) (download)
Tue Oct 28 23:03:58 2008 UTC (16 years, 1 month ago) by slords
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-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-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-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
Changes since 1.1: +11 -0 lines 
Updates
1 slords 1.1 --- e-smith-backup-2.0.0/root/etc/e-smith/db/configuration/defaults/backupwk/VFSType.smbfs 2008-10-07 11:34:31.000000000 -0600
2     +++ e-smith-backup-2.0.0/root/etc/e-smith/db/configuration/defaults/backupwk/VFSType 2008-10-20 09:39:09.000000000 -0600
3     @@ -1 +1 @@
4     -smbfs
5     +cifs
6     --- e-smith-backup-2.0.0/root/etc/e-smith/web/functions/backup.smbfs 2008-10-20 09:33:53.000000000 -0600
7     +++ e-smith-backup-2.0.0/root/etc/e-smith/web/functions/backup 2008-10-20 09:38:33.000000000 -0600
8     @@ -1050,8 +1050,8 @@
9     my $VFSType;
10     my $dof;
11     my @dlabels = split(' ', $fm->localise('DOW'));
12     - my @VFST = ('smbfs', 'cifs', 'nfs', 'usb');
13     - my %VFST = ('smbfs', 'smbfs', 'cifs', 'cifs', 'nfs', 'nfs', 'usb', 'local usb disk');
14     + my @VFST = ('cifs', 'nfs', 'usb');
15     + my %VFST = ('cifs', 'cifs', 'nfs', 'nfs', 'usb', 'local usb disk');
16    
17     # Obtain backup informations from configuration
18     my $rec = $conf->get('backupwk');
19     @@ -1068,7 +1068,7 @@
20     $backupwkIncOnlyTimeout = $rec->prop('IncOnlyTimeout') || 'yes';
21     $compression = $rec->prop('Compression') || '0';
22     $dof = (defined $rec->prop('FullDay')) ? $rec->prop('FullDay') : '7';
23     - $VFSType = $rec->prop('VFSType') || 'smbfs';
24     + $VFSType = $rec->prop('VFSType') || 'cifs';
25     $backupwk_status = $rec->prop('status');
26     }
27    
28     @@ -1087,7 +1087,7 @@
29     print ' ', $fm->localise('WORKSTN_BACKUP_VFSTYPE'), ' ', $VFSType, '<br/>';
30     }
31     print $fm->localise('WORKSTN_BACKUP_SHARE'), ' ', $backupwkFolder, '<br/>';
32     - if (($VFSType eq 'smbfs') || ($VFSType eq 'cifs')) {
33     + if ($VFSType eq 'cifs') {
34     print $fm->localise('LOGIN'), ' ', $backupwkLogin, '<br/>';
35     print $fm->localise('PASSWORD'), ' ', $backupwkPassword, '<br/>';
36     }
37     @@ -1311,7 +1311,7 @@
38     );
39     }
40    
41     - if ( ( $VFSType eq 'smbfs' ) || ( $VFSType eq 'cifs' ) ) {
42     + if ( $VFSType eq 'cifs' ) {
43     print $q->Tr(
44     esmith::cgi::genCell(
45     $q,
46     @@ -1520,7 +1520,7 @@
47     } else {
48     $backupwkLogin = "";
49     }
50     - if ( ( $backupwkLogin eq "" ) && (( $VFSType eq 'smbfs' ) || ( $VFSType eq 'cifs' )) )
51     + if ( ( $backupwkLogin eq "" ) && ( $VFSType eq 'cifs' ) )
52     {
53     esmith::cgi::genResult(
54     $q, $fm->localise('ERR_INVALID_LOGIN')
55     @@ -1534,7 +1534,7 @@
56     } else {
57     $backupwkPassword = "";
58     }
59     - if ( ( $backupwkPassword eq "" ) && (( $VFSType eq 'smbfs' ) || ( $VFSType eq 'cifs' )) )
60     + if ( ( $backupwkPassword eq "" ) && ( $VFSType eq 'cifs' ) )
61     {
62     esmith::cgi::genResult(
63     $q, $fm->localise('ERR_INVALID_PASSWORD')
64     @@ -1732,7 +1732,7 @@
65     my $id = $rec->prop('Id') || $conf->get('SystemName')->value . "." . $conf->get('DomainName')->value;
66     my $smbhost = $rec->prop('SmbHost');
67     my $smbshare = $rec->prop('SmbShare');
68     - my $VFSType = $rec->prop('VFSType') || 'smbfs';
69     + my $VFSType = $rec->prop('VFSType') || 'cifs';
70     my $err;
71    
72     my $setbackuplist = sub {
73     @@ -1866,7 +1866,7 @@
74     my $id = $backupwkrec->prop('Id') ||
75     $conf->get('SystemName')->value . "." . $conf->get('DomainName')->value;
76     my $err;
77     - my $VFSType = $backupwkrec->prop('VFSType') || 'smbfs';
78     + my $VFSType = $backupwkrec->prop('VFSType') || 'cifs';
79    
80     # Mounting backup shared folder
81    
82     @@ -1979,7 +1979,7 @@
83     my $key;
84     my $id = $rec->prop('Id') ||
85     $conf->get('SystemName')->value . "." . $conf->get('DomainName')->value;
86     - my $VFSType = $rec->prop('VFSType') || 'smbfs';
87     + my $VFSType = $rec->prop('VFSType') || 'cifs';
88     my $smbhost = $rec->prop('SmbHost');
89     my $smbshare = $rec->prop('SmbShare');
90     my $err;
91     @@ -2151,7 +2151,7 @@
92     || $conf->get('SystemName')->value . "." . $conf->get('DomainName')->value;
93     my $mntdir = $backupwkrec->prop('MountDir') || '/mnt/smb';
94     my $mounted;
95     - my $VFSType = $backupwkrec->prop('VFSType') || 'smbfs';
96     + my $VFSType = $backupwkrec->prop('VFSType') || 'cifs';
97     my $smbhost = $backupwkrec->prop('SmbHost');
98     my $smbshare = $backupwkrec->prop('SmbShare');
99     my $err;
100     @@ -2365,7 +2365,7 @@
101     my @blabels;
102     my $backups = 0;
103     my $filterexp;
104     - my $VFSType = $rec->prop('VFSType') || 'smbfs';
105     + my $VFSType = $rec->prop('VFSType') || 'cifs';
106     my $smbhost = $rec->prop('SmbHost');
107     my $smbshare = $rec->prop('SmbShare');
108     my $err;
109     @@ -2607,7 +2607,7 @@
110     $conf->get('SystemName')->value . "." . $conf->get('DomainName')->value;
111     my @flabels;
112     my %flabels = ();
113     - my $VFSType = $backupwkrec->prop('VFSType') || 'smbfs';
114     + my $VFSType = $backupwkrec->prop('VFSType') || 'cifs';
115     my $err;
116    
117     my $backupkey = $q->param ('backupset');
118     @@ -2785,7 +2785,7 @@
119     $conf->get('SystemName')->value . "." . $conf->get('DomainName')->value;
120     my $mntdir = $backupwkrec->prop('MountDir') || '/mnt/smb';
121     my $mounted;
122     - my $VFSType = $backupwkrec->prop('VFSType') || 'smbfs';
123     + my $VFSType = $backupwkrec->prop('VFSType') || 'cifs';
124     my $smbhost = $backupwkrec->prop('SmbHost');
125     my $smbshare = $backupwkrec->prop('SmbShare');
126     my $err;
127     @@ -3057,10 +3057,6 @@
128     {
129     return ( qx(/bin/mount -t cifs "$host:$share" $mountdir -o user=$login,pass=$password) );
130     }
131     - elsif ($VFSType eq 'smbfs')
132     - {
133     - return ( qx(/bin/mount -t smbfs "//$host/$share" $mountdir -o username=$login,password=$password,dmask=777,fmask=777,ip=$host 2>&1) );
134     - }
135     elsif ($VFSType eq 'nfs')
136     {
137     return ( qx(/bin/mount -t nfs -o nolock "$host:/$share" $mountdir 2>&1) );
138     --- e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar.smbfs 2008-10-20 09:33:53.000000000 -0600
139     +++ e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar 2008-10-20 09:39:38.000000000 -0600
140     @@ -66,7 +66,7 @@
141     my $incnum = $backupwk->prop('IncNum'); $incnum = ($daysinset-1) unless defined $incnum;
142     my $timeout = (($backupwk->prop('Timeout') * 3600) - 30) || '88500';
143     my $inconly = $backupwk->prop('IncOnlyTimeout') || 'no';
144     -my $VFSType = $backupwk->prop('VFSType') || 'smbfs';
145     +my $VFSType = $backupwk->prop('VFSType') || 'cifs';
146     my $fullday = $backupwk->prop('FullDay') || 7;
147     my $mail = $backupwk->prop('MailNotify') || 'yes';
148     my $mntdir = $backupwk->prop('Mount') || '/mnt/smb';
149     @@ -119,11 +119,6 @@
150     $err = qx(/bin/mount -t cifs "$smbhost:$smbshare" $mntdir -o user=$login,pass=$password 2>&1);
151     ldie("Error while mounting $smbhost:$smbshare : \n" . $err) if $err;
152     }
153     -elsif ($VFSType eq 'smbfs')
154     -{
155     - $err = qx(/bin/mount -t smbfs "//$smbhost/$smbshare" $mntdir -o username=$login,password=$password,dmask=777,fmask=777,ip=$smbhost 2>&1);
156     - ldie("Error while mounting //$smbhost/$smbshare : \n" . $err) if $err;
157     -}
158     elsif ($VFSType eq 'nfs')
159     {
160     $err = qx(/bin/mount -t nfs -o nolock "$smbhost:/$smbshare" $mntdir 2>&1);
161     --- e-smith-backup-2.0.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup.smbfs 2008-10-20 09:33:53.000000000 -0600
162     +++ e-smith-backup-2.0.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2008-10-20 09:40:17.000000000 -0600
163     @@ -57,7 +57,7 @@
164     <P>The workstation backup method uses a software package called <I>dar</I>
165     to back up your server configuration and data files to a workstation
166     on your LAN (or a local USB disk). This requires you provide a writable share
167     - (smbfs, cifs, or nfs) on the backup workstation or an a local USB disk. You can manage
168     + (cifs or nfs) on the backup workstation or an a local USB disk. You can manage
169     how many rotating sets of backup are kept on the backup share, and also make each
170     set doing incremental backup upon several days. The backup is performed
171     automatically at the selected time every night. Currently
172 slords 1.2 --- e-smith-backup-2.0.0/root/etc/e-smith/db/configuration/migrate/30vfstype.migrate 2008-10-28 16:59:19.000000000 -0600
173     +++ e-smith-backup-2.0.0/root/etc/e-smith/db/configuration/migrate/30vfstype 2008-10-28 17:00:33.000000000 -0600
174     @@ -0,0 +1,8 @@
175     +{
176     + my $vfs = $DB->get_prop('backupwk', 'VFSType');
177     + return unless defined $vfs;
178     + if ($vfs eq 'smbfs')
179     + {
180     + $DB->set_prop('backupwk', 'VFSType', 'cifs')
181     + }
182     +}
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed