This commit is contained in:
devdatt 2025-12-23 14:46:45 +05:30
parent bb7eedabb0
commit 89c00fc772
1 changed files with 8 additions and 23 deletions

View File

@ -134,29 +134,13 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
'version' => 2, 'version' => 2,
'renderer' => 'networkd', 'renderer' => 'networkd',
'ethernets' => [], 'ethernets' => [],
'vlans' => new stdClass() 'vlans' => [] // MUST be array while building
] ]
]; ];
/* ---------- PRIMARY ---------- */
if (
$data['primary']['mode'] !== 'disabled' ||
$data['primary']['modev6'] !== 'disabled'
) {
$netplan['network']['ethernets'][$iface] =
build_interface($data['primary'], 'primary');
/* ---------- SECONDARY ---------- */
} elseif (
$data['secondary']['mode'] !== 'disabled' ||
$data['secondary']['modev6'] !== 'disabled'
) {
$netplan['network']['ethernets'][$iface] =
build_interface($data['secondary'], 'secondary');
}
foreach (['primary', 'secondary'] as $type) { foreach (['primary', 'secondary'] as $type) {
/* Skip disabled blocks */
if ( if (
$data[$type]['mode'] === 'disabled' && $data[$type]['mode'] === 'disabled' &&
$data[$type]['modev6'] === 'disabled' $data[$type]['modev6'] === 'disabled'
@ -166,15 +150,16 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$vlan = trim($data[$type]["network_{$type}_vlan"] ?? ''); $vlan = trim($data[$type]["network_{$type}_vlan"] ?? '');
if ($vlan === '') { /* Base NIC must exist if any VLAN is used */
$netplan['network']['ethernets'][$iface] = if ($vlan !== '') {
build_interface($data[$type], $type);
} else {
$netplan['network']['ethernets'][$iface] = new stdClass(); $netplan['network']['ethernets'][$iface] = new stdClass();
$netplan['network']['vlans']["{$iface}.{$vlan}"] = $netplan['network']['vlans']["{$iface}.{$vlan}"] =
array_merge( array_merge(
['id' => (int)$vlan, 'link' => $iface], [
'id' => (int)$vlan,
'link' => $iface
],
build_interface($data[$type], $type) build_interface($data[$type], $type)
); );
} }