Re: [PATCH] NRPE addon: correctly install symlinks for runlevels

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2913 bytes --]

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, too.

-Michael

> On 19 May 2020, at 14:02, Peter Müller <peter.mueller(a)ipfire.org> wrote:
> 
> Partially fixes #11551
> 
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
> config/rootfiles/packages/nagios_nrpe          |  5 ++++-
> lfs/nagios_nrpe                                | 11 ++++++++---
> src/initscripts/packages/{nrpe => nagios_nrpe} |  0
> 3 files changed, 12 insertions(+), 4 deletions(-)
> rename src/initscripts/packages/{nrpe => nagios_nrpe} (100%)
> 
> diff --git a/config/rootfiles/packages/nagios_nrpe b/config/rootfiles/packages/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    = $(URL_IPFIRE)
> DIR_APP    = $(DIR_SRC)/$(THISAPP)
> TARGET     = $(DIR_INFO)/$(THISAPP)
> PROG       = nagios_nrpe
> -PAK_VER    = 5
> +PAK_VER    = 6
> 
> DEPS       = nagios-plugins
> 
> @@ -93,7 +93,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 	cd $(DIR_APP) && make install-config
> 
> 	# 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
> 
> 	@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
> -- 
> 2.26.1