Changeset 2704 in MondoRescue for branches/2.2.10/mindi/mindi

Timestamp:

Jan 27, 2011, 7:31:24 PM (13 years ago)

Author:

Bruno Cornec

Message:

r4180@localhost: bruno | 2011-01-27 10:26:41 +0100

• Fix multiple port issues from 2.2.9 that prevented mindi to work
• Change interface of call_program_and_get_last_line_of_output to allow not logging (call to mindi)
• Status is working boot, but NFS interface broken due to conf file issues

File:

• branches/2.2.10/mindi/mindi (modified) (8 diffs)

branches/2.2.10/mindi/mindi

@@ -1413 +1413 @@
     if [ "$ARCH" != "ia64" ] ; then
         if [ _"$MONDO_SHARE" != _"" ]; then 
-            cp -f $MINDI_TMP/iso/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
+            cp -f $MINDI_TMP/iso/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_CACHE 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_CACHE). Did you run out of disk space?"
             if [ $KERNEL_IS_XEN = "yes" ]; then
-                cp -f $MINDI_TMP/iso/{mboot.c32,xen.gz} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy Xen core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
+                cp -f $MINDI_TMP/iso/{mboot.c32,xen.gz} $MONDO_CACHE 2>> $LOGFILE || Die "Cannot copy Xen core files to ramdisk for boot disk (under $MONDO_CACHE). Did you run out of disk space?"
             fi
             cp -f $MONDO_SHARE/autorun $MINDI_TMP/iso 2>> $LOGFILE
@@ -2311 +2311 @@
     done
 
-    rm -f $MINDI_TMP/ungzip.lis
     for i in `echo $needed_modules  | tr ' ' '\n' | sort -u`; do
         grep -qE '^$i$' $MINDI_TMP/cp.lis
@@ -2318 +2317 @@
             LogFile "Adding $i ($s KB) to the rootfs" 
             echo $i >> $MINDI_TMP/cp.lis
-
-            # Uncompress modules if not using udev and native modprobe
-            if [ ! -f $mountpoint/tmp/USE-UDEV ]; then
-                if [ "`echo "$i" | grep -F ".gz"`" ]; then
-                    echo "$i" >> $MINDI_TMP/ungzip.lis
-                fi
-            fi
         fi
     done
@@ -2340 +2332 @@
     # Copy FW in case some drivers needs it
     if [ -d "/lib/firmware" ]; then
-        cp -rp /lib/firmware $mountpoint/lib
+        echo "lib/firmware" >> $MINDI_TMP/mkdir.lis 
+        echo "/lib/firmware" >> $MINDI_TMP/cp.lis 
     fi
 
@@ -2380 +2373 @@
     # Then copy files needed
     LANGUAGE=C tar cf - `cat $MINDI_TMP/cp.lis` 2> /dev/null | (cd $mountpoint ; tar xf - ) 2>&1 | grep -Ev "tar: Removing.*/\'" >> $LOGFILE 
-
-    # Uncompress modules if not using udev and native modprobe
-    for f in `cat $MINDI_TMP/ungzip.lis`; do
-        echo "Uncompressing $f" >> $LOGFILE
-        gunzip -f $mountpoint/$f
-    done
-    rm -f $MINDI_TMP/ungzip.lis
 
     # Then handle links
@@ -2490 +2476 @@
 LogFile "Start date : `date`" 
 LogFile "-----------------------------" 
-
-# TODO: Remove that 
-[ -e "/sbin/mkdosfs" ] && [ ! -e "/sbin/mkfs.vfat" ] && ln -sf /sbin/mkdosfs /sbin/mkfs.vfat
 
 # Log some capital variables
@@ -2630 +2613 @@
 LogFile "-------------" 
 LogFile "Liste of extra modules is:" 
+LogFile "-------------" 
 LogFile "$EXTRA_MODS" 
 LogFile "-------------" 
@@ -2718 +2702 @@
             Die "MONDO_TMP is /, aborting"
         fi
-        mv $MINDI_TMP/* $MINDI_TMP/.??* $MONDO_TMP 2>> $LOGFILE
         rmdir $MINDI_TMP
         export MINDI_TMP=$MONDO_TMP