From 91c23e6a9c3adf2d9493b9263d114b40d8b3ec1b Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 6 Aug 2019 14:54:40 +0800 Subject: nagios-core/nagios-nrpe: use update-alternatives for /var/nagios fix below error: Error: Transaction check error: file /var/nagios from install of nagios-core-4.4.3-r0.core2_64 conflicts with file from package nagios-nrpe-daemon-3.2.1-r0.core2_64 Signed-off-by: Changqing Li Signed-off-by: Bruce Ashfield --- recipes-extended/nagios/nagios-core_4.4.3.bb | 6 +++++- recipes-extended/nagios/nagios-nrpe_3.2.1.bb | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'recipes-extended') diff --git a/recipes-extended/nagios/nagios-core_4.4.3.bb b/recipes-extended/nagios/nagios-core_4.4.3.bb index fcf04e98..7a86653b 100644 --- a/recipes-extended/nagios/nagios-core_4.4.3.bb +++ b/recipes-extended/nagios/nagios-core_4.4.3.bb @@ -25,7 +25,7 @@ SRC_URI[sha256sum] = "bba8f0e8dc8cf72f7a7ae4e8ce9c60f5bd315629421b9ec34818a28b8d S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit autotools-brokensep update-rc.d systemd +inherit autotools-brokensep update-rc.d systemd update-alternatives DEPENDS = "gd unzip-native" @@ -151,3 +151,7 @@ INITSCRIPT_NAME = "nagios" INITSCRIPT_PARAMS = "defaults" CVE_PRODUCT = "nagios_core" + +ALTERNATIVE_PRIORITY_${PN} = '20' +ALTERNATIVE_${PN} = "nagios" +ALTERNATIVE_LINK_NAME[nagios] = "${localstatedir}/nagios" diff --git a/recipes-extended/nagios/nagios-nrpe_3.2.1.bb b/recipes-extended/nagios/nagios-nrpe_3.2.1.bb index 3afa5dd9..04917f73 100644 --- a/recipes-extended/nagios/nagios-nrpe_3.2.1.bb +++ b/recipes-extended/nagios/nagios-nrpe_3.2.1.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "8ad2d1846ab9011fdd2942b8fc0c99dfad9a97e57f4a3e6e394a4ead99 S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit autotools-brokensep update-rc.d systemd +inherit autotools-brokensep update-rc.d systemd update-alternatives # IP address of server which proxy should connect to MONITORING_PROXY_SERVER_IP ??= "192.168.7.2" @@ -97,3 +97,6 @@ SYSTEMD_AUTO_ENABLE_${PN}-daemon = "enable" INITSCRIPT_PACKAGES = "${PN}-daemon" INITSCRIPT_NAME_${PN}-daemon = "nrpe" INITSCRIPT_PARAMS_${PN}-daemon = "defaults" + +ALTERNATIVE_${PN}-daemon = "nagios" +ALTERNATIVE_LINK_NAME[nagios] = "${localstatedir}/nagios" -- cgit v1.2.3-54-g00ecf