Changeset 687 in MondoRescue for trunk/mondo
- Timestamp:
- Jul 17, 2006, 3:39:42 PM (18 years ago)
- Location:
- trunk/mondo
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/ChangeLog
r672 r687 8 8 - Internationalization (A huge thank to rene-marc dolhen <rmd_at_mecreant.org> who achieved that big task) 9 9 10 2.0. 8-4 (2006-06-10)10 2.0.9 (2006-06-26) 11 11 - 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) 12 19 13 20 2.0.8-3 (2006-06-07) -
trunk/mondo/mondo/common/libmondo-archive.c
r539 r687 1217 1217 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 1218 1218 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", 1220 1220 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", 1222 1222 BLK_START_OF_BACKUP); 1223 1223 } … … 1713 1713 log_to_screen("%s...OK", message_to_screen); 1714 1714 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 ':-('", 1716 1716 1)) { 1717 1717 log_to_screen … … 1981 1981 bool delete_when_done; 1982 1982 bool use_ntfsprog; 1983 /*@ long long ****************************************** */ 1984 long long biggie_fsize; 1983 off_t biggie_fsize; 1985 1984 1986 1985 assert(bkpinfo != NULL); … … 2081 2080 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { 2082 2081 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); 2084 2083 paranoid_free(tmp); 2085 2084 } … … 2259 2258 2260 2259 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", 2262 2261 BLK_START_AFIOBALLS); 2263 2262 #if __FreeBSD__ == 5 … … 2268 2267 res = make_afioballs_and_images_OLD(bkpinfo, mrconf); 2269 2268 #endif 2270 write_header_block_to_stream( 0, "stop-afioballs",2269 write_header_block_to_stream((off_t)0, "stop-afioballs", 2271 2270 BLK_STOP_AFIOBALLS); 2272 2271 } else { … … 2344 2343 res += write_EXAT_files_to_tape(bkpinfo, xattr_fname, acl_fname); 2345 2344 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); 2347 2346 paranoid_free(blah); 2348 2347 } … … 2354 2353 2355 2354 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", 2357 2356 BLK_STOP_BIGGIEFILES); 2358 2357 } … … 2720 2719 char *curr_file, *cf; 2721 2720 /*@ long long ****************************************************** */ 2722 long long length_of_incoming_file =0;2721 off_t length_of_incoming_file = (off_t)0; 2723 2722 t_archtype type; 2724 2723 va_list ap; … … 2755 2754 paranoid_free(curr_file); 2756 2755 /* 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); 2758 2757 } 2759 2758 va_end(ap); … … 3035 3034 3036 3035 /*@ long long ************************************************** */ 3037 long long totalread =0;3038 long long totallength =0;3039 long longlength;3036 off_t totalread = (off_t)0; 3037 off_t totallength = (off_t)0; 3038 off_t length; 3040 3039 3041 3040 /*@ int ******************************************************** */ … … 3080 3079 strcpy (tmp, call_program_and_get_last_line_of_output(command)); 3081 3080 log_it("res of it = %s", tmp); 3082 totallength = atoll(tmp);3081 totallength = (off_t)atoll(tmp); 3083 3082 } else { 3084 3083 file_to_openin = biggie_filename; -
trunk/mondo/mondo/common/libmondo-devices.c
r507 r687 304 304 return 305 305 !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)'"); 307 307 #endif 308 308 } … … 1465 1465 case dvd: 1466 1466 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 } 1471 1473 } 1472 1474 if ((bkpinfo->compression_level = … … 2065 2067 asprintf(&tmp, 2066 2068 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;}'")); 2068 2070 #else 2069 2071 asprintf(&tmp, 2070 2072 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;}'")); 2072 2074 #endif 2073 2075 -
trunk/mondo/mondo/common/libmondo-fifo.c
r507 r687 162 162 paranoid_system("sync"); 163 163 asprintf(&command, 164 "ps wwax | fgrep \"%s\" | fgrep -v grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'",165 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); 166 166 paranoid_free(g_sz_call_to_buffer); 167 167 log_msg(2, "kill_buffer() --- command = %s", command); -
trunk/mondo/mondo/common/libmondo-filelist.c
r672 r687 1300 1300 1301 1301 if (res) { 1302 log_OS_error("Call to mondo -makefilelist failed");1302 log_OS_error("Call to mondo_makefilelist failed"); 1303 1303 mvaddstr_and_log_it(g_currentY++, 74, _("Failed.")); 1304 1304 } else { … … 1378 1378 { 1379 1379 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, 1381 1381 skeleton_filelist, skeleton_filelist); 1382 1382 // log_msg(0, "fsm = %s", find_skeleton_marker); -
trunk/mondo/mondo/common/libmondo-files-EXT.h
r171 r687 16 16 extern int grab_percentage_from_last_line_of_file(char *filename); 17 17 extern char *last_line_of_file(char *filename); 18 extern long longlength_of_file(char *filename);18 extern off_t length_of_file(char *filename); 19 19 extern int make_hole_for_file(char *outfile_fname); 20 20 extern void make_list_of_files_to_ignore(char *ignorefiles_fname, -
trunk/mondo/mondo/common/libmondo-files.c
r672 r687 435 435 if (i < 0) { 436 436 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;}'", 438 438 filename, '%'); 439 439 asprintf(&lastline, … … 513 513 * @return The length of the file, or -1 for error. 514 514 */ 515 long longlength_of_file(char *filename)515 off_t length_of_file(char *filename) 516 516 { 517 517 /*@ pointers *************************************************** */ … … 519 519 520 520 /*@ long long ************************************************* */ 521 long longlength;521 off_t length; 522 522 523 523 fin = fopen(filename, "r"); … … 528 528 } 529 529 fseeko(fin, 0, SEEK_END); 530 length = ftell (fin);530 length = ftello(fin); 531 531 paranoid_fclose(fin); 532 532 return (length); … … 763 763 } 764 764 } else { 765 /* BERLIOS: more than long here ??? */ 765 766 file_len_K = (long) (length_of_file(fname) / 1024); 766 767 } -
trunk/mondo/mondo/common/libmondo-files.h
r171 r687 19 19 int grab_percentage_from_last_line_of_file(char *filename); 20 20 char *last_line_of_file(char *filename); 21 long longlength_of_file(char *filename);21 off_t length_of_file(char *filename); 22 22 int make_hole_for_file(char *outfile_fname); 23 23 void make_list_of_files_to_ignore(char *ignorefiles_fname, -
trunk/mondo/mondo/common/libmondo-fork.c
r507 r687 599 599 fatal_error("Failed to malloc() tmp"); 600 600 } 601 /* BERLIOS : strange ??? 602 sprintf(tmp, "I am here - %llu", ftello(fin)); 603 log_msg(0, tmp); 604 */ 601 605 fread(tmp, 1, 512, fin); 602 606 log_msg(0, "tmp = '%s'", tmp); -
trunk/mondo/mondo/common/libmondo-stream-EXT.h
r146 r687 28 28 #endif 29 29 extern bool should_we_write_to_next_tape(long mediasize, 30 long long30 off_t 31 31 length_of_incoming_file); 32 32 extern int skip_incoming_files_until_we_find_this_one(char … … 38 38 extern int write_file_to_stream_from_file(struct s_bkpinfo *bkpinfo, 39 39 char *infile); 40 extern int write_header_block_to_stream( long longlength_of_incoming_file,40 extern int write_header_block_to_stream(off_t length_of_incoming_file, 41 41 char *filename, int control_char); 42 42 extern void wrong_marker(int should_be, int it_is); -
trunk/mondo/mondo/common/libmondo-stream.c
r507 r687 156 156 log_it("closeout_tape() -- entering"); 157 157 retval += 158 write_header_block_to_stream( 0, "end-of-backup",158 write_header_block_to_stream((off_t)0, "end-of-backup", 159 159 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 */ 161 161 /* write 1MB of crap */ 162 162 for (i = 0; i < 256 * 1024; i++) { … … 166 166 (void) fwrite(blk, 1, 256 * 1024, g_tape_stream); 167 167 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)) { 169 169 start_to_write_to_next_tape(bkpinfo); 170 170 } … … 386 386 BLK_START_EXAT_FILE); 387 387 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); 389 389 // acl 390 390 write_header_block_to_stream(length_of_file(acl_fname), acl_fname, 391 391 BLK_START_EXAT_FILE); 392 392 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); 394 394 write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname, 395 395 BLK_STOP_EXTENDED_ATTRIBUTES); … … 1062 1062 * autodetecting the size. Huh? 1063 1063 */ 1064 1065 /* BERLIOS: Should be reviewed for mediasize being a off_t ??? */ 1064 1066 bool 1065 1067 should_we_write_to_next_tape(long mediasize, 1066 long longlength_of_incoming_file)1068 off_t length_of_incoming_file) 1067 1069 { 1068 1070 /*@ bool's ***************************************************** */ … … 1303 1305 g_tape_posK = 0; 1304 1306 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 */ 1307 1309 return (res); 1308 1310 } … … 1343 1345 } 1344 1346 if (i != last) { 1345 write_header_block_to_stream( 0,1347 write_header_block_to_stream((off_t)0, 1346 1348 "stop-backcatalog-afio-or-slice", 1347 1349 BLK_STOP_AN_AFIO_OR_SLICE); … … 1446 1448 long i; 1447 1449 1448 /*@ long long ************************************************** */ 1449 long long filesize; 1450 off_t filesize; 1450 1451 1451 1452 #ifdef EXTRA_TAPE_CHECKSUMS … … 1521 1522 paranoid_fclose(fin); 1522 1523 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, 1524 1526 BLK_STOP_FILE); 1525 1527 paranoid_free(checksum); … … 1541 1543 */ 1542 1544 int 1543 write_header_block_to_stream( long longlength_of_incoming_file,1545 write_header_block_to_stream(off_t length_of_incoming_file, 1544 1546 char *filename, int control_char) 1545 1547 { … … 1552 1554 int i; 1553 1555 1554 /*@ long long ************************************************** */ 1555 long long olen; 1556 off_t olen; 1556 1557 1557 1558 /*@ end vars *************************************************** */ … … 1575 1576 sprintf(tempblock + 6000 + control_char, "Mondolicious, baby"); 1576 1577 tempblock[7000] = control_char; 1577 memcpy(tempblock + 7001, (char *) &olen, sizeof( long long));1578 memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t)); 1578 1579 strcpy(tempblock + 1000, filename); 1579 1580 g_tape_posK += -
trunk/mondo/mondo/common/libmondo-stream.h
r59 r687 26 26 char *fn); 27 27 bool should_we_write_to_next_tape(long mediasize, 28 long longlength_of_incoming_file);28 off_t length_of_incoming_file); 29 29 int skip_incoming_files_until_we_find_this_one(char 30 30 *the_file_I_was_reading); … … 35 35 int write_file_to_stream_from_file(struct s_bkpinfo *bkpinfo, 36 36 char *infile); 37 int write_header_block_to_stream( long longlength_of_incoming_file,37 int write_header_block_to_stream(off_t length_of_incoming_file, 38 38 char *filename, int control_char); 39 39 void wrong_marker(int should_be, int it_is); -
trunk/mondo/mondo/common/libmondo-tools.c
r672 r687 362 362 assert(bkpinfo != NULL); 363 363 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) * 365 365 1024; 366 366 … … 382 382 383 383 run_program_and_log_output("uname -a", 5); 384 run_program_and_log_output("cat /etc/*-release", 5); 384 385 run_program_and_log_output("cat /etc/*issue*", 5); 385 386 asprintf(&g_tmpfs_mountpt, "%s/tmpfs", bkpinfo->tmpdir); … … 475 476 paranoid_free(mondo_mkisofs_sz); 476 477 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); 480 485 } 481 486 log_msg(2, "call_make_iso (DVD res) is ... %s", … … 894 899 // abort if Windows partition but no ms-sys and parted 895 900 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) 897 902 || 898 903 !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)) { 900 905 log_to_screen(_("I think you have a Windows 9x partition.")); 901 906 retval += whine_if_not_found("parted"); -
trunk/mondo/mondo/common/libmondo-verify.h
r171 r687 34 34 extern int grab_percentage_from_last_line_of_file(char *); 35 35 extern char *last_line_of_file(char *); 36 extern long longlength_of_file(char *);36 extern off_t length_of_file(char *); 37 37 extern void log_file_end_to_screen(char *, char *); 38 38 extern void log_tape_pos(void); -
trunk/mondo/mondo/common/my-stuff.h
r672 r687 147 147 #define NOOF_ERR_LINES 6 ///< The number of lines of log output to keep at the bottom of the screen. 148 148 #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. 150 150 #define MAX_STR_LEN 380 ///< The maximum length of almost all @p char buffers in Mondo. 151 151 #define MAXIMUM_RAID_DEVS 32 ///< The maximum number of RAID devices in the raidlist. … … 383 383 #define ARCH_BUFFER_NUM (ARCH_THREADS*4) // Number of permissible queued afio files 384 384 #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). 386 386 387 387 #define DO_MBR_PLEASE "/tmp/DO-MBR-PLEASE" -
trunk/mondo/mondo/mondoarchive/mondo-cli.c
r649 r687 805 805 && 806 806 !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)) { 808 808 bkpinfo->make_cd_use_lilo = TRUE; 809 809 log_to_screen -
trunk/mondo/mondo/mondorestore/mondo-prep.c
r561 r687 1817 1817 log_msg(0, 1818 1818 "------------------- 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); 1820 1820 if (!run_program_and_log_output(tmp, 5)) { 1821 1821 g_partition_table_locked_up++; -
trunk/mondo/mondo/mondorestore/mondo-restore.c
r618 r687 1980 1980 filelist_name); 1981 1981 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)"); 1983 1983 log_msg(2, 1984 1984 "but it's non-critical. It's cosmetic. Don't worry about it."); … … 1988 1988 if (count_lines_in_file(filelist_name) <= 0 1989 1989 || length_of_file(tarball_fname) <= 0) { 1990 log_msg(3, "length_of_file(%s) = %l d", tarball_fname,1990 log_msg(3, "length_of_file(%s) = %llu", tarball_fname, 1991 1991 length_of_file(tarball_fname)); 1992 1992 sprintf(tmp, "Unable to restore fileset #%ld (CD I/O error)", -
trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c
r561 r687 582 582 } 583 583 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)) { 585 585 log_msg(2, "mount_cdrom() - CD already mounted. Fair enough."); 586 586 paranoid_free(mount_cmd); -
trunk/mondo/mondo/mondorestore/mondoprep.h
r561 r687 39 39 extern int strcmp_inc_numbers(char *, char *); 40 40 extern long count_lines_in_file(char *); 41 extern long longlength_of_file(char *);41 extern off_t length_of_file(char *); 42 42 extern long noof_lines_that_match_wildcard(char *, char *); 43 43 //extern char *slice_fname (long, long, bool, char *); -
trunk/mondo/mondo/mondorestore/mr-externs.h
r561 r687 36 36 extern void initialize_raid_record(struct raid_device_record *); 37 37 extern bool is_this_device_mounted(char *); 38 extern long longlength_of_file(char *);38 extern off_t length_of_file(char *); 39 39 extern char *last_line_of_file(char *); 40 40 extern struct s_node *load_filelist(char *); -
trunk/mondo/mondo/restore-scripts/mondo/make-me-bootable
r588 r687 18 18 19 19 HAVE_ACTIVE="false" 20 for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -v "/dev/fd" | grep -v "none" | grep -v "#"` ; do20 for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -vE "/dev/fd|none|#"` ; do 21 21 mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2` 22 22 format=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f3` -
trunk/mondo/mondo/restore-scripts/mondo/mount-me
r588 r687 14 14 fi 15 15 16 paths=`grep -v " raid " $mountlist | grep -v "lvm lvm"| tr -s ' ' ' ' | cut -d' ' -f2 | sort`16 paths=`grep -vE " raid |lvm lvm" $mountlist | tr -s ' ' ' ' | cut -d' ' -f2 | sort` 17 17 > $mountlist.sorted 18 18 for i in $paths ; do
Note:
See TracChangeset
for help on using the changeset viewer.