mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 03:07:43 +02:00
Merge branch 'master' into next
Conflicts: doc/language_missings
This commit is contained in:
@@ -58,6 +58,7 @@ var/ipfire/langs
|
||||
#var/ipfire/langs/es.pl
|
||||
#var/ipfire/langs/fr.pl
|
||||
#var/ipfire/langs/pl.pl
|
||||
#var/ipfire/langs/ru.pl
|
||||
#var/ipfire/langs/list
|
||||
var/ipfire/logging
|
||||
#var/ipfire/logging/settings
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
etc/sysctl.conf
|
||||
etc/system-release
|
||||
var/ipfire/langs/
|
||||
etc/rc.d/init.d/console
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
etc/system-release
|
||||
etc/sysctl.conf
|
||||
var/ipfire/langs/
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
etc/system-release
|
||||
var/ipfire/langs/
|
||||
etc/rc.d/init.d/console
|
||||
usr/local/sbin/setup
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
#usr/include/mpd/error.h
|
||||
#usr/include/mpd/idle.h
|
||||
#usr/include/mpd/list.h
|
||||
#usr/include/mpd/message.h
|
||||
#usr/include/mpd/mixer.h
|
||||
#usr/include/mpd/output.h
|
||||
#usr/include/mpd/pair.h
|
||||
@@ -35,7 +36,7 @@
|
||||
#usr/lib/libmpdclient.la
|
||||
usr/lib/libmpdclient.so
|
||||
usr/lib/libmpdclient.so.2
|
||||
usr/lib/libmpdclient.so.2.0.1
|
||||
usr/lib/libmpdclient.so.2.0.5
|
||||
#usr/lib/pkgconfig/libmpdclient.pc
|
||||
#usr/share/doc/libmpdclient
|
||||
#usr/share/doc/libmpdclient/COPYING
|
||||
|
||||
3
config/rootfiles/packages/nagios_nrpe
Normal file
3
config/rootfiles/packages/nagios_nrpe
Normal file
@@ -0,0 +1,3 @@
|
||||
#root/.rnd
|
||||
usr/bin/nrpe
|
||||
usr/lib/nagios/check_nrpe
|
||||
Reference in New Issue
Block a user