addonsvc changed bgcolor every 2nd line

addonsvc state for services without runlevel link
addonsvc blacklistet alsa
real deleted the ip1000a and dm9601 lfs files

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1242 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/html/cgi-bin/addonsvc.cgi b/html/cgi-bin/addonsvc.cgi
index 1c9fb675999c1ad842c730a8ee498d62ea7ffcd8..8442277dbd4bdf2f05de7f5d2deeaa092efbd944 100644 (file)
--- a/html/cgi-bin/addonsvc.cgi
+++ b/html/cgi-bin/addonsvc.cgi
@@ -55,8 +55,8 @@ if ($param[1] ne '') {
 
 print <<END
 <div align='center'>
-<table width='90%' cellspacing='1' border='0'>
-<tr>
+<table width='90%' cellspacing='2' border='0'>
+<tr bgcolor='$color{'color20'}'>
 <td align='left'><b>Addon</b></td>
 <td align='center' colspan=3><b>Bootconfiguration</b></td>
 <td align='center' colspan=2><b>Manual</b></td>
@@ -65,6 +65,8 @@ print <<END
 END
 ;
 
+my $lines=0; # Used to count the outputlines to make different bgcolor
+
 # Generate list of installed addon pak's
 my @pak = `find /opt/pakfire/db/installed/meta-* | cut -d"-" -f2`;
 foreach (@pak)
@@ -75,20 +77,35 @@ foreach (@pak)
        my @svc = `find /etc/init.d/$_ | cut -d"/" -f4`;
        foreach (@svc)
        {
+           # blacklist some packages
+           #
+           # alsa has trouble with the volume saving and was not really stopped
+           #
            chomp($_);
-           print "<tr>";
-           print "<td align='left'>$_</td> ";
-           my $status = isautorun($_);
-           print "$status ";
-           print "<td align='center'><A HREF=addonsvc.cgi?$_!enable>enable</A></td> ";
-           print "<td align='center'><A HREF=addonsvc.cgi?$_!disable>disable</A></td> ";
-           print "<td align='center'><A HREF=addonsvc.cgi?$_!start>start</A></td> ";
-           print "<td align='center'><A HREF=addonsvc.cgi?$_!stop>stop</A></td> ";
-           my $status = `/usr/local/bin/addonctrl $_ status`;
-           $status =~ s/\\e\[[0-1]\;[0-9]+m//g;
-           chomp($status);
-           print "<td align='left'>$status</td> ";
-           print "</tr>";
+           if ($_ ne "alsa")
+           {
+               $lines++;
+               if ($lines % 2) 
+               {
+                   print "<tr bgcolor='$color{'color22'}'>";
+               }
+               else
+               {
+                   print "<tr bgcolor='$color{'color20'}'>";
+               }
+               print "<td align='left'>$_</td> ";
+               my $status = isautorun($_);
+               print "$status ";
+               print "<td align='center'><A HREF=addonsvc.cgi?$_!enable>enable</A></td> ";
+               print "<td align='center'><A HREF=addonsvc.cgi?$_!disable>disable</A></td> ";
+               print "<td align='center'><A HREF=addonsvc.cgi?$_!start>start</A></td> ";
+               print "<td align='center'><A HREF=addonsvc.cgi?$_!stop>stop</A></td> ";
+               my $status = `/usr/local/bin/addonctrl $_ status`;
+               $status =~ s/\\e\[[0-1]\;[0-9]+m//g;
+               chomp($status);
+               print "<td align='left'>$status</td> ";
+               print "</tr>";
+           }
        }
 }
 
@@ -101,12 +118,18 @@ print "</table></div>\n";
 sub isautorun
 {
        my $cmd = $_[0];
-       my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>Aus</b></font></td>";
+       my $status = "<td align='center' bgcolor='${Header::colourblue}'><font color='white'><b>---</b></font></td>";
        my $init = `find /etc/rc.d/rc3.d/S??${cmd}`;
        chomp ($init);
        if ($init ne '') {
                $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>Ein</b></font></td>";
        }
+       $init = `find /etc/rc.d/rc3.d/off/S??${cmd}`;
+       chomp ($init);
+       if ($init ne '') {
+               $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>Aus</b></font></td>";
+       }
+       
 return $status;
 }
 

diff --git a/lfs/dm9601 b/lfs/dm9601
deleted file mode 100644 (file)
index 99ac57e..0000000
--- a/lfs/dm9601
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.01
-
-THISAPP    = dm9601-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" "1"
-       TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-else
-       TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
-
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = c84094aea1f89831762eaa5dcc910ccd
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       $(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       
-ifeq "$(SMP)" "1"
-       cd $(DIR_APP) && make clean
-       cd $(DIR_APP) && make -C /lib/modules/$(KVER)-ipfire-smp/build/ SUBDIRS=$(DIR_APP) modules
-       cd $(DIR_APP) && install -m 644 dm9601.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/usb/net 
-else
-       cd $(DIR_APP) && make clean
-       cd $(DIR_APP) && make -C /lib/modules/$(KVER)-ipfire/build/ SUBDIRS=$(DIR_APP) modules
-       cd $(DIR_APP) && install -m 644 dm9601.ko /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/net 
-endif
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/ip1000a b/lfs/ip1000a
deleted file mode 100644 (file)
index fe8b082..0000000
--- a/lfs/ip1000a
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.10c
-
-THISAPP    = ip1000a-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" "1"
-       TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-else
-       TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
-
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = d0350b5c0154eaadee6ed615ffe0d8c2
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       $(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       
-ifeq "$(SMP)" "1"
-       cd $(DIR_APP) && make clean
-       cd $(DIR_APP) && make -C /lib/modules/$(KVER)-ipfire-smp/build/ SUBDIRS=$(DIR_APP) modules
-       cd $(DIR_APP) && install -m 644 ipg.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/net 
-else
-       cd $(DIR_APP) && make clean
-       cd $(DIR_APP) && make -C /lib/modules/$(KVER)-ipfire/build/ SUBDIRS=$(DIR_APP) modules
-       cd $(DIR_APP) && install -m 644 ipg.ko /lib/modules/$(KVER)-ipfire/kernel/drivers/net 
-endif
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)