/[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.1 by snetram, Wed Mar 17 18:38:25 2010 UTC Revision 1.2 by snetram, Wed Mar 17 18:43:55 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       );       );
 @@ -327,30 +327,30 @@ sub relocate_samba_file  
  {  
      my ($self, $filename) = @_;  
   
 -    return if ( -l "/etc/$filename" and -f "/etc/samba/$filename" );  
 +    return if ( -l "/etc/$filename" and -f "/var/cache/samba/$filename" );  
   
 -    unlink  "/etc/samba/$filename" if ( -l "/etc/samba/$filename");  
 +    unlink  "/etc/samba/$filename" if ( -l "/var/cache/samba/$filename");  
   
 -    if ( -f "/etc/$filename" and -f "/etc/samba/$filename" )  
 +    if ( -f "/etc/$filename" and -f "/var/cache/samba/$filename" )  
      {  
 -       warn "/etc/$filename and /etc/samba/$filename exist - preserving /etc/samba/$filename.$$\n";  
 +       warn "/etc/$filename and /var/cache/samba/$filename exist - preserving /var/cache/samba/$filename.$$\n";  
   
 -       move "/etc/samba/$filename", "/etc/samba/$filename.$$" or  
 -           warn "Couldn't move /etc/samba/$filename to /etc/samba/$filename.$$\n";  
 +       move "/var/cache/samba/$filename", "/var/cache/samba/$filename.$$" or  
 +           warn "Couldn't move /var/cache/samba/$filename to /var/cache/samba/$filename.$$\n";  
      }  
   
      if ( -f "/etc/$filename" )  
      {  
 -       unlink "/etc/samba/$filename" if ( -l "/etc/samba/$filename" );  
 +       unlink "/var/cache/samba/$filename" if ( -l "/var/cache/samba/$filename" );  
   
 -       move "/etc/$filename", "/etc/samba/$filename" or  
 -           warn "Couldn't move /etc/$filename to /etc/samba/$filename\n";  
 +       move "/etc/$filename", "/var/cache/samba/$filename" or  
 +           warn "Couldn't move /etc/$filename to /var/cache/samba/$filename\n";  
   
      }  
   
      unless ( -l "/etc/$filename" )  
      {  
 -       symlink "/etc/samba/$filename", "/etc/$filename";  
 +       symlink "/var/cache/samba/$filename", "/etc/$filename";  
      }  
  }  
13    

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