From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] NRPE addon: correctly install symlinks for runlevels
Date: Tue, 19 May 2020 14:08:26 +0100
Message-ID: <F542FF8A-BF22-47D2-B21B-BFBEFEF91E09@ipfire.org>
In-Reply-To: <8e8d5da6-8067-4964-92c4-11fd9e50f7ee@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5766187149094007135=="
List-Id: <development.lists.ipfire.org>

--===============5766187149094007135==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

We normally install these in the install.sh hooks.

To keep this the same for every package, I would recommend to do this here, t=
oo.

-Michael

> On 19 May 2020, at 14:02, Peter M=C3=BCller <peter.mueller(a)ipfire.org> wr=
ote:
>=20
> Partially fixes #11551
>=20
> 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%)
>=20
> diff --git a/config/rootfiles/packages/nagios_nrpe b/config/rootfiles/packa=
ges/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/nagio=
s_nrpe
> similarity index 100%
> rename from src/initscripts/packages/nrpe
> rename to src/initscripts/packages/nagios_nrpe
> --=20
> 2.26.1


--===============5766187149094007135==--