Ignore:
Timestamp:
Oct 21, 2007, 3:06:22 AM (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r1685 r1693  
    2626    # run this command.
    2727
    28 MINDI_REV=RRR
    29 MINDI_VER=VVV
     28MINDI_REV=PBREV
     29MINDI_VER=PBVER
    3030
    3131MINDI_VERSION=${MINDI_VER}-r$MINDI_REV
     
    16281628        echo "Unable to access $USBDEVICE" | tee -a $LOGFILE
    16291629        echo "Make sure your USB device is pluged in" | tee -a $LOGFILE
    1630         MindiExit -1
     1630        exit -1
    16311631    fi
    16321632    echo -en "."
     1633    echo "Unmounting $USBDEVICE just in case" >> $LOGFILE
     1634    umount $USBDEVICE 2>&1 >> $LOGFILE
    16331635    echo "Erasing $USBDEVICE" >> $LOGFILE
    16341636    $FDISK $USBDEVICE 2>&1 >> $LOGFILE << EOF
     
    16561658    echo -en "."
    16571659    echo "Creating a vfat filesystem on $USBPART" >> $LOGFILE
    1658     mkfs -t vfat $USBPART 2>&1 >> $LOGFILE
     1660    mkdosfs -F 32 $USBPART 2>&1 >> $LOGFILE
    16591661    if [ $? -ne 0 ]; then
    16601662        echo "Unable to create a vfat filesystem on $USBPART" | tee -a $LOGFILE
     
    16731675    fi
    16741676    echo -en "."
    1675     mkdir -p $MINDI_TMP/usb/{images,archives}
    1676     cp -f $1/*.img $1/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogIt "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/iso/images"
     1677    mkdir -p $MINDI_TMP/usb/images
     1678    cp -f $1/*.img $1/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogIt "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/usb/images"
    16771679    echo -en "."
    16781680    old_pwd=`pwd`
     
    16981700    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/usb/initrd.img 2>> $LOGFILE
    16991701    echo -en "."
    1700     if [ _"$MONDO_SHARE" != _"" ]; then
    1701         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?"
    1702         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?"
    1703 
    1704     fi
    1705     echo -en "."
    17061702    [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
    17071703    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?"
     
    17141710    if [ "$ARCH" != "ia64" ] ; then
    17151711        if [ _"$MONDO_SHARE" != _"" ]; then
    1716             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?"
    17171712            cp -f $MONDO_SHARE/autorun $MONDO_ROOT 2>> $LOGFILE
    17181713        fi
     
    17341729    fi
    17351730    echo -en "."
    1736     #
    1737     # If mondoarchive, then tranfer $MINDI_CACHE content to the USB device
    1738     # and mount that device under that mountpoint instead
    1739     # Has to be done at the end here.
    1740     #
    1741     if [ _"$MONDO_SHARE" != _"" ]; then
    1742         mount $USBPART $MINDI_TMP/usb 2>> $LOGFILE
    1743         mv $MINDI_CACHE/* $MINDI_TMP/usb
    1744         umount $MINDI_TMP/usb
    1745         mount $USBPART $MINDI_CACHE
    1746     fi
    17471731}
    17481732
     
    31233107fi
    31243108
    3125 if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ]; then
     3109if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
    31263110    LogIt "Including the generation of a Bootable USB device on $USBDEVICE"
    31273111fi
Note: See TracChangeset for help on using the changeset viewer.