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

Contents 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


Revision 1.1 - (show annotations) (download)
Sun Feb 14 10:40:58 2010 UTC (14 years, 3 months ago) by snetram
Branch: MAIN
CVS Tags: e-smith-base+ldap-5_2_0-16_el5_sme
* Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-16.sme
- Fix template expansion error [SME: 4528]

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
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
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
4 @@ -2,10 +2,6 @@
5 $OUT = "";
6 return if ($InternalInterface{Name} eq "bond0");
7 if ($THIS_DEVICE =~ /^eth[01]$/)
8 - {
9 - $OUT .= "HWADDR=" . (
10 - ($is_internal) ?
11 - $InternalInterface{HWAddress} : $ExternalInterface{HWAddress}
12 - );
13 - }
14 + my $hwaddr = $is_internal ? $InternalInterface{HWAddress} : $ExternalInterface{HWAddress};
15 + $OUT .= "HWADDR=$hwaddr" if $hwaddr;
16 }

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