From 2dddcaac381cdd34d4b0e836c253ffc3aabcccf4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 9 Sep 2022 15:27:19 +0200
Subject: [rootfs-stage31] Relax kernel mismatch check

---
 core/rootfs/rootfs-stage31/data/init | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'core/rootfs')

diff --git a/core/rootfs/rootfs-stage31/data/init b/core/rootfs/rootfs-stage31/data/init
index cb0b70a0..798831f2 100755
--- a/core/rootfs/rootfs-stage31/data/init
+++ b/core/rootfs/rootfs-stage31/data/init
@@ -42,11 +42,18 @@ haveged --pidfile /tmp/haveged.pid # Tries to put it in /run by default, which d
 
 # IMPORTANT - check if kernel modules in initrams match kernel version
 BASEDIR="/lib/modules/$(uname -r)/kernel/drivers"
-for dir in gpu hid; do
-	if ! [ -d "$BASEDIR/$dir" ]; then
-		echo "0" > /proc/sys/kernel/printk
-		reset
-		cat <<WARNING
+found=
+for dir in gpu hid net; do
+	if [ -d "$BASEDIR/$dir" ]; then
+		found=1
+		break
+	fi
+done
+
+if [ -z "$found" ]; then
+	echo "0" > /proc/sys/kernel/printk
+	reset
+	cat <<WARNING
 +
 +
 +
@@ -69,11 +76,10 @@ for dir in gpu hid; do
 +
 + + + + + + + + + + + + + +
 WARNING
-		while true; do
-			read some garbage
-		done
-	fi
-done
+	while true; do
+		read some garbage
+	done
+fi
 
 # preparations for mounting stage3.2
 FUTURE_ROOT="/dev/shm/uniontmp"
-- 
cgit v1.2.3-55-g7522