Merge branch 'master' into next

2026-04-18 23:12:59 +02:00 · 2015-02-11 14:58:10 +01:00
parent 1eec8480e7 309b7de86e
commit aa2e56a531
11 changed files with 1989 additions and 9 deletions
--- a/src/initscripts/init.d/swconfig
+++ b/src/initscripts/init.d/swconfig
@@ -25,7 +25,7 @@ fi

 case "${1}" in
 	start)
-		case `cat /proc/device-tree/model` in
+		case `cat /proc/device-tree/model 2>/dev/null` in
 			"Lamobo-R1")
 				#
 				# Lamobo R1 aka BPi R1 Routerboard