Changeset 1691


Ignore:
Timestamp:
Oct 21, 2007, 2:27:53 AM (12 years ago)
Author:
bruno
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
Location:
branches/2.2.5
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1690 r1691  
    2828    # run this command.
    2929
    30 MINDI_REV=RRR
    31 MINDI_VER=VVV
     30MINDI_REV=PBREV
     31MINDI_VER=PBVER
    3232
    3333MINDI_VERSION=${MINDI_VER}-r$MINDI_REV
     
    17101710    fi
    17111711    echo -en "."
     1712    echo "Unmounting $USBDEVICE just in case" >> $LOGFILE
     1713    umount $USBDEVICE 2>&1 >> $LOGFILE
    17121714    echo "Erasing $USBDEVICE" >> $LOGFILE
    17131715    $FDISK $USBDEVICE 2>&1 >> $LOGFILE << EOF
     
    17521754    fi
    17531755    echo -en "."
    1754     mkdir -p $MINDI_TMP/usb/{images,archives}
    1755     cp -f $1/*.img $1/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogIt "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/iso/images"
     1756    mkdir -p $MINDI_TMP/usb/images
     1757    cp -f $1/*.img $1/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogIt "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/usb/images"
    17561758    echo -en "."
    17571759    old_pwd=`pwd`
     
    17771779    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/usb/initrd.img 2>> $LOGFILE
    17781780    echo -en "."
    1779     if [ _"$MONDO_SHARE" != _"" ]; then
    1780         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?"
    1781         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?"
    1782 
    1783     fi
    1784     echo -en "."
    17851781    [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
    17861782    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?"
     
    17931789    if [ "$ARCH" != "ia64" ] ; then
    17941790        if [ _"$MONDO_SHARE" != _"" ]; then
    1795             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?"
    17961791            cp -f $MONDO_SHARE/autorun $MONDO_ROOT 2>> $LOGFILE
    17971792        fi
  • branches/2.2.5/mondo-doc/mindi.8

    r1686 r1691  
    2121.\" USA.
    2222.\"
    23 .TH MINDI 8 "DDD" "Mondo Rescue VVV-rRRR"
     23.TH MINDI 8 "PBDATE" "Mondo Rescue PBVER-rPBREV"
    2424.SH NAME
    2525mindi \- a tool for creating boot/root disks
  • branches/2.2.5/mondo-doc/mondoarchive.8

    r1495 r1691  
    1919.\" USA.
    2020.\"
    21 .TH mondoarchive 8 "DDD" "Mondo Rescue VVV-rRRR"
     21.TH mondoarchive 8 "PBDATE" "Mondo Rescue PBVER-rPBVER"
    2222
    2323.SH NAME
  • branches/2.2.5/mondo-doc/mondorescue-howto.sgml

    r1611 r1691  
    11<!DOCTYPE BOOK PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
    2 <!ENTITY curdate "DDD">
    3 <!ENTITY curver "VVV-rRRR">
     2<!ENTITY curdate "PBDATE">
     3<!ENTITY curver "PBVER-rPBREV">
    44
    55<!ENTITY WWWB "http://www.mondorescue.org/">
  • branches/2.2.5/mondo-doc/mondorestore.8

    r1494 r1691  
    1919.\" USA.
    2020.\"
    21 .TH mondorestore 8 "DDD" "Mondo Rescue VVV-rRRR"
     21.TH mondorestore 8 "PBDATE" "Mondo Rescue PBVER-rPBREV"
    2222
    2323.SH NAME
  • branches/2.2.5/mondo/src/common/libmondo-archive.c

    r1689 r1691  
    18571857 * @return The number of errors encountered (0 for success)
    18581858 */
    1859 int make_usb_fs(char *destfile)
     1859int make_usb_fs()
    18601860{
    18611861    /*@ int ********************************************** */
     
    18721872    malloc_string(old_pwd);
    18731873    assert(bkpinfo != NULL);
    1874     assert_string_is_neither_NULL_nor_zerolength(destfile);
    1875 
    1876     log_msg(2, "make_usb_fs --- scratchdir=%s --- destfile=%s",
    1877             bkpinfo->scratchdir, destfile);
     1874
     1875    log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
    18781876    (void) getcwd(old_pwd, MAX_STR_LEN - 1);
    18791877    asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
     
    18981896    run_program_and_log_output(tmp, FALSE);
    18991897    paranoid_free(tmp);
    1900     asprintf(&tmp, "mount %s %s", bkpinfo->media_device, tmp1);
     1898    /* Mindi always create one single parition on the USB dev */
     1899    asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
    19011900    run_program_and_log_output(tmp, FALSE);
    19021901    paranoid_free(tmp);
     
    19071906        log_msg(1, "Making bootable backup");
    19081907
    1909         asprintf(&tmp,"cp -rp %s/* %s", bkpinfo->scratchdir, tmp1); /* Command to execute */
     1908        /* Command to execute */
     1909        asprintf(&tmp,"mv %s/.??* %s/* %s", bkpinfo->scratchdir, bkpinfo->scratchdir, tmp1);
    19101910        res = eval_call_to_make_USB(tmp, message_to_screen);
    19111911        if (res) {
     
    19231923
    19241924    if (is_this_device_mounted(bkpinfo->media_device)) {
    1925         asprintf(&tmp, "umount %s", bkpinfo->media_device);
     1925        asprintf(&tmp, "umount %s1", bkpinfo->media_device);
    19261926        run_program_and_log_output(tmp, FALSE);
    19271927        paranoid_free(tmp);
     
    19351935    return (retval);
    19361936}
    1937 
    19381937
    19391938
     
    39373936            res = make_iso_fs(isofile);
    39383937        } else {
    3939             res = make_usb_fs(isofile);
     3938            res = make_usb_fs();
    39403939        }
    39413940        if (g_current_media_number == 1 && !res
  • branches/2.2.5/website/top.shtml

    r785 r1691  
    1515      </div>
    1616      <div id="topinfo">
    17         VVV-rRRR   - DDD   </div>
     17        PBVER-rPBREV   - PBDATE   </div>
    1818    </div>
    1919    <div id="body">
Note: See TracChangeset for help on using the changeset viewer.