Updated apcupsd lfs & rootfile

diff --git a/config/rootfiles/packages/apcupsd b/config/rootfiles/packages/apcupsd
index f7c9e2d5df493f4987bc3fa7c55c067b2a11bfac..3b3273d345b2c30a2e32ebe453b3e9aa298af76e 100644 (file)
--- a/config/rootfiles/packages/apcupsd
+++ b/config/rootfiles/packages/apcupsd
@@ -1,15 +1,25 @@
 etc/apcupsd
 etc/apcupsd/apccontrol
 etc/apcupsd/apcupsd.conf
 etc/apcupsd
 etc/apcupsd/apccontrol
 etc/apcupsd/apcupsd.conf

+etc/apcupsd/apcupsd.css

 etc/apcupsd/changeme
 etc/apcupsd/commfailure
 etc/apcupsd/commok
 etc/apcupsd/changeme
 etc/apcupsd/commfailure
 etc/apcupsd/commok

+etc/apcupsd/hosts.conf
+etc/apcupsd/multimon.conf

 etc/apcupsd/offbattery
 etc/apcupsd/onbattery
 etc/apcupsd/offbattery
 etc/apcupsd/onbattery

+etc/rc.d/rc0.d/K35apcupsd
+etc/rc.d/rc3.d/S65apcupsd
+etc/rc.d/rc6.d/K35apcupsd

 sbin/apcaccess
 sbin/apctest
 sbin/apcupsd
 sbin/smtp
 sbin/apcaccess
 sbin/apctest
 sbin/apcupsd
 sbin/smtp

+#srv/web/ipfire/cgi-bin/multimon.cgi
+srv/web/ipfire/cgi-bin/upsfstats.cgi
+srv/web/ipfire/cgi-bin/upsimage.cgi
+srv/web/ipfire/cgi-bin/upsstats.cgi

 #usr/share/hal
 #usr/share/hal/fdi
 #usr/share/hal/fdi/policy
 #usr/share/hal
 #usr/share/hal/fdi
 #usr/share/hal/fdi/policy


@@ -17,13 +27,6 @@ sbin/smtp
 #usr/share/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi
 #usr/share/man/man8/apcupsd.8
 etc/rc.d/init.d/apcupsd
 #usr/share/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi
 #usr/share/man/man8/apcupsd.8
 etc/rc.d/init.d/apcupsd

-etc/rc.d/rc0.d/K35apcupsd
-etc/rc.d/rc3.d/S65apcupsd
-etc/rc.d/rc6.d/K35apcupsd
-#srv/web/ipfire/cgi-bin/multimon.cgi
-srv/web/ipfire/cgi-bin/upsfstats.cgi
-srv/web/ipfire/cgi-bin/upsimage.cgi
-srv/web/ipfire/cgi-bin/upsstats.cgi

 var/ipfire/menu.d/EX-apcupsd.menu
 var/ipfire/langs/de.pl
 var/ipfire/langs/en.pl
 var/ipfire/menu.d/EX-apcupsd.menu
 var/ipfire/langs/de.pl
 var/ipfire/langs/en.pl

diff --git a/lfs/apcupsd b/lfs/apcupsd
index 197d1a4fcf67b8f464850a75106edbac13c21cbc..4e664fef1a9d1319ed037490b5b1b7e34b6a3e28 100644 (file)
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2009  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        #
 #                                                                             #
 # 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        #


@@ -81,7 +81,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                        --with-cgi-bin=/srv/web/ipfire/cgi-bin
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
                                        --with-cgi-bin=/srv/web/ipfire/cgi-bin
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

-       install -v -m755 $(DIR_SRC)/src/initscripts/init.d/apcupsd /etc/init.d/apcupsd

        ln -sf ../init.d/apcupsd /etc/rc.d/rc3.d/S65apcupsd
        ln -sf ../init.d/apcupsd /etc/rc.d/rc0.d/K35apcupsd
        ln -sf ../init.d/apcupsd /etc/rc.d/rc6.d/K35apcupsd
        ln -sf ../init.d/apcupsd /etc/rc.d/rc3.d/S65apcupsd
        ln -sf ../init.d/apcupsd /etc/rc.d/rc0.d/K35apcupsd
        ln -sf ../init.d/apcupsd /etc/rc.d/rc6.d/K35apcupsd