malekith: bootdisk modprobe,1.2,1.2.2.1

[Michał Moskal]

log_diff.py sponsored by *pld-linux.org*
$Id: log_diff.py,v 1.32 2002/04/14 21:54:28 misiek Exp $

Module name:    bootdisk
Changes by:     malekith

Modified Files:
      Tag: PLD_1_0
	modprobe 

Log Message:
- sync with HEAD



Index: modprobe
===================================================================
RCS file: /cvsroot/bootdisk/scripts/modprobe,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- modprobe	6 Sep 2001 23:50:22 -0000	1.2
+++ modprobe	23 Jul 2002 11:02:49 -0000	1.2.2.1
@@ -14,15 +14,22 @@
 mod=`echo "$1" | sed 's/\.o$//' || :`
 
 if test $remove; then
-	rmmod -r ${mod}
-
+	# don't use rmmod -r option -- busybox' rmmod lacks it
+	rmmod ${mod}
 else
 	deps=`grep "^${mod}\.o:" /etc/modules.dep | sed "s/^${mod}\.o://" || :`
 
 	# love recursion
 	for i in $deps; do modprobe $i; done
 
-	lsmod | grep -q "^${mod} " || insmod ${mod}
+	if lsmod | grep -q "^${mod} " ; then
+		: ok
+	else
+		# run load_module (that will ask user to insert disk)
+		# with redirected descriptors, as we'll be run from within
+		# cardmgr, that captures our input/output
+		load_module ${mod} < /dev/console > /dev/console 2> /dev/console
+	fi
 fi
 
-
+# vim:ft=sh