webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

Browse Source 
Conflicts:
	config/rootfiles/core/49/filelists/files
This commit is contained in:
Christian Schmidt
2011-04-02 19:49:11 +02:00
parent 78e1facfba cadb66f381
commit 80c7f007fe
9 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/common/lm_sensors
View File

@@ -8,9 +8,8 @@ usr/bin/sensors-conf-convert
#usr/lib/libsensors.a
usr/lib/libsensors.so
usr/lib/libsensors.so.4
usr/lib/libsensors.so.4.2.1
usr/lib/libsensors.so.4.3.1
#usr/man/man1/sensors.1
#usr/man/man3
#usr/man/man3/libsensors.3
#usr/man/man5/sensors.conf.5
#usr/man/man5/sensors3.conf.5

1
config/rootfiles/core/49/exclude
View File

@@ -0,0 +1 @@
/srv/web/ipfire/html/proxy.pac

1
config/rootfiles/core/49/filelists/MIME-Tools Symbolic link
View File

@@ -0,0 +1 @@
../../../common/MIME-Tools

1
config/rootfiles/core/49/filelists/Mail-Tools Symbolic link
View File

@@ -0,0 +1 @@
../../../common/Mail-Tools

3
config/rootfiles/core/49/filelists/files
View File

@@ -1,3 +1,6 @@
etc/system-release
etc/init.d/squid
var/ipfire/backup/bin/backup.pl
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi

1
config/rootfiles/core/49/filelists/lm_sensors Symbolic link
View File

@@ -0,0 +1 @@
../../../common/lm_sensors