Changeset 1691 in MondoRescue for branches/2.2.5/mindi/mindi

Timestamp:

Oct 21, 2007, 2:27:53 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix PB macro vs tools/*2build issue
• make_usb_fs change of interface (doesn't need a parameter)
• Fix USB support in mondo to avoid multiple copies of files
• Use first partiion in mondo for USB device

File:

• branches/2.2.5/mindi/mindi (modified) (5 diffs)

branches/2.2.5/mindi/mindi

@@ -28 +28 @@
     # run this command.
 
-MINDI_REV=RRR
-MINDI_VER=VVV
+MINDI_REV=PBREV
+MINDI_VER=PBVER
 
 MINDI_VERSION=${MINDI_VER}-r$MINDI_REV
@@ -1710 +1710 @@
     fi
     echo -en "."
+    echo "Unmounting $USBDEVICE just in case" >> $LOGFILE
+    umount $USBDEVICE 2>&1 >> $LOGFILE
     echo "Erasing $USBDEVICE" >> $LOGFILE
     $FDISK $USBDEVICE 2>&1 >> $LOGFILE << EOF
@@ -1752 +1754 @@
     fi
     echo -en "."
-    mkdir -p $MINDI_TMP/usb/{images,archives}
-    cp -f $1/*.img $1/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogIt "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/iso/images"
+    mkdir -p $MINDI_TMP/usb/images
+    cp -f $1/*.img $1/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogIt "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/usb/images"
     echo -en "."
     old_pwd=`pwd`
@@ -1777 +1779 @@
     cp $MINDI_TMP/mindi.rdz $MINDI_TMP/usb/initrd.img 2>> $LOGFILE
     echo -en "."
-    if [ _"$MONDO_SHARE" != _"" ]; then
-        cp $kernelpath $MONDO_ROOT/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
-        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2> /dev/null || Die "Cannot copy mindi.rdz ($MINDI_TMP) to mondo root ($MONDO_ROOT/initrd.img). Did you run out of disk space?"
-
-    fi
-    echo -en "."
     [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
     cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $MINDI_TMP/usb > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to $MINDI_TMP/usb - did you run out of disk space?"
@@ -1793 +1789 @@
     if [ "$ARCH" != "ia64" ] ; then
         if [ _"$MONDO_SHARE" != _"" ]; then
-            cp -f $MINDI_TMP/usb/{syslinux.cfg,initrd.img,vmlinuz,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 $MONDO_SHARE/autorun $MONDO_ROOT 2>> $LOGFILE
         fi