Changeset 1693 for branches/stable


Ignore:
Timestamp:
Oct 21, 2007, 3:06:22 AM (12 years ago)
Author:
bruno
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)

Location:
branches/stable
Files:
5 deleted
19 edited
4 copied

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/install.sh

    r1619 r1693  
    6969
    7070echo "Creating target directories ..."
    71 install -m 755 -d $conf $conf/deplist.d $locallib/mindi $MANDIR $local/sbin $DOCDIR $CACHEDIR
     71install -m 755 -d $conf $conf/deplist.d $locallib/mindi $MANDIR $local/sbin $CACHEDIR # $DOCDIR
    7272
    7373echo "Copying files ..."
     
    133133
    134134install -m 644 mindi.8 $MANDIR
    135 install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
     135#install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
    136136
    137137if [ "_$PREFIX" = "_" ] && [ ! -f $locallib/mindi/rootfs/bin/busybox ]; then
     
    160160
    161161if [ "$PKGBUILDMINDI" != "true" ]; then
    162     chown -R root:root $locallib/mindi $conf $DOCDIR
     162    chown -R root:root $locallib/mindi $conf # $DOCDIR
    163163    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $locallib/mindi/analyze-my-lvm $local/sbin/parted2fdisk.pl
    164164    if [ "$ARCH" = "ia64" ] ; then
     
    168168
    169169# Special case for SuSE family where doc is put elsewhere in the RPM
    170 if [ -e /etc/SuSE-release ]; then
    171     rm -rf $DOCDIR
    172 fi
     170# if [ -e /etc/SuSE-release ]; then
     171    # rm -rf $DOCDIR
     172# fi
    173173
    174174# Special case for Debian family where doc is put elsewhere in the DEB
    175 if [ -e /etc/debian_version ]; then
    176     rm -rf $DOCDIR
    177 fi
     175# if [ -e /etc/debian_version ]; then
     176    # rm -rf $DOCDIR
     177# fi
    178178
    179179exit 0
  • 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
  • branches/stable/mondo-doc/mindi.8

    r1581 r1693  
    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
     
    3939.PP
    4040.B mindi
    41 creates a set of bootable ISO images using
     41creates a set of bootable ISO/USB images using
    4242files from the system it runs on.
    4343.B mindi
     
    4848is used by
    4949.B monodarchive(8)
    50 to produce the required boot/root CD images but can also be used
     50to produce the required boot/root USB/ISO images but can also be used
    5151stand-alone.
    5252
  • branches/stable/mondo-doc/mondoarchive.8

    r1594 r1693  
    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/stable/mondo-doc/mondorescue-howto.sgml

    r1621 r1693  
    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/stable/mondo-doc/mondorestore.8

    r1500 r1693  
    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/stable/mondo/src/common/libmondo-archive.c

    r1671 r1693  
    533533    /*@ buffer ************************************************************ */
    534534    char *tmp = NULL;
     535    char *tmp1 = NULL;
     536    char *tmp2 = NULL;
    535537    char *command = NULL;
    536538    char *bootldr_str = NULL;
     
    15341536    }
    15351537    close_evalcall_form();
     1538}
     1539
     1540
     1541/**
     1542 * Create a USB image in @c destfile, from files in @c bkpinfo->scratchdir.
     1543 *
     1544 * @param bkpinfo The backup information structure. Fields used:
     1545 * - @c backup_media_type
     1546 * - @c nonbootable_backup
     1547 * - @c scratchdir
     1548 *
     1549 * @param destfile Where to put the generated USB image.
     1550 * @return The number of errors encountered (0 for success)
     1551 */
     1552int make_usb_fs()
     1553{
     1554    /*@ int ********************************************** */
     1555    int retval = 0;
     1556    int res;
     1557
     1558    /*@ buffers ****************************************** */
     1559    char *tmp = NULL;
     1560    char *tmp1 = NULL;
     1561    char *result_sz = NULL;
     1562    char *message_to_screen = NULL;
     1563    char *old_pwd;
     1564
     1565    malloc_string(old_pwd);
     1566    assert(bkpinfo != NULL);
     1567
     1568    log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
     1569    (void) getcwd(old_pwd, MAX_STR_LEN - 1);
     1570    asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
     1571    run_program_and_log_output(tmp, FALSE);
     1572    paranoid_free(tmp);
     1573    chdir(bkpinfo->scratchdir);
     1574
     1575    asprintf(&message_to_screen, "Copying data to make %s #%d",
     1576                media_descriptor_string(bkpinfo->backup_media_type),
     1577                g_current_media_number);
     1578    log_msg(1, message_to_screen);
     1579
     1580    if (is_this_device_mounted(bkpinfo->media_device)) {
     1581        log_msg(1, "USB device mounted. Remounting it at the right place");
     1582        asprintf(&tmp, "umount %s", bkpinfo->media_device);
     1583        run_program_and_log_output(tmp, FALSE);
     1584        paranoid_free(tmp);
     1585    }
     1586    log_msg(1, "Mounting USB device.");
     1587    asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
     1588    asprintf(&tmp, "mkdir -p %s", tmp1);
     1589    run_program_and_log_output(tmp, FALSE);
     1590    paranoid_free(tmp);
     1591    /* Mindi always create one single parition on the USB dev */
     1592    asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
     1593    run_program_and_log_output(tmp, FALSE);
     1594    paranoid_free(tmp);
     1595
     1596    if (bkpinfo->nonbootable_backup) {
     1597        log_msg(1, "Making nonbootable USB backup not implemented yet");
     1598    } else {
     1599        log_msg(1, "Making bootable backup");
     1600
     1601        /* Command to execute */
     1602        asprintf(&tmp,"mv %s/.??* %s/* %s", bkpinfo->scratchdir, bkpinfo->scratchdir, tmp1);
     1603        res = eval_call_to_make_USB(tmp, message_to_screen);
     1604        if (res) {
     1605            asprintf(&result_sz, "%s ...failed",tmp);
     1606        } else {
     1607            asprintf(&result_sz, "%s ...OK",tmp);
     1608        }
     1609        log_to_screen(result_sz);
     1610        paranoid_free(result_sz);
     1611        paranoid_free(tmp);
     1612        retval += res;
     1613    }
     1614    paranoid_free(message_to_screen);
     1615    paranoid_free(tmp1);
     1616
     1617    if (is_this_device_mounted(bkpinfo->media_device)) {
     1618        asprintf(&tmp, "umount %s1", bkpinfo->media_device);
     1619        run_program_and_log_output(tmp, FALSE);
     1620        paranoid_free(tmp);
     1621    }
     1622
     1623    chdir(old_pwd);
     1624    if (retval) {
     1625        log_msg(1, "WARNING - make_usb_fs returned an error");
     1626    }
     1627    paranoid_free(old_pwd);
     1628    return (retval);
    15361629}
    15371630
     
    31543247            res = make_iso_fs(isofile);
    31553248        } else {
     3249            res = make_usb_fs();
    31563250        }
    31573251        if (g_current_media_number == 1 && !res
  • branches/stable/mondo/src/common/libmondo-fork-EXT.h

    r1663 r1693  
    55                                         char *what_i_am_doing);
    66extern int run_program_and_log_output(char *program, int);
     7extern int eval_call_to_make_USB(char *call,
     8                                 char *what_i_am_doing);
    79extern int eval_call_to_make_ISO(char *basic_call, char *isofile,
    810                                 int cd_no, char *logstub,
  • branches/stable/mondo/src/common/libmondo-fork.c

    r1663 r1693  
    179179
    180180/**
     181 * Call copy of data to create an USB image.
     182 * @param bkpinfo The backup information structure. Fields used:
     183 * - @c bkpinfo->backup_media_type
     184 * @return Exit code of @c copy (0 is success, anything else indicates failure).
     185 */
     186int
     187eval_call_to_make_USB(char *command, char *what_i_am_doing) {
     188
     189    /*@ int's  *** */
     190    int retval = 0;
     191
     192
     193/*@***********   End Variables ***************************************/
     194
     195    log_msg(3, "Starting");
     196    assert(bkpinfo != NULL);
     197
     198    log_to_screen
     199        ("Please be patient. Do not be alarmed by on-screen inactivity.");
     200    log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
     201            what_i_am_doing);
     202
     203    if (!g_text_mode) {
     204        newtSuspend();
     205    }
     206    log_msg(1, "command = '%s'", command);
     207    if (!g_text_mode) {
     208        retval = run_external_binary_with_percentage_indicator_NEW
     209            (what_i_am_doing, command);
     210    } else {
     211        retval += system(command);
     212    }
     213    if (!g_text_mode) {
     214        newtResume();
     215    }
     216
     217    return (retval);
     218}
     219
     220
     221
     222
     223/**
    181224 * Run a program and log its output (stdout and stderr) to the logfile.
    182225 * @param program The program to run. Passed to the shell, so you can use pipes etc.
  • branches/stable/mondo/src/common/libmondo-fork.h

    r1663 r1693  
    88int run_program_and_log_to_screen(char *basic_call, char *what_i_am_doing);
    99int run_program_and_log_output(char *program, int);
     10int eval_call_to_make_USB(char *call, char *what_i_am_doing);
    1011int eval_call_to_make_ISO(char *basic_call, char *isofile,
    1112                          int cd_no, char *logstub, char *what_i_am_doing);
  • branches/stable/mondo/src/common/libmondo-string.c

    r1663 r1693  
    929929       }
    930930
    931        switch (type_of_bkp) {
    932        case dvd:
    933                strcpy(type_of_backup, "DVD");
    934                break;
    935        case cdr:
    936                strcpy(type_of_backup, "CDR");
    937                break;
    938        case cdrw:
    939                strcpy(type_of_backup, "CDRW");
    940                break;
    941        case tape:
    942                strcpy(type_of_backup, "tape");
    943                break;
    944        case cdstream:
    945                strcpy(type_of_backup, "CDR");
    946                break;
    947        case udev:
    948                strcpy(type_of_backup, "udev");
    949                break;
    950        case iso:
    951                strcpy(type_of_backup, "ISO");
    952                break;
    953        case nfs:
    954                strcpy(type_of_backup, "nfs");
    955                break;
    956        case usb:
    957                strcpy(type_of_backup, "USB");
    958                break;
    959        default:
    960                strcpy(type_of_backup, "ISO");
    961        }
    962        return (type_of_backup);
    963 }
    964 
     931        switch (type_of_bkp) {
     932        case dvd:
     933            strcpy(type_of_backup, "DVD");
     934            break;
     935        case cdr:
     936            strcpy(type_of_backup, "CDR");
     937            break;
     938        case cdrw:
     939            strcpy(type_of_backup, "CDRW");
     940            break;
     941        case tape:
     942            strcpy(type_of_backup, "tape");
     943            break;
     944        case cdstream:
     945            strcpy(type_of_backup, "CDR");
     946            break;
     947        case udev:
     948            strcpy(type_of_backup, "udev");
     949            break;
     950        case iso:
     951            strcpy(type_of_backup, "ISO");
     952            break;
     953        case nfs:
     954            strcpy(type_of_backup, "nfs");
     955            break;
     956        case usb:
     957            strcpy(type_of_backup, "USB");
     958            break;
     959        default:
     960            strcpy(type_of_backup, "ISO");
     961    }
     962    return (type_of_backup);
     963}
  • branches/stable/mondo/src/include/my-stuff.h

    r1670 r1693  
    227227#ifdef __FreeBSD__
    228228#define VANILLA_SCSI_TAPE   "/dev/sa"
     229#define VANILLA_USB_DEVICE  "tobegivenbybsdguru"
    229230#define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/vinum/"
    230231#define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
     
    235236#else
    236237#define VANILLA_SCSI_TAPE   "/dev/st0"
     238#define VANILLA_USB_DEVICE  "/dev/hda"
    237239#define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
    238240#define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
  • branches/stable/pbconf/mindi/rpm/mindi.spec

    r1681 r1693  
    3737export CONFDIR=%{_sysconfdir}
    3838export MANDIR=%{_mandir}
    39 export DOCDIR=%{_docdir}
     39#export DOCDIR=%{_docdir}
    4040export LIBDIR=%{_libdir}
    4141export CACHEDIR=%{_var}/cache/%{name}
  • branches/stable/pbconf/mondo/deb/control

    r1464 r1693  
    1 Source: mondo
    2 Section: utils
     1Source: PBPKG
     2Section: PBGRP
    33Priority: optional
    4 Maintainer: Bruno Cornec <bruno@mondorescue.org>
     4Maintainer: PBPACKAGER
    55Build-Depends: debhelper (>= 4.2.20), libnewt-dev, libncurses5-dev
    66Standards-Version: 3.6.1
    77
    8 Package: mondo
    9 Architecture: amd64 i386
    10 Section: utils
     8Package: PBPKG
     9Architecture: amd64 i386 ia64
     10Section: PBGRP
    1111Priority: optional
    1212Depends: ${shlibs:Depends}, ${misc:Depends}, mindi (>= 1.2.3-1), afio, buffer, gawk, cdrecord, lzop
  • branches/stable/pbconf/mondo/deb/rules

    r1513 r1693  
    1111
    1212# Define package name variable for a one-stop change.
    13 PACKAGE_NAME = mondo
     13PACKAGE_NAME = PBPKG
    1414
    1515# These are used for cross-compiling and for saving the configure script
     
    9191    mkdir -p debian/doc-temp
    9292    mkdir -p $(CURDIR)/debian/$(PACKAGE_NAME)/var/cache/mondo
    93     cp -a docs/en/mondorescue-howto debian/doc-temp/html
     93    #cp -a docs/en/mondorescue-howto debian/doc-temp/html
    9494
    9595    dh_install -s
  • branches/stable/pbconf/mondorescue.pb

    r1663 r1693  
    1414
    1515pkgver mindi = 1.2.5
    16 pkgver mindi-busybox = 1.2.2
    17 pkgtag mindi-busybox = 4
     16pkgver mindi-busybox = 1.7.2
     17pkgtag mindi-busybox = 1
    1818
    1919# Hash of additional package/package directory
  • branches/stable/tools/qemu-vm.txt

    r1663 r1693  
    22qemu-img create -f qcow2 image.qemu 3G
    33qemu -cdrom /dev/hdc -m 256 -boot d image.qemu
     4
     5# use lilo on recent x86_86 distros as grub doesn't work.
     6# on suse make yast2 use the right repositories (Sw/SWrepositories/ remove DVD)
     7# # verify root alogin on sshd conf
     8grep Root /etc/ssh/sshd_config
     9
     10# On Ubuntu install openssh-server
     11apt-get install openssh-server
     12
     13# At install on 64 distro use lilo
     14# on Ubuntu change tty, kill grub install
     15# chroot /target remount cdrom
     16# install lilo instead
    417
    518# Recent SUSE acpi=off
     
    720# RPM based : urpmi, yum install, yast2
    821# Mandriva
    9 urpmi neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo mkisofs cdrecord pb
    10 
    11 #Fedora
    12 yum install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs pb
    13 
    1422
    1523# gentoo
     
    2331apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev libncurses5-dev pb
    2432
    25 # Apply AppConfig path
    26 patch -p0 < pb-doc/App*
    27 
    2833#Changing CD during install:
    2934Ctrl-Alt-2
     
    3641
    3742#Clé SSH:
     43mkdir .ssh
     44chmod 700 .ssh
    3845scp bruno@10.0.2.2:.ssh/id_dsa.pub /root/.ssh/authorized_keys
    3946chmod 600 /root/.ssh/authorized_keys
    40 
    41 #Créer compte pb
    42 useradd pb
    43 
    44 # No passwd for pb
    45 perl -pi -e 's/^pb:\!\!:/pb:*:/' /etc/shadow
    46 # Adapt sudoers
    47 echo "pb   ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
    48 # poweroff only
    49 
    50 su - pb
    51 mkdir ~/.ssh
    52 chmod 700 ~/.ssh
    53 scp -p victoria2.home.musique-ancienne.org:.ssh/id_dsa.pub ~/.ssh/authorized_keys
    54 # Passwd asked above
    55 chmod 600 ~/.ssh/authorized_keys
    5647
    5748#rebuild paquets necessaires mondo:
     
    6455chmod 644 build/RPMS/i386/*
    6556scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* www.mondorescue.org:/mondo/ftp/rhel/3/
    66 
    67 # Exchange host keys with www.mondorescue.org
    68 ssh www.mondorescue.org ls
    69 
    7057
    7158root:
  • branches/stable/tools/setupqemu

    r1681 r1693  
    33(
    44if [ _"$1" == _"" ]; then
    5     echo "Syntax: setupqemu VM"
     5    echo "Syntax: setupqemu VM|all"
    66    exit -1
    77fi
    88cat /users/bruno/pb/svn/devel/pb/contrib/pbsetupqemu /users/bruno/pb/svn/devel/pb/lib/ProjectBuilder/Distribution.pm > /tmp/pbscript
    9 for m in $*; do
    10     pb -r `pwd` -p mondorescue -m $m -a root -s /tmp/pbscript script2vm ; pb -p mondorescue -m $m build2vm
     9if [ _"$1" == "all" ]; then
     10    pb -r `pwd` -p mondorescue -a root -s /tmp/pbscript script2vm
    1111    ssh -p 2222 root@localhost halt
    1212    sleep 120
    13     ps auhxww | grep qemu | grep -Ev 'grep|setupqemu' | awk '{print $2}' | xargs kill -9
    14 done
     13    ps auhxww | grep qemu | grep -Ev 'grep|setupqemu' | awk '{print $2}' | xargs kill
     14else
     15    for m in $*; do
     16        pb -r `pwd` -p mondorescue -m $m -a root -s /tmp/pbscript script2vm ; pb -p mondorescue -m $m build2vm
     17        #ssh -p 2222 root@localhost halt
     18        #sleep 120
     19        #ps auhxww | grep qemu | grep -Ev 'grep|setupqemu' | awk '{print $2}' | xargs kill -9
     20    done
     21fi
    1522) 2>&1 | tee /tmp/setupqemu.log
  • branches/stable/website/top.shtml

    r785 r1693  
    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.