Changeset 1693 in MondoRescue for branches/stable/mindi/mindi

Timestamp:

Oct 21, 2007, 3:06:22 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Remove useless copy from mindi to mondo at end of USB handling
• 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
• Fixes for USB CLI for both mondo/mindi
• Try to add USB support for mondoarchive with new functions
• du => deb for similarity with other distro type under pbconf
• migrate gento build files under pb
• remove now obsolete rpm spec file and gentoo build files from distributions
• Remove DOCDIR usage in mindi + various build fixes

(merge -r1680:1692 $SVN_M/branches/2.2.5)

File:

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

branches/stable/mindi/mindi

@@ -26 +26 @@
     # run this command.
 
-MINDI_REV=RRR
-MINDI_VER=VVV
+MINDI_REV=PBREV
+MINDI_VER=PBVER
 
 MINDI_VERSION=${MINDI_VER}-r$MINDI_REV
@@ -1628 +1628 @@
         echo "Unable to access $USBDEVICE" | tee -a $LOGFILE
         echo "Make sure your USB device is pluged in" | tee -a $LOGFILE
-        MindiExit -1
+        exit -1
     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
@@ -1656 +1658 @@
     echo -en "."
     echo "Creating a vfat filesystem on $USBPART" >> $LOGFILE
-    mkfs -t vfat $USBPART 2>&1 >> $LOGFILE
+    mkdosfs -F 32 $USBPART 2>&1 >> $LOGFILE
     if [ $? -ne 0 ]; then
         echo "Unable to create a vfat filesystem on $USBPART" | tee -a $LOGFILE
@@ -1673 +1675 @@
     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`
@@ -1698 +1700 @@
     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?"
@@ -1714 +1710 @@
     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
@@ -1734 +1729 @@
     fi
     echo -en "."
-    #
-    # If mondoarchive, then tranfer $MINDI_CACHE content to the USB device 
-    # and mount that device under that mountpoint instead 
-    # Has to be done at the end here.
-    #
-    if [ _"$MONDO_SHARE" != _"" ]; then
-        mount $USBPART $MINDI_TMP/usb 2>> $LOGFILE
-        mv $MINDI_CACHE/* $MINDI_TMP/usb
-        umount $MINDI_TMP/usb
-        mount $USBPART $MINDI_CACHE
-    fi
 }
 
@@ -3123 +3107 @@
 fi
 
-if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ]; then
+if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
     LogIt "Including the generation of a Bootable USB device on $USBDEVICE"
 fi