summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2009-04-18 21:47:32 -0700
committerJaka Kranjc2009-05-12 10:44:53 +0200
commit356dbd8ebf0ccfeb36089ccf8c44495643444871 (patch)
treea23916ad6c2b048ce14f908915c4ade865441c8e
parentccee5e973a48e59bdfae58ba04e5b5c99f2ed330 (diff)
ntop: Switch from netconf to ifupdown method
Fixes Bug #15184 (cherry picked from commit 4c7d163bd460066a473cf275e53bd0fb722e16dc)
-rw-r--r--net/ntop/HISTORY2
-rw-r--r--net/ntop/init.d/ntop5
2 files changed, 4 insertions, 3 deletions
diff --git a/net/ntop/HISTORY b/net/ntop/HISTORY
index 076545a1b1..831152da7d 100644
--- a/net/ntop/HISTORY
+++ b/net/ntop/HISTORY
@@ -1,6 +1,8 @@
2009-04-18 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 3.3.9
Fixes Bug #15183
+ * init.d/ntop: Switch from netconf to ifupdown method
+ Fixes Bug #15184
2008-01-22 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 3.3
diff --git a/net/ntop/init.d/ntop b/net/ntop/init.d/ntop
index 4879f0a8c3..4624a68cd8 100644
--- a/net/ntop/init.d/ntop
+++ b/net/ntop/init.d/ntop
@@ -2,9 +2,8 @@
. /etc/sysconfig/ntop
-if [ -d /etc/sysconfig/network ] ; then
- for i in /etc/sysconfig/network/*.dev ; do
- i=$( basename ${i%.dev} )
+if [ -f /etc/network/interfaces ] ; then
+ for i in $(grep "^iface" /etc/network/interfaces | awk '{print $2}') ; do
[ "$i" = "lo" -a "$IGNORE_LO" = "yes" ] && continue
IFACES="${IFACES},$i"
done