Changeset 1500


Ignore:
Timestamp:
Jun 9, 2007, 2:05:52 AM (12 years ago)
Author:
bruno
Message:
  • ChangeLog? updated
  • Attempt to fix completely #159
  • Improve ESX+vmfs support - needs testing
  • Attempt to fix #136 (without floppy mondorestore may hang due to a mount command blocked)
  • man page fixed as mindi images are now under /var/cache/mindi
  • Support Web page now includes all the latest supported distributions
  • mondorestore supports now the -p option so man page fixed.
  • Fix my email address in mindi man page
  • Fix a typo on the support Web page
  • Improve isolinux.bin detection on x86_64 system by looking also in /usr/lib64
  • Stricter POSIX conformance for all shell scripts (== replaced by = in compare)

(merge -r 1488:1499 $SVN_M/branches/2.2.4)

Location:
branches/stable
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/ChangeLog

    r1447 r1500  
    33MINDI CHANGES
    44
    5 1.2.4 (2007-05-17)
     51.2.4 (2007-06-09)
     6- Improve VMWare ESX support (Bruno Cornec)
     7- Fix a x86_64 bug (Bruno Cornec)
     8- MINDI_TMP now used in analyze-my-lvm (Bruno Cornec)
     9- Fx bugs for optimised libs (Debian, Centos/RHEL5) (Brandon Poyner/Andree Leidenfrost/Bruno Cornec)
     10- Remove a hack for x86_64 in spec file due to a RH bug (Bruno Cornec)
     11- Remove all support for mindi.conf for 2.2.x branch (Bruno Cornec)
     12- Gentoo support improvements (kernel, kbd, deps, ...) (Francesco Talamona/Bruno Cornec)
     13- parted is required by mindi (Francesco Talamona/Bruno Cornec)
     14- Add support for i2o (Fix #165) (Bruno Cornec)
    615- Now supports USB keyboard/mouse at restore time better (Bruno Cornec)
    716- Support for HP xw9300 NIC (forcedeth) added (Bruno Cornec)
  • branches/stable/mindi/install.sh

    r1469 r1500  
    4242echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
    4343
    44 if [ _"$MANDIR" == _"" ]; then
     44if [ _"$MANDIR" = _"" ]; then
    4545    MANDIR=$local/share/man/man8
    4646else
    4747    MANDIR=${HEAD}$MANDIR/man8
    4848fi
    49 if [ _"$DOCDIR" == _"" ]; then
     49if [ _"$DOCDIR" = _"" ]; then
    5050    DOCDIR=$local/share/doc/mindi-$MINDIVER
    5151else
    5252    DOCDIR=${HEAD}$DOCDIR/mindi-$MINDIVER
    5353fi
    54 if [ _"$LIBDIR" == _"" ]; then
     54if [ _"$LIBDIR" = _"" ]; then
    5555    ARCH=`/bin/arch`
    5656    echo $ARCH | grep -E '^i[0-9]86$' &> /dev/null && ARCH=i386 && locallib=$local/lib
  • branches/stable/mindi/mindi

    r1489 r1500  
    587587    ISOLINUX=/usr/lib/isolinux.bin
    588588    [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/lib/syslinux/isolinux.bin
     589    [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/lib64/syslinux/isolinux.bin
    589590    [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/syslinux/isolinux.bin
    590591    [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/lib/syslinux/isolinux.bin
     592    [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/lib64/syslinux/isolinux.bin
    591593    [ ! -e "$ISOLINUX" ] && ISOLINUX=`locate isolinux.bin | grep -x "/.*/isolinux.bin"`
    592594    [ ! -e "$ISOLINUX" ] && Die "Please install isolinux first. If your syslinux RPM doesn't include isolinux, you may download an isolinux RPM from Mondo's website - go to http://www.mondorescue.com and click on 'Download'"
     
    30463048lsmod >> $LOGFILE
    30473049MODULES="`cat /proc/modules | awk '{print $1}'`"
     3050if [ -e /usr/sbin/esxcfg-module ]; then
     3051    echo "VMWare ESX server detected - Enabling dedicated support" >> $LOGFILE
     3052    echo "-------------" >> $LOGFILE
     3053    echo "VMWare modules" >> $LOGFILE
     3054    echo "-------------" >> $LOGFILE
     3055    esxcfg-module -l >> $LOGFILE
     3056    MODULES="$MODULES `esxcfg-module -l | awk '{print $1}'`"
     3057fi
    30483058echo "-------------" >> $LOGFILE
    30493059echo "Liste of extra modules is:" >> $LOGFILE
  • branches/stable/mondo-doc/mindi.8

    r1489 r1500  
    188188.SH AUTHORS
    189189Bruno Cornec (lead-development)
    190 .I "bcornec_at_mondorescue.org"
     190.I "bruno_at_mondorescue.org"
    191191.br
    192192Andree Leidenfrost (co-developper)
  • branches/stable/mondo-doc/mondorestore.8

    r1338 r1500  
    2525
    2626.SH SYNOPSIS
    27 .B mondorestore
     27.B mondorestore [-p prefix]
    2828: restore your PC
    2929
     
    3333restores data previously backed up with
    3434.I mondoarchive.
    35 .I mondorestore
    36 does not take any command line parameters.
     35
    3736.
    3837Note that mondorestore will usually automatically be called when booting a
     
    4039.B Expert
    4140mode in which case mondorestore can be evoked from the command line.
     41
     42.TP
     43.BI "-p " prefix
     44Use
     45.B prefix
     46to specify the name of your ISO images.
     47By default, mondoarchive names images mondorescue-1.iso, mondorescue-2.iso, ...
     48Using
     49.B -p machine
     50.B mondorestore
     51will use images named machine-1.iso, machine-2.iso, ...
    4252
    4353.SH DIAGNOSTICS
  • branches/stable/mondo/ChangeLog

    r1447 r1500  
    33MONDO CHANGES
    44
    5 2.2.4 (2007-05-17)
     52.2.4 (2007-06-09)
     6- Improved Ubuntu support (Fix #159) (Bruno Cornec)
     7- Improved VMWare ESX supoprt (Amaury Tanquerel/Bruno Cornec)
     8- Fix a bug (hang #136) when no floppy available (Bruno Cornec)
     9- Adds OCFS support in -N (Bruno Cornec)
     10- Reduce log file verbosity in sort phase (Bruno Cornec)
     11- Fix a spelling error (James Cameron/Bruno Cornec)
     12- mondo rpm pkg depends on buffer and cdrecord (Vincen Danen/Bruno Cornec)
     13- Adds -p option support to mondorestore (Fix #114) (Bruno Cornec)
     14- Adds support for Boot loader in partitions (Fix #117) (Bruno Cornec)
    615- Fix a bug where Unallocated space was considered as an error (Bruno Cornec)
    716- MINDI_CACHE set to /var/cache/mindi new location of mindi images instead of /root/images/mindi (Andree Leidenfrost)
  • branches/stable/mondo/src/mondorestore/mondo-prep.c

    r1371 r1500  
    19241924    } else if (strcmp(format, "minix") == 0) {
    19251925        mr_asprintf(&partcode, "81");
     1926    } else if (strcmp(format, "vmfs") == 0) {
     1927        strcpy(partcode, "fb");
    19261928    } else if (strcmp(format, "raid") == 0) {
    19271929        mr_asprintf(&partcode, "fd");
     
    22502252    } else if (strcmp(format, "minix") == 0) {
    22512253        strcpy(program, "mkfs.minix");
     2254    } else if (strcmp(format, "vmfs") == 0) {
     2255        strcpy(program, "mkfs -t vmfs");
    22522256#endif
    22532257    } else if (strcmp(format, "ext2") == 0) {
  • branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

    r1419 r1500  
    14341434                newtSuspend();
    14351435            }
    1436             mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
     1436            mr_asprintf(&tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
    14371437            paranoid_system(tmp);
    14381438            mr_free(tmp);
    14391439
    1440             mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/grub.conf", editor);
     1440            mr_asprintf(&tmp, "chroot %s %s /etc/grub.conf", MNT_RESTORING, editor);
    14411441            paranoid_system(tmp);
    14421442            mr_free(tmp);
     
    21232123    mr_free(tmp);
    21242124
    2125     mr_asprintf(&command, "mount /dev/fd0u1722 %s", mountpt);
    2126     mr_asprintf(&tmp,
     2125    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("dmesg | grep -i floppy"));
     2126    if (strcmp(tmp, "")) {
     2127        mr_asprintf(&command, "mount /dev/fd0u1722 %s", mountpt);
     2128        mr_asprintf(&tmp,
    21272129            "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
    21282130            command);
    2129     mr_msg(1, "tmp = '%s'", tmp);
    2130     system(tmp);
    2131     mr_free(tmp);
    2132 
    2133     res = run_program_and_log_output(command, FALSE);
    2134     mr_free(command);
    2135 
    2136     if (res) {
    2137         mr_asprintf(&command, "mount /dev/fd0H1440 %s", mountpt);
     2131        mr_msg(1, "tmp = '%s'", tmp);
     2132        system(tmp);
     2133        mr_free(tmp);
     2134
    21382135        res = run_program_and_log_output(command, FALSE);
    21392136        mr_free(command);
     2137
     2138        if (res) {
     2139            mr_asprintf(&command, "mount /dev/fd0H1440 %s", mountpt);
     2140            res = run_program_and_log_output(command, FALSE);
     2141            mr_free(command);
     2142        }
     2143    } else {
     2144        res = 1;
    21402145    }
    21412146    if (res) {
  • branches/stable/website/downloads.shtml

    r1037 r1500  
    8484<li><b><a href="ftp://ftp.mondorescue.org/src">mindi-busybox</a></b>: the swiss army knife <a href="http://www.busybox.net">busybox</a> configured for mindi: a full set of commands in a single binary (embedded)</li>
    8585<li><b><a href="ftp://ftp.mondorescue.org/src">mindi</a></b>: the mini-distro builder part of the project</li>
    86 <li><b><a href="ftp://ftp.mondorescue.org/src">mondo</a></b>: the disaster recovery tool in itself</li>
     86<li><b><a href="ftp://ftp.mondorescue.org/src">mondo</a></b>: the disaster recovery tool itself</li>
    8787</ul>
    8888
     
    113113<p>Most of the time, you'll be able to download directly the packages suited for your distribution. Currently we provide packages for :
    114114<ul>
    115         <li>RedHat <a href="ftp://ftp.mondorescue.org/redhat/7.3">7.3</a> and <a href="ftp://ftp.mondorescue.org/redhat/9">9</a>.</li>
    116         <li>Fedora <a href="ftp://ftp.mondorescue.org/fedora/4">Core 4</a> and <a href="ftp://ftp.mondorescue.org/fedora/5">Core 5</a>.</li>
    117         <li>RedHat Enterprise Linux <!--<a href="ftp://ftp.mondorescue.org/rhel/2.1">2.1</a>, --><a href="ftp://ftp.mondorescue.org/rhel/3">3</a>, <a href="ftp://ftp.mondorescue.org/rhel/4">4</a>.</li>
    118         <li>Mandriva <a href="ftp://ftp.mondorescue.org/mandrake/10.1">10.1</a>, <a href="ftp://ftp.mondorescue.org/mandrake/10.2">10.2</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2006.0">2006.0</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2007.0">2007.0</a>.</li>
    119         <li>OpenSuSE <a href="ftp://ftp.mondorescue.org/suse/9.3">9.3</a>, <a href="ftp://ftp.mondorescue.org/suse/10.0">10.0</a>, <a href="ftp://ftp.mondorescue.org/suse/10.1">10.1</a>. Look also at <a href="http://www.mikenjane.net/~mike/">this</a> web page for SuSE details. <a href="http://packman.links2linux.org/">Packman</a> may have some useful additional packages.
     115        <li>RedHat <a href="ftp://ftp.mondorescue.org/redhat/7.3">7.3</a>, <a href="ftp://ftp.mondorescue.org/redhat/9">9</a>.</li>
     116        <li>Fedora <a href="ftp://ftp.mondorescue.org/fedora/4">Core 4</a>, <a href="ftp://ftp.mondorescue.org/fedora/5">Core 5</a>, <a href="ftp://ftp.mondorescue.org/fedora/6">Core 6</a>.</li>
     117        <li>RedHat Enterprise Linux <!--<a href="ftp://ftp.mondorescue.org/rhel/2.1">2.1</a>, --><a href="ftp://ftp.mondorescue.org/rhel/3">3</a>, <a href="ftp://ftp.mondorescue.org/rhel/4">4</a>, <a href="ftp://ftp.mondorescue.org/rhel/5">5</a>.</li>
     118        <li>Mandriva <a href="ftp://ftp.mondorescue.org/mandrake/10.1">10.1</a>, <a href="ftp://ftp.mondorescue.org/mandrake/10.2">10.2</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2006.0">2006.0</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2007.0">2007.0</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2007.1">2007.1</a>.</li>
     119        <li>OpenSuSE <a href="ftp://ftp.mondorescue.org/suse/10.0">10.0</a>, <a href="ftp://ftp.mondorescue.org/suse/10.1">10.1</a>, <a href="ftp://ftp.mondorescue.org/suse/10.2">10.2</a>. Look also at <a href="http://www.mikenjane.net/~mike/">this</a> web page for SuSE details. <a href="http://packman.links2linux.org/">Packman</a> may have some useful additional packages.
    120120        <li>SuSE Linux Enterprise Server <a href="ftp://ftp.mondorescue.org/sles/9">9</a>, <a href="ftp://ftp.mondorescue.org/sles/10">10</a>.</li>
    121         <li>Debian <a href="ftp://ftp.mondorescue.org/debian/3.1">3.1</a>. Look also at <a href="http://www.desknow.com/desknow/directfiles/aleidenfrost/mr-debs-unofficial/index.html">this</a> web page for Debian details.</li>
     121        <li>Debian <a href="ftp://ftp.mondorescue.org/debian/3.1">3.1</a>, <a href="ftp://ftp.mondorescue.org/debian/4.0">4.0</a>. Look also at <a href="http://www.desknow.com/desknow/directfiles/aleidenfrost/mr-debs-unofficial/index.html">this</a> web page for Debian details.</li>
     122        <li>Ubuntu <a href="ftp://ftp.mondorescue.org/ubuntu/6.04">6.04</a>, <a href="ftp://ftp.mondorescue.org/ubuntu/7.04">7.04</a>.</li>
    122123        <li>Gentoo <a href="ftp://ftp.mondorescue.org/gentoo/1.6">1.6</a>.
     124        <li>Slackware <a href="ftp://ftp.mondorescue.org/slackware/10.2">10.2</a>, <a href="ftp://ftp.mondorescue.org/slackware/11.0">11.0</a>.
    123125</ul>
    124126
  • branches/stable/website/support.shtml

    r1343 r1500  
    2121    <p>Third look at the <a href="http://trac.mondorescue.org/">Mondo Rescue wiki</a> which may contain additional comments,and feel free to contribute by adding your remarks.</p>
    2222    <p>Fourth look at the <a href="http://sourceforge.net/mailarchive/forum.php?forum_name=mondo-devel">Mondo Rescue Mailing List Archives</a> as you're probably not the first with this problem.</p>
    23     <p>Finally post on the <a href="mailto:mondo-devel_at_lists.sourceforge.net">Mondo Rescue Mailing List</a> if you did not find what you were looking for, as there are more than 400 users there who could help you, including dev team members. <b>But</b>, they can only help you if your provide at least the above mentionned <b>2 first log files</b>.</p>
     23    <p>Finally post on the <a href="mailto:mondo-devel_at_lists.sourceforge.net">Mondo Rescue Mailing List</a> if you did not find what you were looking for, as there are more than 400 users there who could help you, including dev team members. <b>But</b>, they can only help you if your provide at least the above mentioned <b>2 first log files</b>.</p>
    2424    <p>If your think you found a bug in Mondo Rescue, please <a href="http://trac.mondorescue.org/newticket">fill a bug report</a> and also include the log files.</p>
    2525    <p>Likely, if you wish Mondo Rescue had your dreamed new shiny function, feel free to create a <a href="http://trac.mondorescue.org/newticket">feature request</a>.</p>
Note: See TracChangeset for help on using the changeset viewer.