1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

Merge commit 'nbd/master' into xburst

Conflicts:

	target/linux/xburst/image/Makefile
This commit is contained in:
Lars-Peter Clausen
2010-03-11 20:30:57 +01:00
251 changed files with 39570 additions and 353 deletions

View File

@@ -9,7 +9,7 @@ preinit_essential_hook=
preinit_main_hook=
failsafe_hook=
initramfs_hook=
preinit_mount_root=
preinit_mount_root_hook=
pi_ifname=
pi_ip=192.168.1.1

View File

@@ -5,7 +5,7 @@
run_init() {
preinit_echo "- init -"
preinit_ip_deconfig
if [ "$pi_init_stderr_suppress" = "y" ]; then
if [ "$pi_init_suppress_stderr" = "y" ]; then
exec env - PATH=$pi_init_path $pi_init_env $pi_init_cmd 2>&0
else
exec env - PATH=$pi_init_path $pi_init_env $pi_init_cmd