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 --- smeserver-bridge-interface-0.1/root/etc/e-smith/db/configuration/migrate/50bridge-interface 2008-12-02 03:53:53.000000000 +0100 +++ mezzanine_patched_smeserver-bridge-interface-0.1/root/etc/e-smith/db/configuration/migrate/50bridge-interface 2008-12-11 23:22:20.000000000 +0100 @@ -1,8 +1,14 @@ { my $bridge = $DB->get('bridge') || $DB->new_record('bridge', {type => 'service'}); + my $brStatus = $bridge->prop('status') || 'enabled'; + + # Return nothing if bridge is disabled + return "" if ($brStatus eq 'disabled'); + my $br = $bridge->prop('bridgeInterface') || 'br0'; my $IntIfConf = $DB->get('InternalInterface'); my $IntIfName = $IntIfConf->prop('Name'); + # If the InternalInterface Name is the same as the bridge, there's nothing to do return "" if ($IntIfName eq $br); @@ -11,6 +17,5 @@ $bridge->set_prop('ethernetInterface',$IntIfName); $IntIfConf->set_prop('Name',$br); - }