Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 net/ntop/HISTORY     |    2 ++
 net/ntop/init.d/ntop |    5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 4c7d163bd460066a473cf275e53bd0fb722e16dc
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    ntop: Switch from netconf to ifupdown method
    Fixes Bug #15184

diff --git a/net/ntop/HISTORY b/net/ntop/HISTORY
index 076545a..831152d 100644
--- a/net/ntop/HISTORY
+++ b/net/ntop/HISTORY
@@ -1,6 +1,8 @@
 2009-04-18 Eric Sandall <sandalle AT 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 AT sourcemage.org>
        * DETAILS: Updated to 3.3
diff --git a/net/ntop/init.d/ntop b/net/ntop/init.d/ntop
index 4879f0a..4624a68 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