Corrected apcupsd

Fixes bug #0000477

diff --git a/config/apcupsd/apcupsd b/config/apcupsd/apcupsd
deleted file mode 100644 (file)
index e5923c5..0000000
--- a/config/apcupsd/apcupsd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/apcupsd
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-case "$1" in
-       start)
-               boot_mesg "Starting apcupsd daemon..."
-               loadproc apcupsd
-               ;;
-       stop)
-               boot_mesg "Stopping apcupsd daemon..."
-               killproc apcupsd
-               ;;
-       status)
-               statusproc /sbin/apcupsd
-               ;;
-       *)
-               echo "Usage: $0 (start|stop|status)"
-               exit 1
-               ;;
-esac
-
-# End $rc_base/init.d/apcupsd
-

diff --git a/lfs/apcupsd b/lfs/apcupsd
index de6ee24326d1e45e5834f84e2ee3e777f557da03..197d1a4fcf67b8f464850a75106edbac13c21cbc 100644 (file)
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                        --with-cgi-bin=/srv/web/ipfire/cgi-bin
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       install -v -m755 $(DIR_SRC)/config/apcupsd/apcupsd /etc/init.d/apcupsd
+       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