/[smeserver]/rpms/e-smith-backup/sme8/e-smith-backup-2.2.0-adjust-for-samba-tdb-locations.patch
ViewVC logotype

Diff of /rpms/e-smith-backup/sme8/e-smith-backup-2.2.0-adjust-for-samba-tdb-locations.patch

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

Revision 1.2 by snetram, Wed Mar 17 18:43:55 2010 UTC Revision 1.3 by snetram, Wed Mar 17 18:50:54 2010 UTC
# Line 10  diff -up e-smith-backup-2.2.0/root/usr/l Line 10  diff -up e-smith-backup-2.2.0/root/usr/l
10           'etc/samba/smbpasswd',           'etc/samba/smbpasswd',
11           'etc/smbpasswd',           'etc/smbpasswd',
12       );       );
13    @@ -327,30 +327,30 @@ sub relocate_samba_file
14     {
15         my ($self, $filename) = @_;
16    
17    -    return if ( -l "/etc/$filename" and -f "/etc/samba/$filename" );
18    +    return if ( -l "/etc/$filename" and -f "/var/cache/samba/$filename" );
19    
20    -    unlink  "/etc/samba/$filename" if ( -l "/etc/samba/$filename");
21    +    unlink  "/etc/samba/$filename" if ( -l "/var/cache/samba/$filename");
22    
23    -    if ( -f "/etc/$filename" and -f "/etc/samba/$filename" )
24    +    if ( -f "/etc/$filename" and -f "/var/cache/samba/$filename" )
25         {
26    -       warn "/etc/$filename and /etc/samba/$filename exist - preserving /etc/samba/$filename.$$\n";
27    +       warn "/etc/$filename and /var/cache/samba/$filename exist - preserving /var/cache/samba/$filename.$$\n";
28    
29    -       move "/etc/samba/$filename", "/etc/samba/$filename.$$" or
30    -           warn "Couldn't move /etc/samba/$filename to /etc/samba/$filename.$$\n";
31    +       move "/var/cache/samba/$filename", "/var/cache/samba/$filename.$$" or
32    +           warn "Couldn't move /var/cache/samba/$filename to /var/cache/samba/$filename.$$\n";
33         }
34    
35         if ( -f "/etc/$filename" )
36         {
37    -       unlink "/etc/samba/$filename" if ( -l "/etc/samba/$filename" );
38    +       unlink "/var/cache/samba/$filename" if ( -l "/var/cache/samba/$filename" );
39    
40    -       move "/etc/$filename", "/etc/samba/$filename" or
41    -           warn "Couldn't move /etc/$filename to /etc/samba/$filename\n";
42    +       move "/etc/$filename", "/var/cache/samba/$filename" or
43    +           warn "Couldn't move /etc/$filename to /var/cache/samba/$filename\n";
44    
45         }
46    
47         unless ( -l "/etc/$filename" )
48         {
49    -       symlink "/etc/samba/$filename", "/etc/$filename";
50    +       symlink "/var/cache/samba/$filename", "/etc/$filename";
51         }
52     }
53    

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed