mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-26 19:00:34 +02:00
Merge branch 'master' into next
Conflicts: config/rootfiles/core/40/filelists/files
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
etc/init.d
|
||||
#etc/rc.d
|
||||
#etc/rc.d/helper
|
||||
etc/rc.d/helper/getdnsfromdhcpc.pl
|
||||
@@ -41,15 +40,19 @@ etc/rc.d/init.d/ipsec
|
||||
#etc/rc.d/init.d/lcr
|
||||
etc/rc.d/init.d/leds
|
||||
etc/rc.d/init.d/localnet
|
||||
etc/rc.d/init.d/mISDN
|
||||
#etc/rc.d/init.d/mdadm
|
||||
#etc/rc.d/init.d/mediatomb
|
||||
#etc/rc.d/init.d/messagebus
|
||||
#etc/rc.d/init.d/miau
|
||||
#etc/rc.d/init.d/mldonkey
|
||||
etc/rc.d/init.d/mISDN
|
||||
etc/rc.d/init.d/modules
|
||||
#etc/rc.d/init.d/motion
|
||||
etc/rc.d/init.d/mountfs
|
||||
etc/rc.d/init.d/mountkernfs
|
||||
#etc/rc.d/init.d/mpd
|
||||
#etc/rc.d/init.d/mysql
|
||||
#etc/rc.d/init.d/netsnmpd
|
||||
etc/rc.d/init.d/network
|
||||
#etc/rc.d/init.d/networking
|
||||
etc/rc.d/init.d/networking/any
|
||||
@@ -80,10 +83,10 @@ etc/rc.d/init.d/networking/red.up/50-ipsec
|
||||
etc/rc.d/init.d/networking/red.up/50-ovpn
|
||||
etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
|
||||
etc/rc.d/init.d/networking/red.up/99-pakfire-update
|
||||
#etc/rc.d/init.d/openvmtools
|
||||
#etc/rc.d/init.d/nfs-server
|
||||
etc/rc.d/init.d/ntp
|
||||
#etc/rc.d/init.d/nut
|
||||
#etc/rc.d/init.d/openvmtools
|
||||
#etc/rc.d/init.d/portmap
|
||||
#etc/rc.d/init.d/postfix
|
||||
#etc/rc.d/init.d/pound
|
||||
@@ -106,26 +109,33 @@ etc/rc.d/init.d/sysklogd
|
||||
etc/rc.d/init.d/teamspeak
|
||||
etc/rc.d/init.d/template
|
||||
#etc/rc.d/init.d/tftpd
|
||||
etc/rc.d/init.d/tmpfs
|
||||
etc/rc.d/init.d/udev
|
||||
etc/rc.d/init.d/udev_retry
|
||||
etc/rc.d/init.d/upnpd
|
||||
#etc/rc.d/init.d/vdr
|
||||
#etc/rc.d/init.d/vdradmin
|
||||
#etc/rc.d/init.d/vsftpd
|
||||
#etc/rc.d/init.d/watchdog
|
||||
#etc/rc.d/init.d/winbind
|
||||
#etc/rc.d/init.d/xinetd
|
||||
#etc/rc.d/rc0.d
|
||||
#etc/rc.d/rc0.d/K01imspetor
|
||||
#etc/rc.d/rc0.d/K01motion
|
||||
#etc/rc.d/rc0.d/K01vdradmin
|
||||
#etc/rc.d/rc0.d/K02mediatomb
|
||||
#etc/rc.d/rc0.d/K02sslh
|
||||
etc/rc.d/rc0.d/K08fcron
|
||||
etc/rc.d/rc0.d/K28apache
|
||||
etc/rc.d/rc0.d/K30sshd
|
||||
etc/rc.d/rc0.d/K45random
|
||||
etc/rc.d/rc0.d/K49cyrus-sasl
|
||||
etc/rc.d/rc0.d/K78snort
|
||||
etc/rc.d/rc0.d/K79leds
|
||||
etc/rc.d/rc0.d/K80network
|
||||
#etc/rc.d/rc0.d/K84bluetooth
|
||||
#etc/rc.d/rc0.d/K85messagebus
|
||||
etc/rc.d/rc0.d/K85tmpfs
|
||||
etc/rc.d/rc0.d/K90sysklogd
|
||||
etc/rc.d/rc0.d/K99beep
|
||||
etc/rc.d/rc0.d/S60sendsignals
|
||||
@@ -134,6 +144,7 @@ etc/rc.d/rc0.d/S80mountfs
|
||||
etc/rc.d/rc0.d/S90swap
|
||||
etc/rc.d/rc0.d/S99halt
|
||||
#etc/rc.d/rc3.d
|
||||
etc/rc.d/rc3.d/S01tmpfs
|
||||
etc/rc.d/rc3.d/S10sysklogd
|
||||
#etc/rc.d/rc3.d/S15messagebus
|
||||
#etc/rc.d/rc3.d/S16bluetooth
|
||||
@@ -141,6 +152,7 @@ etc/rc.d/rc3.d/S10sysklogd
|
||||
etc/rc.d/rc3.d/S19smartenabler
|
||||
etc/rc.d/rc3.d/S20network
|
||||
etc/rc.d/rc3.d/S21leds
|
||||
etc/rc.d/rc3.d/S24cyrus-sasl
|
||||
etc/rc.d/rc3.d/S25random
|
||||
etc/rc.d/rc3.d/S30sshd
|
||||
etc/rc.d/rc3.d/S32apache
|
||||
@@ -149,18 +161,26 @@ etc/rc.d/rc3.d/S40fcron
|
||||
etc/rc.d/rc3.d/S98rc.local
|
||||
#etc/rc.d/rc3.d/S98sslh
|
||||
etc/rc.d/rc3.d/S99beep
|
||||
#etc/rc.d/rc3.d/S99imspetor
|
||||
#etc/rc.d/rc3.d/S99motion
|
||||
#etc/rc.d/rc3.d/S99vdradmin
|
||||
#etc/rc.d/rc6.d
|
||||
#etc/rc.d/rc6.d/K01imspetor
|
||||
#etc/rc.d/rc6.d/K01motion
|
||||
#etc/rc.d/rc6.d/K01vdradmin
|
||||
#etc/rc.d/rc6.d/K02mediatomb
|
||||
#etc/rc.d/rc6.d/K02sslh
|
||||
etc/rc.d/rc6.d/K08fcron
|
||||
etc/rc.d/rc6.d/K28apache
|
||||
etc/rc.d/rc6.d/K30sshd
|
||||
etc/rc.d/rc6.d/K45random
|
||||
etc/rc.d/rc6.d/K49cyrus-sasl
|
||||
etc/rc.d/rc6.d/K78snort
|
||||
etc/rc.d/rc6.d/K79leds
|
||||
etc/rc.d/rc6.d/K80network
|
||||
#etc/rc.d/rc6.d/K84bluetooth
|
||||
#etc/rc.d/rc6.d/K85messagebus
|
||||
etc/rc.d/rc6.d/K85tmpfs
|
||||
etc/rc.d/rc6.d/K90sysklogd
|
||||
etc/rc.d/rc6.d/K99beep
|
||||
etc/rc.d/rc6.d/S60sendsignals
|
||||
@@ -189,24 +209,4 @@ etc/sysconfig/firewall.local
|
||||
etc/sysconfig/modules
|
||||
etc/sysconfig/rc
|
||||
etc/sysconfig/rc.local
|
||||
etc/rc.d/init.d/tmpfs
|
||||
etc/rc.d/rc0.d/K85tmpfs
|
||||
etc/rc.d/rc3.d/S01tmpfs
|
||||
etc/rc.d/rc6.d/K85tmpfs
|
||||
#etc/rc.d/init.d/vdradmin
|
||||
#etc/rc.d/rc0.d/K01vdradmin
|
||||
#etc/rc.d/rc3.d/S99vdradmin
|
||||
#etc/rc.d/rc6.d/K01vdradmin
|
||||
#etc/rc.d/init.d/motion
|
||||
#etc/rc.d/rc0.d/K01motion
|
||||
#etc/rc.d/rc3.d/S99motion
|
||||
#etc/rc.d/rc6.d/K01motion
|
||||
#etc/rc.d/init.d/miau
|
||||
#etc/rc.d/rc0.d/K01miau
|
||||
#etc/rc.d/rc3.d/S99miau
|
||||
#etc/rc.d/rc6.d/K01miau
|
||||
#etc/rc.d/init.d/netsnmpd
|
||||
#etc/rc.d/init.d/mdadm
|
||||
etc/rc.d/rc0.d/K49cyrus-sasl
|
||||
etc/rc.d/rc3.d/S24cyrus-sasl
|
||||
etc/rc.d/rc6.d/K49cyrus-sasl
|
||||
etc/init.d
|
||||
|
||||
Reference in New Issue
Block a user