/[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.2 - (show annotations) (download)
Sun Feb 14 19:42:41 2010 UTC (14 years, 8 months ago) by snetram
Branch: MAIN
CVS Tags: e-smith-base+ldap-5_2_0-17_el5_sme, e-smith-base+ldap-5_2_0-18_el5_sme, HEAD
Changes since 1.1: +9 -5 lines
Error occurred while calculating annotation data.
* Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-17.sme
- Really 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 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 20:30:01.000000000 +0100
4 @@ -1,11 +1,9 @@
5 {
6 $OUT = "";
7 return if ($InternalInterface{Name} eq "bond0");
8 - if ($THIS_DEVICE =~ /^eth[01]$/)
9 - {
10 - $OUT .= "HWADDR=" . (
11 - ($is_internal) ?
12 - $InternalInterface{HWAddress} : $ExternalInterface{HWAddress}
13 - );
14 - }
15 + return unless $THIS_DEVICE =~ /^eth[01]$/;
16 + my $hwaddr = $is_internal ?
17 + $InternalInterface{HWAddress}:
18 + $ExternalInterface{HWAddress};
19 + $OUT .= "HWADDR=$hwaddr" if $hwaddr;
20 }

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