diff --git a/html/cgi-bin/addonsvc.cgi b/html/cgi-bin/addonsvc.cgi index 1c9fb6759..8442277db 100644 --- a/html/cgi-bin/addonsvc.cgi +++ b/html/cgi-bin/addonsvc.cgi @@ -55,8 +55,8 @@ if ($param[1] ne '') { print < - - +
+ @@ -65,6 +65,8 @@ print <"; - print " "; - my $status = isautorun($_); - print "$status "; - print " "; - print " "; - print " "; - print " "; - my $status = `/usr/local/bin/addonctrl $_ status`; - $status =~ s/\\[[0-1]\;[0-9]+m//g; - chomp($status); - print " "; - print ""; + if ($_ ne "alsa") + { + $lines++; + if ($lines % 2) + { + print ""; + } + else + { + print ""; + } + print " "; + my $status = isautorun($_); + print "$status "; + print " "; + print " "; + print " "; + print " "; + my $status = `/usr/local/bin/addonctrl $_ status`; + $status =~ s/\\[[0-1]\;[0-9]+m//g; + chomp($status); + print " "; + print ""; + } } } @@ -101,12 +118,18 @@ print "
Addon Bootconfiguration Manual$_enabledisablestartstop$status
$_enabledisablestartstop$status
\n"; sub isautorun { my $cmd = $_[0]; - my $status = "Aus"; + my $status = "---"; my $init = `find /etc/rc.d/rc3.d/S??${cmd}`; chomp ($init); if ($init ne '') { $status = "Ein"; } + $init = `find /etc/rc.d/rc3.d/off/S??${cmd}`; + chomp ($init); + if ($init ne '') { + $status = "Aus"; + } + return $status; } diff --git a/lfs/dm9601 b/lfs/dm9601 deleted file mode 100644 index 99ac57e9a..000000000 --- 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 . # -# # -############################################################################### - -############################################################################### -# 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 index fe8b0820a..000000000 --- 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 . # -# # -############################################################################### - -############################################################################### -# 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)