aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/routed.inc6
-rw-r--r--packages/routed.xml6
2 files changed, 7 insertions, 5 deletions
diff --git a/packages/routed.inc b/packages/routed.inc
index 92cd5701..b3f4e8cd 100644
--- a/packages/routed.inc
+++ b/packages/routed.inc
@@ -35,8 +35,8 @@ function setup_routed() {
if (isset($config['installedpackages']['routed']['config'][0]['enable']) &&
$config['installedpackages']['routed']['config'][0]['enable'] == "on") {
/* if user selected individual interfaces */
- if (is_array($config['installedpackages']['routed']['config'][0]['interface_array'])) {
- $ifarr = $config['installedpackages']['routed']['config'][0]['interface_array'];
+ $ifarr = explode(",", $config['installedpackages']['routed']['config'][0]['iface_array']);
+ if(count($ifarr) != 0) {
foreach($ifarr as $iface) {
$gw .= setup_etc_gateways($iface);
}
@@ -57,7 +57,7 @@ function setup_etc_gateways($iface="") {
global $config;
if (isset($iface)) {
- $realif= convert_friendly_interface_to_real_interface_name($iface);
+ $realif=convert_friendly_interface_to_real_interface_name(strtoupper($iface));
$ret = "if={$realif} ";
}
if ($config['installedpackages']['routed']['config'][0]['ripversion'] == "2") {
diff --git a/packages/routed.xml b/packages/routed.xml
index 31f0e59b..db738818 100644
--- a/packages/routed.xml
+++ b/packages/routed.xml
@@ -64,11 +64,11 @@
<fieldname>enable</fieldname>
<description>Enables the Routing Information Protocol daemon</description>
<type>checkbox</type>
- <enablefields>interface_array,ripversion,passwd</enablefields>
+ <enablefields>iface_array,ripversion,passwd</enablefields>
</field>
<field>
<fielddescr>Interfaces</fielddescr>
- <fieldname>interface_array</fieldname>
+ <fieldname>iface_array</fieldname>
<value>lan</value>
<multiple>true</multiple>
<size>3</size>
@@ -109,6 +109,8 @@
</custom_php_resync_config_command>
<custom_php_install_command>
</custom_php_install_command>
+ sync_package_routed('install');
<custom_php_deinstall_command>
+ sync_package_routed('deinstall');
</custom_php_deinstall_command>
</packagegui>