bootdisk: installer-prep (HEAD) [malekith]

[PLD CVS]

Module name:	bootdisk
Changes by:	malekith	02/07/26 12:47:56

Modified files:
	installer-prep

Log message:
- workaround for strange hang on insmod jfs
- don't load ide-mod if it's already loaded
- ditto parted

Index: installer-prep
===================================================================
RCS file: /cvsroot/bootdisk/batch-installer/installer-prep,v
diff -d -u -r1.86 -r1.87
--- installer-prep	2002/07/23 11:00:43	1.86
+++ installer-prep	2002/07/26 10:47:56	1.87
@@ -102,7 +102,17 @@
 	umount $source_mountpoint || :
     fi
 
-    log_wrap_verb insmod $@
+    # There is some problem with log_wrap_verb insmod jfs. For unknown
+    # reason it hangs, specifically tee command doesn't exit
+    # although input pipe has been closed. Therefore we use
+    # plain insmod. I guess this might be bug in either 
+    # busybox, uclibc, ash or jfs patch.
+
+    if [ "$1" = jfs ] ; then
+    	insmod $1
+    else
+        log_wrap_verb insmod $@
+    fi
 }
 
 # load package (-pkg.tar.gz) or package with modules (-mod.tar.gz)
@@ -402,9 +412,16 @@
   fi
 
   if echo "$1" | grep -q '/dev/hd' ; then
+    # if ide-disk is already loaded we havn't got anything to do.
+    # note that this ain't that simple with SCSI -- scsi_hostadapter
+    # might have been changed since last load etc.
+    if lsmod | grep -q '^ide-disk ' ; then
+      : skip
+    else
       load_package ide-mod
       load_ide_modules
       load_module ide-disk
+    fi
   fi
 
   if echo "$1" | grep -q '/dev/ida/' ; then
@@ -554,8 +571,11 @@
 
 # load it *after* removing modules
 # basic package
-# hmm is parted always required?
-load_package parted
+if test -x /bin/parted ; then
+  : skip
+else
+  load_package parted
+fi
 
 # load tools needed for particular filesystems
 have_ext2=""