Changeset 687 for trunk/mondo


Ignore:
Timestamp:
Jul 17, 2006, 3:39:42 PM (14 years ago)
Author:
bcornec
Message:

merge -r671:686 $SVN_M/branches/stable

Location:
trunk/mondo
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/ChangeLog

    r672 r687  
    88- Internationalization (A huge thank to rene-marc dolhen <rmd_at_mecreant.org> who achieved that big task)
    99
    10 2.0.8-4 (2006-06-10)
     102.0.9 (2006-06-26)
    1111- nfsmount option added to allow redeployment from another NFS server (Bruno Cornec)
     12- Replaced all occurrences of egrep with 'grep -E' and of fgrep with 'grep -F' (Andree Leidenfrost)
     13- Optimize grep usage - fixes Debian bug #222052 (Andree Leidenfrost)
     14- Avoid false alerts about growisofs not running under sudo (Andree Leidenfrost)
     15- Increase PPCFG_RAMDISK_SIZE to 350 MB (Thomas Börkel/Bruno Cornec)
     16- Removed useless mondo-makefilelist (Andree Leidenfrost)
     17- Fix a segmentation fault in parse_mdstat() (Andree Leidenfrost)
     18- Fix gcc 4.1.2 warnings (Andree Leidenfrost)
    1219
    13202.0.8-3 (2006-06-07)
  • trunk/mondo/mondo/common/libmondo-archive.c

    r539 r687  
    12171217    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    12181218    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    1219         write_header_block_to_stream(0, "start-of-tape",
     1219        write_header_block_to_stream((off_t)0, "start-of-tape",
    12201220                                     BLK_START_OF_TAPE);
    1221         write_header_block_to_stream(0, "start-of-backup",
     1221        write_header_block_to_stream((off_t)0, "start-of-backup",
    12221222                                     BLK_START_OF_BACKUP);
    12231223    }
     
    17131713                log_to_screen("%s...OK", message_to_screen);
    17141714                if (!run_program_and_log_output
    1715                     ("tail -n10 /var/log/mondo-archive.log | fgrep ':-('",
     1715                    ("tail -n10 /var/log/mondo-archive.log | grep -F ':-('",
    17161716                     1)) {
    17171717                    log_to_screen
     
    19811981    bool delete_when_done;
    19821982    bool use_ntfsprog;
    1983     /*@ long long ****************************************** */
    1984     long long biggie_fsize;
     1983    off_t biggie_fsize;
    19851984
    19861985    assert(bkpinfo != NULL);
     
    20812080            if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    20822081                tmp = calc_checksum_of_file(bigfile_fname);
    2083                 write_header_block_to_stream(0, tmp, BLK_STOP_A_BIGGIE);
     2082                write_header_block_to_stream((off_t)0, tmp, BLK_STOP_A_BIGGIE);
    20842083                paranoid_free(tmp);
    20852084            }
     
    22592258
    22602259    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    2261         write_header_block_to_stream(0, "start-of-afioballs",
     2260        write_header_block_to_stream((off_t)0, "start-of-afioballs",
    22622261                                     BLK_START_AFIOBALLS);
    22632262#if __FreeBSD__ == 5
     
    22682267        res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
    22692268#endif
    2270         write_header_block_to_stream(0, "stop-afioballs",
     2269        write_header_block_to_stream((off_t)0, "stop-afioballs",
    22712270                                     BLK_STOP_AFIOBALLS);
    22722271    } else {
     
    23442343        res += write_EXAT_files_to_tape(bkpinfo, xattr_fname, acl_fname);
    23452344        asprintf(&blah, "%ld", count_lines_in_file(biggielist));
    2346         write_header_block_to_stream(0, blah, BLK_START_BIGGIEFILES);
     2345        write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
    23472346        paranoid_free(blah);
    23482347    }
     
    23542353
    23552354    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    2356         write_header_block_to_stream(0, "end-of-biggiefiles",
     2355        write_header_block_to_stream((off_t)0, "end-of-biggiefiles",
    23572356                                     BLK_STOP_BIGGIEFILES);
    23582357    }
     
    27202719    char *curr_file, *cf;
    27212720    /*@ long long ****************************************************** */
    2722     long long length_of_incoming_file = 0;
     2721    off_t length_of_incoming_file = (off_t)0;
    27232722    t_archtype type;
    27242723    va_list ap;
     
    27552754        paranoid_free(curr_file);
    27562755        /* write closing header */
    2757         write_header_block_to_stream(0, "finished-writing-file", stop_chr);
     2756        write_header_block_to_stream((off_t)0, "finished-writing-file", stop_chr);
    27582757    }
    27592758    va_end(ap);
     
    30353034
    30363035    /*@ long long ************************************************** */
    3037     long long totalread = 0;
    3038     long long totallength = 0;
    3039     long long length;
     3036    off_t totalread = (off_t)0;
     3037    off_t totallength = (off_t)0;
     3038    off_t length;
    30403039
    30413040    /*@ int ******************************************************** */
     
    30803079        strcpy (tmp, call_program_and_get_last_line_of_output(command));
    30813080        log_it("res of it = %s", tmp);
    3082         totallength = atoll(tmp);
     3081        totallength = (off_t)atoll(tmp);
    30833082    } else {
    30843083        file_to_openin = biggie_filename;
  • trunk/mondo/mondo/common/libmondo-devices.c

    r507 r687  
    304304    return
    305305        !system
    306         ("parted2fdisk -l 2>/dev/null | grep '^/dev/' | egrep -qv '(MS|DOS|FAT|NTFS)'");
     306        ("parted2fdisk -l 2>/dev/null | grep '^/dev/' | grep -Eqv '(MS|DOS|FAT|NTFS)'");
    307307#endif
    308308}
     
    14651465    case dvd:
    14661466        if (archiving_to_media) {
    1467             if (ask_me_yes_or_no
    1468                 (_("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")))
    1469             {
    1470                 bkpinfo->manual_cd_tray = TRUE;
     1467            if (bkpinfo->backup_media_type != dvd) {
     1468                if (ask_me_yes_or_no
     1469                    (_("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")))
     1470                {
     1471                    bkpinfo->manual_cd_tray = TRUE;
     1472                }
    14711473            }
    14721474            if ((bkpinfo->compression_level =
     
    20652067    asprintf(&tmp,
    20662068           call_program_and_get_last_line_of_output
    2067            ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
     2069           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
    20682070#else
    20692071    asprintf(&tmp,
    20702072           call_program_and_get_last_line_of_output
    2071            ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | grep -v /dev/shm | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
     2073           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
    20722074#endif
    20732075
  • trunk/mondo/mondo/common/libmondo-fifo.c

    r507 r687  
    162162    paranoid_system("sync");
    163163    asprintf(&command,
    164              "ps wwax | fgrep \"%s\" | fgrep -v grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'",
    165              g_sz_call_to_buffer);
     164            "ps wwax | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'",
     165            g_sz_call_to_buffer);
    166166    paranoid_free(g_sz_call_to_buffer);
    167167    log_msg(2, "kill_buffer() --- command = %s", command);
  • trunk/mondo/mondo/common/libmondo-filelist.c

    r672 r687  
    13001300
    13011301    if (res) {
    1302         log_OS_error("Call to mondo-makefilelist failed");
     1302        log_OS_error("Call to mondo_makefilelist failed");
    13031303        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
    13041304    } else {
     
    13781378    {
    13791379        sprintf(find_skeleton_marker,
    1380                 "fgrep -v \"%s\" %s > %s.new 2> /dev/null", dir,
     1380                "grep -Fv \"%s\" %s > %s.new 2> /dev/null", dir,
    13811381                skeleton_filelist, skeleton_filelist);
    13821382//    log_msg(0, "fsm = %s", find_skeleton_marker);
  • trunk/mondo/mondo/common/libmondo-files-EXT.h

    r171 r687  
    1616extern int grab_percentage_from_last_line_of_file(char *filename);
    1717extern char *last_line_of_file(char *filename);
    18 extern long long length_of_file(char *filename);
     18extern off_t length_of_file(char *filename);
    1919extern int make_hole_for_file(char *outfile_fname);
    2020extern void make_list_of_files_to_ignore(char *ignorefiles_fname,
  • trunk/mondo/mondo/common/libmondo-files.c

    r672 r687  
    435435    if (i < 0) {
    436436        asprintf(&command,
    437                 "tail -n3 %s | fgrep -i \"%c\" | tail -n1 | awk '{print $0;}'",
     437                "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'",
    438438                filename, '%');
    439439        asprintf(&lastline,
     
    513513 * @return The length of the file, or -1 for error.
    514514 */
    515 long long length_of_file(char *filename)
     515off_t length_of_file(char *filename)
    516516{
    517517    /*@ pointers *************************************************** */
     
    519519
    520520    /*@ long long ************************************************* */
    521     long long length;
     521    off_t length;
    522522
    523523    fin = fopen(filename, "r");
     
    528528    }
    529529    fseeko(fin, 0, SEEK_END);
    530     length = ftell(fin);
     530    length = ftello(fin);
    531531    paranoid_fclose(fin);
    532532    return (length);
     
    763763                }
    764764            } else {
     765                /* BERLIOS: more than long here ??? */
    765766                file_len_K = (long) (length_of_file(fname) / 1024);
    766767            }
  • trunk/mondo/mondo/common/libmondo-files.h

    r171 r687  
    1919int grab_percentage_from_last_line_of_file(char *filename);
    2020char *last_line_of_file(char *filename);
    21 long long length_of_file(char *filename);
     21off_t length_of_file(char *filename);
    2222int make_hole_for_file(char *outfile_fname);
    2323void make_list_of_files_to_ignore(char *ignorefiles_fname,
  • trunk/mondo/mondo/common/libmondo-fork.c

    r507 r687  
    599599                    fatal_error("Failed to malloc() tmp");
    600600                }
     601                /* BERLIOS : strange ???
     602                sprintf(tmp, "I am here - %llu", ftello(fin));
     603      log_msg(0, tmp);
     604*/
    601605                fread(tmp, 1, 512, fin);
    602606                log_msg(0, "tmp = '%s'", tmp);
  • trunk/mondo/mondo/common/libmondo-stream-EXT.h

    r146 r687  
    2828#endif
    2929extern bool should_we_write_to_next_tape(long mediasize,
    30                                          long long
     30                                         off_t
    3131                                         length_of_incoming_file);
    3232extern int skip_incoming_files_until_we_find_this_one(char
     
    3838extern int write_file_to_stream_from_file(struct s_bkpinfo *bkpinfo,
    3939                                          char *infile);
    40 extern int write_header_block_to_stream(long long length_of_incoming_file,
     40extern int write_header_block_to_stream(off_t length_of_incoming_file,
    4141                                        char *filename, int control_char);
    4242extern void wrong_marker(int should_be, int it_is);
  • trunk/mondo/mondo/common/libmondo-stream.c

    r507 r687  
    156156    log_it("closeout_tape() -- entering");
    157157    retval +=
    158         write_header_block_to_stream(0, "end-of-backup",
     158        write_header_block_to_stream((off_t)0, "end-of-backup",
    159159                                     BLK_END_OF_BACKUP);
    160     retval += write_header_block_to_stream(0, "end-of-tape", BLK_END_OF_TAPE);  /* just in case */
     160    retval += write_header_block_to_stream((off_t)0, "end-of-tape", BLK_END_OF_TAPE);   /* just in case */
    161161    /* write 1MB of crap */
    162162    for (i = 0; i < 256 * 1024; i++) {
     
    166166        (void) fwrite(blk, 1, 256 * 1024, g_tape_stream);
    167167        if (should_we_write_to_next_tape
    168             (bkpinfo->media_size[g_current_media_number], 256 * 1024)) {
     168            (bkpinfo->media_size[g_current_media_number], (off_t)256 * 1024)) {
    169169            start_to_write_to_next_tape(bkpinfo);
    170170        }
     
    386386                                 BLK_START_EXAT_FILE);
    387387    write_file_to_stream_from_file(bkpinfo, xattr_fname);
    388     write_header_block_to_stream(-1, xattr_fname, BLK_STOP_EXAT_FILE);
     388    write_header_block_to_stream((off_t)-1, xattr_fname, BLK_STOP_EXAT_FILE);
    389389// acl
    390390    write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
    391391                                 BLK_START_EXAT_FILE);
    392392    write_file_to_stream_from_file(bkpinfo, acl_fname);
    393     write_header_block_to_stream(-1, acl_fname, BLK_STOP_EXAT_FILE);
     393    write_header_block_to_stream((off_t)-1, acl_fname, BLK_STOP_EXAT_FILE);
    394394    write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
    395395                                 BLK_STOP_EXTENDED_ATTRIBUTES);
     
    10621062 * autodetecting the size. Huh?
    10631063 */
     1064
     1065/* BERLIOS: Should be reviewed for mediasize being a off_t ??? */
    10641066bool
    10651067should_we_write_to_next_tape(long mediasize,
    1066                              long long length_of_incoming_file)
     1068                             off_t length_of_incoming_file)
    10671069{
    10681070    /*@ bool's ***************************************************** */
     
    13031305    g_tape_posK = 0;
    13041306    g_sigpipe = FALSE;
    1305     res += write_header_block_to_stream(0, "start-of-tape", BLK_START_OF_TAPE); /* just in case */
    1306     res += write_header_block_to_stream(0, "start-of-backup", BLK_START_OF_BACKUP); /* just in case */
     1307    res += write_header_block_to_stream((off_t)0, "start-of-tape", BLK_START_OF_TAPE);  /* just in case */
     1308    res += write_header_block_to_stream((off_t)0, "start-of-backup", BLK_START_OF_BACKUP);  /* just in case */
    13071309    return (res);
    13081310}
     
    13431345            }
    13441346            if (i != last) {
    1345                 write_header_block_to_stream(0,
     1347                write_header_block_to_stream((off_t)0,
    13461348                                             "stop-backcatalog-afio-or-slice",
    13471349                                             BLK_STOP_AN_AFIO_OR_SLICE);
     
    14461448    long i;
    14471449
    1448     /*@ long long ************************************************** */
    1449     long long filesize;
     1450    off_t filesize;
    14501451
    14511452#ifdef EXTRA_TAPE_CHECKSUMS
     
    15211522    paranoid_fclose(fin);
    15221523    asprintf(&checksum, "%04x%04x", crc16, crctt);
    1523     write_header_block_to_stream(g_current_media_number, checksum,
     1524    /* BERLIOS: what does it do ??? */
     1525    write_header_block_to_stream((off_t)g_current_media_number, checksum,
    15241526                                 BLK_STOP_FILE);
    15251527    paranoid_free(checksum);
     
    15411543 */
    15421544int
    1543 write_header_block_to_stream(long long length_of_incoming_file,
     1545write_header_block_to_stream(off_t length_of_incoming_file,
    15441546                             char *filename, int control_char)
    15451547{
     
    15521554    int i;
    15531555
    1554     /*@ long long ************************************************** */
    1555     long long olen;
     1556    off_t olen;
    15561557
    15571558    /*@ end vars *************************************************** */
     
    15751576    sprintf(tempblock + 6000 + control_char, "Mondolicious, baby");
    15761577    tempblock[7000] = control_char;
    1577     memcpy(tempblock + 7001, (char *) &olen, sizeof(long long));
     1578    memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));
    15781579    strcpy(tempblock + 1000, filename);
    15791580    g_tape_posK +=
  • trunk/mondo/mondo/common/libmondo-stream.h

    r59 r687  
    2626                             char *fn);
    2727bool should_we_write_to_next_tape(long mediasize,
    28                                   long long length_of_incoming_file);
     28                                  off_t length_of_incoming_file);
    2929int skip_incoming_files_until_we_find_this_one(char
    3030                                               *the_file_I_was_reading);
     
    3535int write_file_to_stream_from_file(struct s_bkpinfo *bkpinfo,
    3636                                   char *infile);
    37 int write_header_block_to_stream(long long length_of_incoming_file,
     37int write_header_block_to_stream(off_t length_of_incoming_file,
    3838                                 char *filename, int control_char);
    3939void wrong_marker(int should_be, int it_is);
  • trunk/mondo/mondo/common/libmondo-tools.c

    r672 r687  
    362362    assert(bkpinfo != NULL);
    363363    bkpinfo->optimal_set_size =
    364         (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 4 : 8) *
     364        (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) *
    365365        1024;
    366366
     
    382382
    383383    run_program_and_log_output("uname -a", 5);
     384    run_program_and_log_output("cat /etc/*-release", 5);
    384385    run_program_and_log_output("cat /etc/*issue*", 5);
    385386    asprintf(&g_tmpfs_mountpt, "%s/tmpfs", bkpinfo->tmpdir);
     
    475476        paranoid_free(mondo_mkisofs_sz);
    476477
    477         if (getenv("SUDO_COMMAND")) {
    478             fatal_error
    479                 ("Can't write DVDs as sudo because growisofs doesn't support this - please see the growisofs manpage for details.");
     478        if (getenv ("SUDO_COMMAND")) {
     479            asprintf(&command, "strings `which growisofs` | grep -c SUDO_COMMAND");
     480            if (!strcmp(call_program_and_get_last_line_of_output(command), "1")) {
     481                popup_and_OK("Fatal Error: Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
     482                fatal_error("Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
     483            }       
     484            paranoid_free(command);
    480485        }
    481486        log_msg(2, "call_make_iso (DVD res) is ... %s",
     
    894899    // abort if Windows partition but no ms-sys and parted
    895900    if (!run_program_and_log_output
    896         ("mount | grep -w vfat | grep -v /dev/fd | grep -v nexdisk", 0)
     901        ("mount | grep -w vfat | grep -vE \"/dev/fd|nexdisk\"", 0)
    897902        ||
    898903        !run_program_and_log_output
    899         ("mount | grep -w dos | grep -v /dev/fd | grep -v nexdisk", 0)) {
     904        ("mount | grep -w dos | grep -vE \"/dev/fd|nexdisk\"", 0)) {
    900905        log_to_screen(_("I think you have a Windows 9x partition."));
    901906        retval += whine_if_not_found("parted");
  • trunk/mondo/mondo/common/libmondo-verify.h

    r171 r687  
    3434extern int grab_percentage_from_last_line_of_file(char *);
    3535extern char *last_line_of_file(char *);
    36 extern long long length_of_file(char *);
     36extern off_t length_of_file(char *);
    3737extern void log_file_end_to_screen(char *, char *);
    3838extern void log_tape_pos(void);
  • trunk/mondo/mondo/common/my-stuff.h

    r672 r687  
    147147#define NOOF_ERR_LINES 6        ///< The number of lines of log output to keep at the bottom of the screen.
    148148#define ARBITRARY_MAXIMUM 2000  ///< The maximum number of items showing at once in the mountlist or filelist editor.
    149 #define MAX_TAPECATALOG_ENTRIES 4096    ///< The maximum number of entries in the tape catalog.
     149#define MAX_TAPECATALOG_ENTRIES 8192    ///< The maximum number of entries in the tape catalog.
    150150#define MAX_STR_LEN 380         ///< The maximum length of almost all @p char buffers in Mondo.
    151151#define MAXIMUM_RAID_DEVS 32    ///< The maximum number of RAID devices in the raidlist.
     
    383383#define ARCH_BUFFER_NUM (ARCH_THREADS*4)    // Number of permissible queued afio files
    384384#define FORTY_SPACES "                                         "    ///< 40 spaces.
    385 #define PPCFG_RAMDISK_SIZE 250  ///< Size of the tmpfs, in megabytes, to attempt to mount (to speed up Mondo).
     385#define PPCFG_RAMDISK_SIZE 350  ///< Size of the tmpfs, in megabytes, to attempt to mount (to speed up Mondo).
    386386
    387387#define DO_MBR_PLEASE "/tmp/DO-MBR-PLEASE"
  • trunk/mondo/mondo/mondoarchive/mondo-cli.c

    r649 r687  
    805805        &&
    806806        !run_program_and_log_output
    807         ("egrep -i suse /etc/issue.net | egrep '9.0' | grep 64", TRUE)) {
     807        ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", TRUE)) {
    808808        bkpinfo->make_cd_use_lilo = TRUE;
    809809        log_to_screen
  • trunk/mondo/mondo/mondorestore/mondo-prep.c

    r561 r687  
    18171817        log_msg(0,
    18181818                "------------------- end of fdisk.log... word! ------------------");
    1819         sprintf(tmp, "tail -n6 %s | fgrep \"16: \"", FDISK_LOG);
     1819        sprintf(tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
    18201820        if (!run_program_and_log_output(tmp, 5)) {
    18211821            g_partition_table_locked_up++;
  • trunk/mondo/mondo/mondorestore/mondo-restore.c

    r618 r687  
    19801980                filelist_name);
    19811981        log_msg(2,
    1982                 "This is a bit silly (ask dev-team to fix mondo-makefilelist, please)");
     1982                "This is a bit silly (ask dev-team to fix mondo_makefilelist, please)");
    19831983        log_msg(2,
    19841984                "but it's non-critical. It's cosmetic. Don't worry about it.");
     
    19881988    if (count_lines_in_file(filelist_name) <= 0
    19891989        || length_of_file(tarball_fname) <= 0) {
    1990         log_msg(3, "length_of_file(%s) = %ld", tarball_fname,
     1990        log_msg(3, "length_of_file(%s) = %llu", tarball_fname,
    19911991                length_of_file(tarball_fname));
    19921992        sprintf(tmp, "Unable to restore fileset #%ld (CD I/O error)",
  • trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r561 r687  
    582582    }
    583583
    584     if (!run_program_and_log_output("mount | fgrep " MNT_CDROM, FALSE)) {
     584    if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
    585585        log_msg(2, "mount_cdrom() - CD already mounted. Fair enough.");
    586586        paranoid_free(mount_cmd);
  • trunk/mondo/mondo/mondorestore/mondoprep.h

    r561 r687  
    3939extern int strcmp_inc_numbers(char *, char *);
    4040extern long count_lines_in_file(char *);
    41 extern long long length_of_file(char *);
     41extern off_t length_of_file(char *);
    4242extern long noof_lines_that_match_wildcard(char *, char *);
    4343//extern char *slice_fname (long, long, bool, char *);
  • trunk/mondo/mondo/mondorestore/mr-externs.h

    r561 r687  
    3636extern void initialize_raid_record(struct raid_device_record *);
    3737extern bool is_this_device_mounted(char *);
    38 extern long long length_of_file(char *);
     38extern off_t length_of_file(char *);
    3939extern char *last_line_of_file(char *);
    4040extern struct s_node *load_filelist(char *);
  • trunk/mondo/mondo/restore-scripts/mondo/make-me-bootable

    r588 r687  
    1818
    1919HAVE_ACTIVE="false"
    20 for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -v "/dev/fd" | grep -v "none" | grep -v "#"` ; do
     20for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -vE "/dev/fd|none|#"` ; do
    2121    mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2`
    2222    format=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f3`
  • trunk/mondo/mondo/restore-scripts/mondo/mount-me

    r588 r687  
    1414fi
    1515
    16 paths=`grep -v " raid " $mountlist | grep -v "lvm lvm" | tr -s ' ' ' ' | cut -d' ' -f2 | sort`
     16paths=`grep -vE " raid |lvm lvm" $mountlist | tr -s ' ' ' ' | cut -d' ' -f2 | sort`
    1717> $mountlist.sorted
    1818for i in $paths ; do
Note: See TracChangeset for help on using the changeset viewer.