Try to convert old bridges config to the new format.

1 files changed, 22 insertions, 3 deletions

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 59041ca..9f5c1c1 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1668,9 +1668,28 @@ function convert_config() {
 
 		unset($config['bridge']);
 
-		foreach ($config['interfaces'] as &$intf) {
-			if (isset($intf['bridge']))
-				unset($intf['bridge']);
+		$convert_bridges = false;
+		foreach($config['interfaces'] as $intf) {
+			if (isset($intf['bridge']) && $intf['bridge'] <> "") {
+				$config['bridges'] = array();
+				$config['bridges']['bridge'] = array();
+				$convert_bridges = true;
+				break;
+			}
+		}
+		if ($convert_bridges == true) {
+			$i = 0;
+			foreach ($config['interfaces'] as $ifr => &$intf) {
+				if (isset($intf['bridge']) && $intf['bridge'] <> "") {
+					$nbridge = array();
+					$nbridge['members'] = "{$ifr},{$intf['bridge']}";
+					$nbridge['descr'] = "Converted bridged {$ifr}";
+					$nbridge['bridgeif'] = "bridge{$i}";
+					$config['bridges']['bridge'][] = $nbridge;
+					unset($intf['bridge']);
+					$i++;
+				}
+			}
 		}
 	}