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: Re: [PATCH] NRPE addon: correctly install symlinks for runlevels
Date: Sun, 21 Jun 2020 09:31:07 +0000
Message-ID: <8ffa4f68-fba2-902f-7cd3-692da66896f0@ipfire.org>
In-Reply-To: <F542FF8A-BF22-47D2-B21B-BFBEFEF91E09@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4505849779358877564=="
List-Id: <development.lists.ipfire.org>

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

Hello Michael,

sorry for the late reply.

Hm, the LFS files for Tor and Guardian also contain those "ln -sf" calls...

Currently, NRPE has no (un|)install.sh files, which is why I thought it might=
 be
less complicated to just add those to the LFS file.

Thanks, and best regards,
Peter M=C3=BCller


> Hi,
>=20
> We normally install these in the install.sh hooks.
>=20
> To keep this the same for every package, I would recommend to do this here,=
 too.
>=20
> -Michael
>=20
>> On 19 May 2020, at 14:02, Peter M=C3=BCller <peter.mueller(a)ipfire.org> w=
rote:
>>
>> 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/pack=
ages/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
>>
>> DEPS       =3D 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/nagi=
os_nrpe
>> similarity index 100%
>> rename from src/initscripts/packages/nrpe
>> rename to src/initscripts/packages/nagios_nrpe
>> --=20
>> 2.26.1
>=20

--===============4505849779358877564==--