More changes for slackware/bsd

Makefile.in

@@ -82,13 +82,7 @@ install-init:
 		echo No init file to install; \
 		exit 1; \
 	fi
-	@if test $(INIT_TYPE) = bsd; then \
-		echo cat startup/$(SRC_INIT) >> $(INETD_DIR)/$(INIT_FILE); \
-		cat startup/$(SRC_INIT) >> $(INETD_DIR)/$(INIT_FILE); \
-	else \
-		echo $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
-		$(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
-	fi
+	$(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE)
 
 install-config:
 	$(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(CFGDIR)

src/Makefile.in

@@ -66,12 +66,13 @@ install:
 	$(MAKE) install-daemon
 
 install-plugin:
+	$(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(LIBEXECDIR)
 	$(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(PLUGINSDIR)
 	$(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) check_nrpe $(PLUGINSDIR)
 
 install-daemon:
-	$(INSTALL) -m 775 -d $(SBINDIR)
-	$(INSTALL) -m 775 nrpe $(SBINDIR)
+	$(INSTALL) -m 755 -d $(SBINDIR)
+	$(INSTALL) -m 755 nrpe $(SBINDIR)
 
 clean:
 	rm -f core nrpe check_nrpe $(SNPRINTF_O)

startup/bsd-init.in

@@ -5,11 +5,15 @@
 
 NRPE_BIN=@sbindir@/nrpe
 NRPE_CFG=@pkgsysconfdir@/nrpe.cfg
+PID_DIR=@piddir@
 PID_FILE=@piddir@/nrpe.pid
 
 # Start nrpe
 nrpe_start() {
 	echo -n "Starting nrpe daemon: $NRPE_BIN - "
+	if [ ! -d "$PID_DIR" ]; then
+		mkdir -p "$PID_DIR"
+	fi
 	$NRPE_BIN -c $NRPE_CFG -d
 	if [ $? = 0 ]; then
 		echo "started"
@@ -49,7 +53,7 @@ nrpe_reload() {
 		killall -HUP nrpe
 	fi
 	if [ $? = 0 ]; then
-		echo "stopped"
+		echo "reloaded"
 	else
 		echo "failed"
 	fi