diff options
| author | jim-p <jimp@pfsense.org> | 2012-08-22 16:28:16 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-08-22 16:29:43 -0400 |
| commit | c051bf14000857ffff97ab80273a1a0ea6b62c7b (patch) | |
| tree | 8f981b7a2362ed142ce36d11679f5fd37801e109 | |
| parent | 5413255f09b75859c3fcab39bbaef65a9ac6dfe7 (diff) | |
| download | pfsense-packages-c051bf14000857ffff97ab80273a1a0ea6b62c7b.tar.gz pfsense-packages-c051bf14000857ffff97ab80273a1a0ea6b62c7b.tar.bz2 pfsense-packages-c051bf14000857ffff97ab80273a1a0ea6b62c7b.zip | |
Unbreak OpenOSPFD but also flag it as depreciated in favor of Quagga OSPF. Fixes #2575
| -rw-r--r-- | config/openospfd/openospfd.inc | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/config/openospfd/openospfd.inc b/config/openospfd/openospfd.inc index bc8826e1..86e043d5 100644 --- a/config/openospfd/openospfd.inc +++ b/config/openospfd/openospfd.inc @@ -77,6 +77,8 @@ function ospfd_install_conf() { if (is_array($ospfd_conf['row'])) { foreach ($ospfd_conf['row'] as $redistr) { + if (empty($redistr['routevalue'])) + continue; if (isset($redistr['redistribute'])) $conffile .= "no "; $conffile .= "redistribute {$redistr['routevalue']}\n"; diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 55a6d2a6..90e7ab4d 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -615,11 +615,11 @@ </package> <package> <name>OpenOSPFD</name> - <descr>OSPF routing protocol</descr> + <descr>This package is now considered depreciated. Please use the Quagga OSPF instead. -- WARNING! Installs files to the same place as Quagga OSPF. Installing both will result in a broken state, remove this package before installing Quagga OSPF.</descr> <maintainer>cmb@pfsense.org</maintainer> <version>0.5.2</version> <category>Routing</category> - <status>BETA</status> + <status>DEPRECIATED</status> <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> <depends_on_package>openospfd-4.6.tbz</depends_on_package> <depends_on_package_pbi>openospfd-4.6-i386.pbi</depends_on_package_pbi> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 0c77f390..f7d80ce9 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -602,11 +602,11 @@ </package> <package> <name>OpenOSPFD</name> - <descr>OSPF routing protocol</descr> + <descr>This package is now considered depreciated. Please use the Quagga OSPF instead. -- WARNING! Installs files to the same place as Quagga OSPF. Installing both will result in a broken state, remove this package before installing Quagga OSPF.</descr> <maintainer>cmb@pfsense.org</maintainer> <version>0.5.2</version> <category>Routing</category> - <status>BETA</status> + <status>DEPRECIATED</status> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> <depends_on_package>openospfd-4.6.tbz</depends_on_package> <depends_on_package_pbi>openospfd-4.6-amd64.pbi</depends_on_package_pbi> |