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

Merge remote-tracking branch 'origin/next' into thirteen

Browse Source 
Conflicts:
	lfs/php
	make.sh
This commit is contained in:
Arne Fitzenreiter
2012-09-06 12:36:18 +02:00
parent 87bcb6cf73 83aefc12dd
commit c7f9e0e99c
34 changed files with 1850 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/common/armv5tel/initscripts
View File

@@ -47,6 +47,7 @@ etc/rc.d/init.d/mISDN
#etc/rc.d/init.d/mediatomb
#etc/rc.d/init.d/messagebus
#etc/rc.d/init.d/miau
#etc/rc.d/init.d/minidlna
#etc/rc.d/init.d/miniupnpd
#etc/rc.d/init.d/mldonkey
etc/rc.d/init.d/modules
@@ -57,6 +58,7 @@ etc/rc.d/init.d/mountkernfs
#etc/rc.d/init.d/mysql
#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-vlans
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
@@ -212,6 +214,7 @@ etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S90sysctl
etc/rc.d/rcsysinit.d/S91network-vlans
etc/rc.d/rc3.d/S15fireinfo
#etc/sysconfig
etc/sysconfig/createfiles

3
config/rootfiles/common/configroot
View File

@@ -35,6 +35,7 @@ var/ipfire/ethernet
#var/ipfire/ethernet/known_nics
#var/ipfire/ethernet/scanned_nics
#var/ipfire/ethernet/settings
#var/ipfire/ethernet/vlans
#var/ipfire/extrahd
#var/ipfire/extrahd/bin
var/ipfire/extrahd/bin/extrahd.pl
@@ -57,9 +58,9 @@ var/ipfire/langs
#var/ipfire/langs/en.pl
#var/ipfire/langs/es.pl
#var/ipfire/langs/fr.pl
#var/ipfire/langs/list
#var/ipfire/langs/pl.pl
#var/ipfire/langs/ru.pl
#var/ipfire/langs/list
var/ipfire/logging
#var/ipfire/logging/settings
var/ipfire/mac

3
config/rootfiles/common/i586/initscripts
View File

@@ -48,6 +48,7 @@ etc/rc.d/init.d/mISDN
#etc/rc.d/init.d/mediatomb
#etc/rc.d/init.d/messagebus
#etc/rc.d/init.d/miau
#etc/rc.d/init.d/minidlna
#etc/rc.d/init.d/miniupnpd
#etc/rc.d/init.d/mldonkey
etc/rc.d/init.d/modules
@@ -58,6 +59,7 @@ etc/rc.d/init.d/mountkernfs
#etc/rc.d/init.d/mysql
#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-vlans
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
@@ -215,6 +217,7 @@ etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S90sysctl
etc/rc.d/rcsysinit.d/S91network-vlans
etc/rc.d/rc3.d/S15fireinfo
#etc/sysconfig
etc/sysconfig/createfiles

13
config/rootfiles/common/usb_modeswitch_data
View File

@@ -5,6 +5,7 @@ usr/share/usb_modeswitch/03f0:002a
usr/share/usb_modeswitch/0408:f000
usr/share/usb_modeswitch/0421:060c
usr/share/usb_modeswitch/0421:0610
usr/share/usb_modeswitch/0421:061d
usr/share/usb_modeswitch/0421:0622
usr/share/usb_modeswitch/0421:0627
usr/share/usb_modeswitch/0421:062c
@@ -35,6 +36,7 @@ usr/share/usb_modeswitch/05c7:1000
usr/share/usb_modeswitch/072f:100d
usr/share/usb_modeswitch/07d1:a800
usr/share/usb_modeswitch/07d1:a804
usr/share/usb_modeswitch/0922:1001
usr/share/usb_modeswitch/0930:0d46
usr/share/usb_modeswitch/0ace:2011
usr/share/usb_modeswitch/0ace:20ff
@@ -77,6 +79,7 @@ usr/share/usb_modeswitch/0af0:8302
usr/share/usb_modeswitch/0af0:8304
usr/share/usb_modeswitch/0af0:8400
usr/share/usb_modeswitch/0af0:8600
usr/share/usb_modeswitch/0af0:8700
usr/share/usb_modeswitch/0af0:8800
usr/share/usb_modeswitch/0af0:8900
usr/share/usb_modeswitch/0af0:9000
@@ -163,6 +166,7 @@ usr/share/usb_modeswitch/1410:5041
usr/share/usb_modeswitch/1410:5059
usr/share/usb_modeswitch/148e:a000
usr/share/usb_modeswitch/148f:2578
usr/share/usb_modeswitch/15eb:7153
usr/share/usb_modeswitch/16d8:6281
usr/share/usb_modeswitch/16d8:6803
usr/share/usb_modeswitch/16d8:6804
@@ -184,12 +188,15 @@ usr/share/usb_modeswitch/19d2:0110
usr/share/usb_modeswitch/19d2:0115
usr/share/usb_modeswitch/19d2:0146
usr/share/usb_modeswitch/19d2:0149
usr/share/usb_modeswitch/19d2:0154
usr/share/usb_modeswitch/19d2:0166
usr/share/usb_modeswitch/19d2:0169
usr/share/usb_modeswitch/19d2:0325
usr/share/usb_modeswitch/19d2:1001
usr/share/usb_modeswitch/19d2:1007
usr/share/usb_modeswitch/19d2:1009
usr/share/usb_modeswitch/19d2:1013
usr/share/usb_modeswitch/19d2:1017
usr/share/usb_modeswitch/19d2:1171
usr/share/usb_modeswitch/19d2:1175
usr/share/usb_modeswitch/19d2:1179
@@ -209,7 +216,9 @@ usr/share/usb_modeswitch/1a8d:1000
usr/share/usb_modeswitch/1a8d:2000
usr/share/usb_modeswitch/1ab7:5700
usr/share/usb_modeswitch/1b7d:0700
usr/share/usb_modeswitch/1bbb:00ca
usr/share/usb_modeswitch/1bbb:f000
usr/share/usb_modeswitch/1bbb:f017
usr/share/usb_modeswitch/1bbb:f052
usr/share/usb_modeswitch/1c9e:1001
usr/share/usb_modeswitch/1c9e:6061
@@ -227,6 +236,7 @@ usr/share/usb_modeswitch/1edf:6003
usr/share/usb_modeswitch/1ee8:0009
usr/share/usb_modeswitch/1ee8:0013
usr/share/usb_modeswitch/1ee8:0040
usr/share/usb_modeswitch/1ee8:004a
usr/share/usb_modeswitch/1ee8:0060
usr/share/usb_modeswitch/1f28:0021
usr/share/usb_modeswitch/1fac:0032
@@ -237,7 +247,10 @@ usr/share/usb_modeswitch/201e:2009
usr/share/usb_modeswitch/2020:f00e
usr/share/usb_modeswitch/2077:f000
usr/share/usb_modeswitch/21f5:1000
usr/share/usb_modeswitch/22de:6803
usr/share/usb_modeswitch/22f4:0021
usr/share/usb_modeswitch/230d:0001
usr/share/usb_modeswitch/230d:0007
usr/share/usb_modeswitch/230d:0101
usr/share/usb_modeswitch/2357:0200
usr/share/usb_modeswitch/8888:6500