Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2015-03-17 14:05:56 +01:00
46 changed files with 62 additions and 37 deletions

1
config/rootfiles/common/armv5tel/initscripts Executable file → Normal file
View File

@@ -34,6 +34,7 @@ etc/rc.d/init.d/firstsetup
etc/rc.d/init.d/functions
#etc/rc.d/init.d/gnump3d
etc/rc.d/init.d/halt
#etc/rc.d/init.d/haproxy
#etc/rc.d/init.d/hostapd
#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec

1
config/rootfiles/common/i586/initscripts Executable file → Normal file
View File

@@ -36,6 +36,7 @@ etc/rc.d/init.d/firstsetup
etc/rc.d/init.d/functions
#etc/rc.d/init.d/gnump3d
etc/rc.d/init.d/halt
#etc/rc.d/init.d/haproxy
#etc/rc.d/init.d/hostapd
#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec