monit addon: Fixed initscript stuff

diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
old mode 100644 (file)
new mode 100755 (executable)
index ecd01ec..2fffcf5
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -53,6 +53,7 @@ etc/rc.d/init.d/mISDN
 #etc/rc.d/init.d/mldonkey
 etc/rc.d/init.d/modules
 #etc/rc.d/init.d/motion
+#etc/rc.d/init.d/monit
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs
 #etc/rc.d/init.d/mpd

diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
old mode 100644 (file)
new mode 100755 (executable)
index b34ea91..a264267
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -54,6 +54,7 @@ etc/rc.d/init.d/mISDN
 #etc/rc.d/init.d/miniupnpd
 #etc/rc.d/init.d/mldonkey
 etc/rc.d/init.d/modules
+#etc/rc.d/init.d/monit
 #etc/rc.d/init.d/motion
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs

diff --git a/config/rootfiles/packages/monit b/config/rootfiles/packages/monit
index 7a8c5f69166bfc737c0941836b0c7e8c65718739..5ee558ab8c3fc57b2cb683cfc6b9b285c3a53234 100644 (file)
--- a/config/rootfiles/packages/monit
+++ b/config/rootfiles/packages/monit
@@ -1,7 +1,5 @@
-etc/rc.d/rc0.d/K40monit
-etc/rc.d/rc3.d/S60monit
-etc/rc.d/rc6.d/K40monit
-etc/init.d/monit
+etc/monitrc
 usr/bin/monit
 #usr/share/man/man1/monit.1
 var/ipfire/backup/addons/includes/monit
+etc/rc.d/init.d/monit

diff --git a/lfs/initscripts b/lfs/initscripts
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/lfs/monit b/lfs/monit
index 35bb949a217e539b784dc832673ad4e420326003..121a7a090829829c3bc236148f41329ea616d042 100644 (file)
--- a/lfs/monit
+++ b/lfs/monit
@@ -77,17 +77,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
+       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+
        install -v -m 644 $(DIR_SRC)/config/backup/includes/monit \
                         /var/ipfire/backup/addons/includes/monit
-       ln -sf ../init.d/pound /etc/rc.d/rc3.d/S60monit
-       ln -sf ../init.d/pound /etc/rc.d/rc0.d/K40monit
-       ln -sf ../init.d/pound /etc/rc.d/rc6.d/K40monit
 
-       # Remove temporary file.
-       rm -vf /root/.rnd
+       # Install default configuration                                                                                                                
+       install -v -m 644 $(DIR_SRC)/config/monit/monitrc /etc                                                                              
 
-#      @rm -rf $(DIR_APP)
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)