From: Rafał Miłecki <rafal@milecki.pl>
Date: Mon, 7 Mar 2022 10:12:36 +0000 (+0100)
Subject: bcm4908: fix init on CFE devices
X-Git-Tag: v22.03.0-rc1~238
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c45b5abf6fce79ff3aab6d98cde3e8ff0ae1b1d6;p=openwrt%2Fstaging%2Fhauke.git

bcm4908: fix init on CFE devices

exit in preinit script was stopping whole process

Fixes: 93259e8ca261 ("bcm4908: support "rootfs_data" on U-Boot devices")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/target/linux/bcm4908/base-files/lib/preinit/75_rootfs_prepare b/target/linux/bcm4908/base-files/lib/preinit/75_rootfs_prepare
index 07fa21814e..09c12cd31d 100644
--- a/target/linux/bcm4908/base-files/lib/preinit/75_rootfs_prepare
+++ b/target/linux/bcm4908/base-files/lib/preinit/75_rootfs_prepare
@@ -20,7 +20,7 @@ rootfs_create() {
 
 rootfs_prepare() {
 	# Do nothing on CFE devices
-	ubinfo /dev/ubi0 -N metadata1 > /dev/null 2>&1 || exit 0
+	ubinfo /dev/ubi0 -N metadata1 > /dev/null 2>&1 || return
 
 	# Find UBI volume device (e.g. ubi0_123)
 	local ubivol="$(grep rootfs_data /sys/devices/virtual/ubi/ubi*/ubi*/name | sed -n 's/.*\(ubi\d*_\d*\).*/\1/p')"