Changeset 1591 for branches/stable


Ignore:
Timestamp:
Aug 2, 2007, 12:26:40 AM (12 years ago)
Author:
bruno
Message:
  • Improve tape support doc (Tilman Schmidt <tilman_at_imap.cc>)
  • mdadm.conf files added to deplist
  • Fix gentoo issues again (Francesco Talamona ti.liame_at_email.it)
  • Fix bug #187 (Scott Cummings rsc_at_usfamily.net)

(merge -r1579:1590 $SVN_M/branches/2.2.5)

Location:
branches/stable
Files:
1 deleted
9 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi-busybox/distributions/gentoo/mindi-busybox.ebuild

    r1529 r1591  
    1010LICENSE="GPL-2"
    1111SLOT="0"
    12 KEYWORDS="x86 ia64 -*"
     12KEYWORDS="~x86 ~ia64 ~amd64 -*"
    1313DEPEND="virtual/libc"
    1414RDEPEND=">=app-arch/bzip2-0.9
  • branches/stable/mindi/deplist.txt

    r1570 r1591  
    1414#-------------------------------- ESSENTIAL -----------------------------------
    1515fstab raidtab modules.conf conf.modules mondorestore modules.conf.local
     16/etc/mdadm/mdadm.conf /etc/mdadm.conf
    1617afio star ntfsclone parted ms-sys file getfattr setfattr getfacl setfacl
    1718buffer
  • branches/stable/mindi/distributions/gentoo/mindi.ebuild

    r1529 r1591  
    1111LICENSE="GPL-2"
    1212SLOT="0"
    13 KEYWORDS="x86 ia64 -*"
     13KEYWORDS="~x86 ~ia64 ~amd64 -*"
    1414IUSE=""
    1515
  • branches/stable/mindi/rootfs/etc/ld.so.conf

    r1061 r1591  
    33/usr/local/lib
    44/usr/X11R6/lib
     5/lib32
     6/usr/lib32
    57/lib64
    68/usr/lib64
  • branches/stable/mondo-doc/distributions/gentoo/mondo.ebuild

    r761 r1591  
    1313LICENSE="GPL-2"
    1414SLOT="0"
    15 KEYWORDS="-* ~x86"
     15KEYWORDS="~x86 ~ia64 ~amd64 -*"
    1616IUSE=""
    1717
  • branches/stable/mondo-doc/mondorescue-howto.sgml

    r1590 r1591  
    612612your tape streamer with '-d &lt;device&gt;'. You don't usually need
    613613to but it's good to be on the safe side. Some computers call your
    614 tape streamer /dev/osst0, some call it /dev/ftape, ...</para>
     614tape streamer /dev/osst0, some call it /dev/ftape, ...
     615Also, depending on the tape streamer model, a tape should be inserted
     616in the tape drive before starting mondoarchive, otherwise it may not
     617recognize the drive.</para>
    615618</listitem>
    616619</itemizedlist>
     
    728731fopen(), fread(), fwrite() and fclose() to interact with tape
    729732drives. That works for most drives but some drives just don't like
    730 that.</para>
     733that.
     734Also, depending on the tape streamer model, a tape should be inserted
     735in the tape drive before starting mondoarchive, otherwise it may not
     736recognize the drive.</para>
    731737<para>Mondo Rescue has been tested thousands of times on various computers.
    732738It has worked for them.
     
    29012907and defblksize using 'mt', or tweaking Mondo's block size by
    29022908recompiling it with make INTTAPE=4096 or INTTAPE=8192 or something.
    2903 Other than that, you need a priest or a refund.</para>
     2909Other than that, you need a priest or a refund.
     2910Also, depending on the tape streamer model, a tape should be inserted
     2911in the tape drive before starting mondoarchive, otherwise it may not
     2912recognize the drive.</para>
    29042913</answer>
    29052914</qandaentry>
  • branches/stable/mondo/src/common/libmondo-string.c

    r1549 r1591  
    745745        sev = 2;
    746746        mr_asprintf(&reason,
    747                  _("It's in your /home partiton. Therefore, it is important."));
     747                 _("It's in your /home directory. Therefore, it is important."));
    748748    }
    749749    if (!strncmp(filename, "/usr/", 5)) {
  • branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

    r1555 r1591  
    298298    if (res) {
    299299        log_OS_error(command);
     300        log_msg(2, tmp);
    300301    }
    301302    mr_free(command);
     
    503504    long q = 0L;
    504505    char *tmp = NULL;
     506    char *new = NULL;
     507    char *cwd = NULL;
     508
     509    malloc_string(new);
     510    malloc_string(cwd);
    505511
    506512  /**************************************************************************
     
    546552                            ("Warning - differences found during the compare phase"));
    547553    }
    548 
    549     retval += unmount_all_devices(mountlist);
    550554
    551555    if (count_lines_in_file("/tmp/changed.txt") > 0) {
     
    575579
    576580            mr_msg(2, "calling popup_changelist_from_file()");
     581            getcwd(cwd, MAX_STR_LEN - 1);
     582            chdir(bkpinfo->restore_path);
     583            getcwd(new, MAX_STR_LEN - 1);
    577584            popup_changelist_from_file("/tmp/changed.files");
    578585            mr_msg(2, "Returning from popup_changelist_from_file()");
     586            chdir(cwd);
    579587        }
    580588    } else {
     
    583591             ("No significant differences were found. Your backup is perfect."));
    584592    }
     593    retval += unmount_all_devices(mountlist);
     594
    585595    kill_petris();
     596    paranoid_free(new);
     597    paranoid_free(cwd);
    586598    return (retval);
    587599}
  • branches/stable/tools/build2pkg

    r1570 r1591  
    103103        cd ..
    104104    elif [  _"$dtype" = _"ebuild" ]; then
    105         tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
     105        if [ _"$p" = _"mondo" ]; then
     106            eb="mondo-rescue"
     107        else
     108            eb=$p
     109        fi
     110        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$eb-${PVER}.ebuild
    106111        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
    107112            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
     
    109114        fi
    110115
    111         mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
    112         mv $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${PVER}.ebuild
     116        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$eb
     117        mv $p-${PVER}/distributions/${ddir}-$dver/$eb-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$eb-${PVER}.ebuild
    113118        rm -rf $p-${PVER}
    114119
    115         cd ${TOPBUILDDIR}/portage/sys-apps/$p
    116         ebuild $p-${PVER}.ebuild digest
     120        cd ${TOPBUILDDIR}/portage/sys-apps/$eb
     121        ebuild $eb-${PVER}.ebuild digest
    117122        if [ $? != 0 ]; then
    118123            status=-1
    119124        fi
    120         ebuild $p-${PVER}.ebuild package
     125        ebuild $eb-${PVER}.ebuild package
    121126        if [ $? != 0 ]; then
    122127            status=-1
    123128        fi
    124         export pkg="$pkg $p-${PVER}.ebuild"
     129        export pkg="$pkg $eb-${PVER}.ebuild"
    125130    elif [  _"$dtype" = _"deb" ]; then
    126131        cd $TOPBUILDDIR
Note: See TracChangeset for help on using the changeset viewer.