diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index df5a80175..f2ed7166e 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -152,6 +152,7 @@ function system_sysctl_get() } foreach ($sysctls as $key => &$value) { + /* keeping the now depcreated 'default' as a keyword for selecting defaults */ if ($value != 'default' && $value != '') { continue; } diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/FieldTypes/TunableField.php b/src/opnsense/mvc/app/models/OPNsense/Core/FieldTypes/TunableField.php index d6ad361b7..739b08aa9 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Core/FieldTypes/TunableField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Core/FieldTypes/TunableField.php @@ -1,31 +1,29 @@ iterateItems() as $node) { if (isset(self::$static_entries[(string)$node->tunable])) { unset(self::$static_entries[(string)$node->tunable]); - } elseif ($node->value == 'default') { - /* default is only a valid choice when defaults are offered */ + } + /* deprecate 'default', the model uses empty value to signal this */ + if ($node->value == 'default') { $node->value = ''; } if (isset(self::$default_values[(string)$node->tunable])) { diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Tunables.xml b/src/opnsense/mvc/app/models/OPNsense/Core/Tunables.xml index 2dcc47725..ea86060fa 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Core/Tunables.xml +++ b/src/opnsense/mvc/app/models/OPNsense/Core/Tunables.xml @@ -1,7 +1,7 @@ //sysctl TUN - 1.0.0 + 1.0.1 System Tunables