/[smeserver]/rpms/e-smith-base+ldap/sme8/e-smith-base+ldap-5.2.0-fix-template-expansion-error.patch
ViewVC logotype

Diff of /rpms/e-smith-base+ldap/sme8/e-smith-base+ldap-5.2.0-fix-template-expansion-error.patch

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

Revision 1.1 by snetram, Sun Feb 14 10:40:58 2010 UTC Revision 1.2 by snetram, Sun Feb 14 19:42:41 2010 UTC
# Line 1  Line 1 
1  diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/ifcfg-ethX/10HWADDR.fix-template-expansion-error e-smith-base-5.2.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/ifcfg-ethX/10HWADDR  diff -up e-smith-base-5.2.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/ifcfg-ethX/10HWADDR.fix-template-expansion-error e-smith-base-5.2.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/ifcfg-ethX/10HWADDR
2  --- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/ifcfg-ethX/10HWADDR.fix-template-expansion-error        2010-02-14 11:33:04.000000000 +0100  --- e-smith-base-5.2.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/ifcfg-ethX/10HWADDR.fix-template-expansion-error        2010-02-14 20:26:17.000000000 +0100
3  +++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/ifcfg-ethX/10HWADDR     2010-02-14 11:35:10.000000000 +0100  +++ e-smith-base-5.2.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/ifcfg-ethX/10HWADDR     2010-02-14 20:30:01.000000000 +0100
4  @@ -2,10 +2,6 @@  @@ -1,11 +1,9 @@
5     {
6       $OUT = "";       $OUT = "";
7       return if ($InternalInterface{Name} eq "bond0");       return if ($InternalInterface{Name} eq "bond0");
8       if ($THIS_DEVICE =~ /^eth[01]$/)  -    if ($THIS_DEVICE =~ /^eth[01]$/)
9  -    {  -    {
10  -        $OUT .= "HWADDR=" . (  -        $OUT .= "HWADDR=" . (
11  -            ($is_internal) ?  -            ($is_internal) ?
12  -            $InternalInterface{HWAddress} : $ExternalInterface{HWAddress}  -            $InternalInterface{HWAddress} : $ExternalInterface{HWAddress}
13  -        );  -        );
14  -    }  -    }
15  +    my $hwaddr = $is_internal ? $InternalInterface{HWAddress} : $ExternalInterface{HWAddress};  +    return unless $THIS_DEVICE =~ /^eth[01]$/;
16    +    my $hwaddr = $is_internal ?
17    +        $InternalInterface{HWAddress}:
18    +        $ExternalInterface{HWAddress};
19  +    $OUT .= "HWADDR=$hwaddr" if $hwaddr;  +    $OUT .= "HWADDR=$hwaddr" if $hwaddr;
20   }   }

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