From mboxrd@z Thu Jan 1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] NRPE addon: correctly install symlinks for runlevels
Date: Tue, 19 May 2020 13:02:47 +0000
Message-ID: <8e8d5da6-8067-4964-92c4-11fd9e50f7ee@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0350553081723580136=="
List-Id: <development.lists.ipfire.org>
--===============0350553081723580136==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Partially fixes #11551
Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
---
config/rootfiles/packages/nagios_nrpe | 5 ++++-
lfs/nagios_nrpe | 11 ++++++++---
src/initscripts/packages/{nrpe =3D> nagios_nrpe} | 0
3 files changed, 12 insertions(+), 4 deletions(-)
rename src/initscripts/packages/{nrpe =3D> nagios_nrpe} (100%)
diff --git a/config/rootfiles/packages/nagios_nrpe b/config/rootfiles/package=
s/nagios_nrpe
index 1da6c3baf..6698c587a 100644
--- a/config/rootfiles/packages/nagios_nrpe
+++ b/config/rootfiles/packages/nagios_nrpe
@@ -1,6 +1,9 @@
etc/nagios
etc/nagios/nrpe.cfg
-etc/rc.d/init.d/nrpe
+etc/rc.d/init.d/nagios_nrpe
+etc/rc.d/rc0.d/K20nagios_nrpe
+etc/rc.d/rc3.d/S40nagios_nrpe
+etc/rc.d/rc6.d/K20nagios_nrpe
#root/.rnd
#usr/bin/nrpe-uninstall
usr/bin/nrpe
diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe
index bb736a997..3deb5dcc6 100644
--- a/lfs/nagios_nrpe
+++ b/lfs/nagios_nrpe
@@ -1,7 +1,7 @@
############################################################################=
###
# =
#
# IPFire.org - A linux based firewall =
#
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> =
#
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> =
#
# =
#
# 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 =
#
@@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE)
DIR_APP =3D $(DIR_SRC)/$(THISAPP)
TARGET =3D $(DIR_INFO)/$(THISAPP)
PROG =3D nagios_nrpe
-PAK_VER =3D 5
+PAK_VER =3D 6
=20
DEPS =3D nagios-plugins
=20
@@ -93,7 +93,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install-config
=20
# install initscript
- $(call INSTALL_INITSCRIPT,nrpe)
+ $(call INSTALL_INITSCRIPT,nagios_nrpe)
+
+ # Install start links
+ ln -sf ../init.d/nagios_nrpe /etc/rc.d/rc3.d/S40nagios_nrpe
+ ln -sf ../init.d/nagios_nrpe /etc/rc.d/rc0.d/K20nagios_nrpe
+ ln -sf ../init.d/nagios_nrpe /etc/rc.d/rc6.d/K20nagios_nrpe
=20
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/initscripts/packages/nrpe b/src/initscripts/packages/nagios_=
nrpe
similarity index 100%
rename from src/initscripts/packages/nrpe
rename to src/initscripts/packages/nagios_nrpe
--=20
2.26.1
--===============0350553081723580136==--