/[smecontribs]/rpms/smeserver-bridge-interface/contribs7/smeserver-bridge-interface-0.1-migrate_db_when_disabled.patch
ViewVC logotype

Contents of /rpms/smeserver-bridge-interface/contribs7/smeserver-bridge-interface-0.1-migrate_db_when_disabled.patch

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


Revision 1.1 - (show annotations) (download)
Mon Mar 2 23:24:46 2009 UTC (15 years, 8 months ago) by slords
Branch: MAIN
CVS Tags: smeserver-bridge-interface-0_1-4_el4_sme, smeserver-bridge-interface-0_1-5_el4_sme, smeserver-bridge-interface-0_1-6_el4_sme, smeserver-bridge-interface-0_1-3_el4_sme, HEAD
Error occurred while calculating annotation data.
Initial import of smeserver-bridge-interface

1 diff -Nur -x '*.orig' -x '*.rej' smeserver-bridge-interface-0.1/root/etc/e-smith/db/configuration/migrate/50bridge-interface mezzanine_patched_smeserver-bridge-interface-0.1/root/etc/e-smith/db/configuration/migrate/50bridge-interface
2 --- smeserver-bridge-interface-0.1/root/etc/e-smith/db/configuration/migrate/50bridge-interface 2008-12-02 03:53:53.000000000 +0100
3 +++ mezzanine_patched_smeserver-bridge-interface-0.1/root/etc/e-smith/db/configuration/migrate/50bridge-interface 2008-12-11 23:22:20.000000000 +0100
4 @@ -1,8 +1,14 @@
5 {
6 my $bridge = $DB->get('bridge') || $DB->new_record('bridge', {type => 'service'});
7 + my $brStatus = $bridge->prop('status') || 'enabled';
8 +
9 + # Return nothing if bridge is disabled
10 + return "" if ($brStatus eq 'disabled');
11 +
12 my $br = $bridge->prop('bridgeInterface') || 'br0';
13 my $IntIfConf = $DB->get('InternalInterface');
14 my $IntIfName = $IntIfConf->prop('Name');
15 +
16 # If the InternalInterface Name is the same as the bridge, there's nothing to do
17 return "" if ($IntIfName eq $br);
18
19 @@ -11,6 +17,5 @@
20
21 $bridge->set_prop('ethernetInterface',$IntIfName);
22 $IntIfConf->set_prop('Name',$br);
23 -
24 }
25

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