# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1597488961 0
# Node ID f92ced20dc0d5ec22b4b7bae6eaee96c12a3010e
# Parent  fc5989c0337999691172211aff60e28e7b12aa96
init: do not load module twice

diff -r fc5989c03379 -r f92ced20dc0d init
--- a/init	Sat Jul 25 08:40:08 2020 +0000
+++ b/init	Sat Aug 15 10:56:01 2020 +0000
@@ -118,6 +118,8 @@
 
 mod() {
 	for i in $@; do
+		grep -q "^$i\\W" /proc/modules && continue
+		grep -q "\\W$i\$" /proc/filesystems && continue
 		echo "Loading module: $i"
 		modprobe $i 2>/dev/null ||
 		for j in $(find /lib/modules /mnt/.fs*/lib/modules|sed "/\/$i.ko/!d" 2> /dev/null); do
@@ -286,7 +288,7 @@
 		esac
 	done || fail 3mSkipped
 quit
-grep -q squashfs /proc/filesystems || mod squashfs 2>/dev/null || exit
+mod squashfs 2>/dev/null || exit
 msg aufs
 br=/mnt/.rw
 mkdir $br /mnt/.wd
@@ -313,7 +315,7 @@
 	busybox mount -o ro -t squashfs /dev/loop$((l++)) /mnt/.$fs
 done
 while read type opt; do
-	grep -q $type /proc/filesystems || mod $type || continue
+	mod $type || continue
 	busybox mount -t $type -o $opt none /mnt && break
 done <<EOT
 aufs		br=$br$r