From patchwork Tue May 19 13:02:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3113 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49RGKG4J9Nz3xQn for ; Tue, 19 May 2020 13:03:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49RGKF3DFNz2LD; Tue, 19 May 2020 13:03:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49RGKF1pyHz2yZn; Tue, 19 May 2020 13:03:29 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49RGKC4XgFz2xpB for ; Tue, 19 May 2020 13:03:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49RGKB42NJzD0 for ; Tue, 19 May 2020 13:03:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1589893407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gI5DFF6EFCBEej8syZMA0ESmfcMwlq8uxlmn2T97ZxE=; b=c+ewkXo2bQrqGIOQocvn7e7n3HsVs8xebYUKbn4Eb5uVL/Teygvsezo3fiUaiTubEVXIvC qMt/4lOXkUCKDDBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1589893407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gI5DFF6EFCBEej8syZMA0ESmfcMwlq8uxlmn2T97ZxE=; b=oN8H3msllbZk4IkpBIyWgbKXO05CYcKBjvbTXkmAxiNPdTSj6vnsZmehCuhHGM7kPDwyDi 8lcaVtxn9nwmMJ7KSQsP4sV7lA1i1xmazgwWaRbihpeq4H5zQObX8XqrW/iyqIqzXadXAl vqV1RlkPDgEtc0ijxzdcnyjpJoZE8RVcPmoJn2MT7WBBDj9WNPTYcBzqrfurv93+TVxwIa anreVnGZ2v8HH2+qNR4QzeKbRdXKRr6NJcB3g4FyBjdeJxKG1ztETYfKKGQ8fUpiK55s8P 0fhC9TV7o48ns5fU5UwwmBxLYSBoRX2tC+HEqwYeAvRGZGuSqVMC+7wnoC8tNw== To: development@lists.ipfire.org From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] NRPE addon: correctly install symlinks for runlevels Message-ID: <8e8d5da6-8067-4964-92c4-11fd9e50f7ee@ipfire.org> Date: Tue, 19 May 2020 13:02:47 +0000 MIME-Version: 1.0 Content-Language: en-US Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=peter.mueller@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Partially fixes #11551 Signed-off-by: Peter Müller --- 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 # +# Copyright (C) 2007-2020 IPFire Team # # # # 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