Adjusting path of rpcbind to /usr/sbin and recommend rpcbind, droping ubuntu specific adjustments
This commit is contained in:
parent
192bef3aab
commit
3ca020224c
3
debian/README.Debian.plugins.in
vendored
3
debian/README.Debian.plugins.in
vendored
|
@ -51,6 +51,9 @@ check_mailq:
|
|||
check_oracle:
|
||||
* procps
|
||||
|
||||
check_rpc:
|
||||
* rpcbind
|
||||
|
||||
check_wave:
|
||||
* snmp
|
||||
|
||||
|
|
3
debian/changelog
vendored
3
debian/changelog
vendored
|
@ -3,8 +3,9 @@ nagios-plugins (1.4.16-2) UNRELEASED; urgency=low
|
|||
* Add versioned dependency to inetutils-ping (Closes: #680416), thanks to
|
||||
Robert Millan
|
||||
* Move nagios-plugins-contrib from Recommends to Suggests
|
||||
* Define the path for rpcinfo on ubuntu to /usr/sbin and depended on rpcbind
|
||||
* Define the path for rpcinfo to /usr/sbin and recommend rpcbind
|
||||
- LP: #1086151
|
||||
- Closes: #713839, thanks to Russell Sim
|
||||
|
||||
-- Jan Wagner <waja@cyconet.org> Wed, 27 Jun 2012 23:14:40 +0200
|
||||
|
||||
|
|
4
debian/control
vendored
4
debian/control
vendored
|
@ -65,8 +65,8 @@ Package: nagios-plugins-standard
|
|||
Architecture: any
|
||||
Conflicts: nagios-plugins (<= 1.4.2-3)
|
||||
Replaces: nagios-plugins
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dist:Depends}, ucf, nagios-plugins-basic (>= 1.4.5-2)
|
||||
Recommends: ${shlibs:Recommends}, fping, snmp, libnet-snmp-perl, dnsutils, bind9-host | host, smbclient, whois, qstat
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, ucf, nagios-plugins-basic (>= 1.4.5-2)
|
||||
Recommends: ${shlibs:Recommends}, fping, snmp, libnet-snmp-perl, dnsutils, bind9-host | host, smbclient, whois, qstat, rpcbind
|
||||
Suggests: nagios3 | icinga, postfix | sendmail-bin | exim4-daemon-heavy | exim4-daemon-light
|
||||
Description: Plugins for nagios compatible monitoring systems
|
||||
Plugins for nagios compatible monitoring systems like Nagios and Icinga. It
|
||||
|
|
10
debian/rules
vendored
10
debian/rules
vendored
|
@ -29,14 +29,6 @@ NP_BASIC_TEMPLATES:=$(NP_BASIC_DIR)/usr/share/nagios-plugins/templates-basic
|
|||
NP_STD_DIR:=$(DEBIANDIR)/nagios-plugins-standard
|
||||
NP_STD_TEMPLATES:=$(NP_STD_DIR)/usr/share/nagios-plugins/templates-standard
|
||||
|
||||
ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
|
||||
DEPSUBSTVARS = -Vdist:Depends="rpcbind"
|
||||
RPCINFO_CONFIGURE_ARGS = /usr/sbin/rpcinfo
|
||||
else
|
||||
DEPSUBSTVARS = -Vdist:Depends=""
|
||||
RPCINFO_CONFIGURE_ARGS = /usr/bin/rpcinfo
|
||||
endif
|
||||
|
||||
std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \
|
||||
check_rpc check_snmp check_wave check_fping check_game \
|
||||
check_radius check_mysql check_mysql_query check_pgsql \
|
||||
|
@ -109,7 +101,7 @@ config.status: configure
|
|||
$(PING_CONFIGURE_ARGS) \
|
||||
--with-nslookup-command="/usr/bin/nslookup -sil" \
|
||||
--with-uptime-command="/usr/bin/uptime" \
|
||||
--with-rpcinfo-command=${RPCINFO_CONFIGURE_ARGS} \
|
||||
--with-rpcinfo-command="/usr/sbin/rpcinfo" \
|
||||
--with-smbclient-command="/usr/bin/smbclient" \
|
||||
--with-snmpget-command="/usr/bin/snmpget" \
|
||||
--with-snmpgetnext-command="/usr/bin/snmpgetnext" \
|
||||
|
|
Loading…
Reference in a new issue