- Timestamp:
- May 5, 2006, 11:47:41 AM (18 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mindi/mindi
r518 r524 1390 1390 [ "$c_p" = "none" ] && continue 1391 1391 absolute_partition=`ResolveSoftlink $c_p` 1392 partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" |grep -vx " *#.*" | $AWK '{print $2}' | head -n1`1392 partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1` 1393 1393 1394 1394 # This part tries to retrieve the correct device from a LABEL line in /etc/fstab 1395 1395 # current_partition contains only first column of /etc/fstab 1396 redhat_label=""1397 1396 if [ "`echo "$current_partition" | /bin/grep -f -i "LABEL="`" != "" ] ; then 1398 1397 str_to_find_fmt_with=$current_partition … … 1402 1401 # 1st try : blkid, the good way 1403 1402 if [ -x "/sbin/blkid" ] ; then 1404 actual_dev=`/sbin/blkid | grep "$current_partition" | /bin/cut -d':' -f1` 1405 fi 1403 actual_dev=`/sbin/blkid | /bin/grep "$current_partition" | /bin/cut -d':' -f1` 1404 fi 1405 1406 1406 # 2nd try, which works on a standard partition (ext2/3), but not on swap 1407 if [ $actual_dev=""] ; then1407 if [ -n $actual_dev ] ; then 1408 1408 actual_dev=`/bin/mount -l | /bin/grep " [$redhat_label]" | /bin/cut -d' ' -f1` 1409 1409 fi 1410 1410 1411 # 3rd try, with vol_id (which works with swap) 1411 if [ $actual_dev=""-a -x "/sbin/vol_id" ] ; then1412 if [ -n $actual_dev -a -x "/sbin/vol_id" ] ; then 1412 1413 list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' ` 1413 1414 for dev_swap in $list_swaps ; do 1414 dev_exists=`/sbin/vol_id $dev_swap | /bin/grep -f"$redhat_label"`1415 dev_exists=`/sbin/vol_id $dev_swap | /bin/grep "$redhat_label"` 1415 1416 if [ -n "$dev_exists" ] ; then 1416 1417 actual_dev=$dev_swap … … 1419 1420 done 1420 1421 fi 1422 1421 1423 # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5 1422 if [ $actual_dev="" -a "`echo "$current_partition" | /bin/grep -f -i "LABEL=SWAP"`" != ""] ; then 1423 actual_dev="/dev/`echo "$redhat_label" | /bin/cut -d '-' -f2`" 1424 fi 1424 if [ -n $actual_dev -a "`echo "$current_partition" | /bin/grep -i "LABEL=SWAP"`" != ""] ; then 1425 try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`" 1426 present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`" 1427 if [ -n "$present_dev" ] ; then 1428 actual_dev="/dev/$try_dev" 1429 fi 1430 fi 1431 1425 1432 # Check if one of all those tries has known success 1426 if [ $actual_dev != ""] ; then1433 if [ ! -n $actual_dev ] ; then 1427 1434 current_partition=$actual_dev 1428 1435 else 1429 Die "Your system uses a labelled swap partition, but you lack the tool to su 1430 pport it.\nPlease replace swap labels with their correct devices in /etc/fstab\n" 1436 Die "Your system uses a labelled swap partition, but you lack the tool to support it.\nPlease replace swap labels with their correct devices in /etc/fstab\n" 1431 1437 fi 1432 1438 else -
trunk/mondo/mondo/mondoarchive/mondo-cli.c
r507 r524 327 327 strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths), 328 328 flag_val['I'], 329 MAX_STR_LEN - strlen(bkpinfo->include_paths));329 4*MAX_STR_LEN - strlen(bkpinfo->include_paths)); 330 330 log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths); 331 331 if (bkpinfo->include_paths[0] == '-') { … … 561 561 strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths), 562 562 flag_val['E'], 563 MAX_STR_LEN - strlen(bkpinfo->exclude_paths));563 4*MAX_STR_LEN - strlen(bkpinfo->exclude_paths)); 564 564 } 565 565 if (flag_set['e']) { -
trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c
r507 r524 254 254 } 255 255 mvaddstr_and_log_it(g_currentY, 0, 256 "Comparing large files ");256 _("Comparing large files ")); 257 257 open_progress_form(_("Comparing large files"), 258 258 _("I am now comparing the large files"), … … 270 270 return (0); 271 271 if (retval) { 272 mvaddstr_and_log_it(g_currentY++, 74, "Errors.");273 } else { 274 mvaddstr_and_log_it(g_currentY++, 74, "Done.");272 mvaddstr_and_log_it(g_currentY++, 74, _("Errors.")); 273 } else { 274 mvaddstr_and_log_it(g_currentY++, 74, _("Done.")); 275 275 } 276 276 return (retval); … … 430 430 431 431 assert(bkpinfo != NULL); 432 mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");432 mvaddstr_and_log_it(g_currentY, 0, _("Comparing archives")); 433 433 read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp); 434 434 … … 490 490 close_progress_form(); 491 491 if (retval) { 492 mvaddstr_and_log_it(g_currentY++, 74, "Errors.");493 } else { 494 mvaddstr_and_log_it(g_currentY++, 74, "Done.");492 mvaddstr_and_log_it(g_currentY++, 74, _("Errors.")); 493 } else { 494 mvaddstr_and_log_it(g_currentY++, 74, _("Done.")); 495 495 } 496 496 paranoid_free(tarball_fname); … … 609 609 read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo); 610 610 g_current_media_number = 1; 611 mvaddstr_and_log_it(1, 30, "Comparing Automatically");611 mvaddstr_and_log_it(1, 30, _("Comparing Automatically")); 612 612 iamhere("Pre-MAD"); 613 613 retval = mount_all_devices(mountlist, FALSE); … … 628 628 mvaddstr_and_log_it(g_currentY++, 629 629 0, 630 "Warning - differences found during the compare phase");630 _("Warning - differences found during the compare phase")); 631 631 } 632 632 … … 635 635 if (count_lines_in_file("/tmp/changed.txt") > 0) { 636 636 mvaddstr_and_log_it(g_currentY++, 0, 637 "Differences found while files were being compared.");637 _("Differences found while files were being compared.")); 638 638 streamline_changes_file("/tmp/changed.files", "/tmp/changed.txt"); 639 639 if (count_lines_in_file("/tmp/changed.files") <= 0) { 640 640 mvaddstr_and_log_it(g_currentY++, 0, 641 "...but they were logfiles and temporary files. Your archives are fine.");641 _("...but they were logfiles and temporary files. Your archives are fine.")); 642 642 log_to_screen 643 643 (_("The differences were logfiles and temporary files. Your archives are fine.")); … … 696 696 run_program_and_log_output(command, FALSE); 697 697 mvaddstr_and_log_it(g_currentY, 698 0, "Verifying archives against filesystem");698 0, _("Verifying archives against filesystem")); 699 699 700 700 if (bkpinfo->disaster_recovery … … 719 719 } 720 720 721 mvaddstr_and_log_it(g_currentY++, 74, "Done.");721 mvaddstr_and_log_it(g_currentY++, 74, _("Done.")); 722 722 paranoid_free(dir); 723 723 paranoid_free(command); … … 756 756 run_program_and_log_output(command, FALSE); 757 757 mvaddstr_and_log_it(g_currentY, 758 0, "Verifying archives against filesystem");758 0, _("Verifying archives against filesystem")); 759 759 res = verify_tape_backups(bkpinfo); 760 760 chdir(dir); 761 761 if (res) { 762 mvaddstr_and_log_it(g_currentY++, 74, "Failed.");763 } else { 764 mvaddstr_and_log_it(g_currentY++, 74, "Done.");762 mvaddstr_and_log_it(g_currentY++, 74, _("Failed.")); 763 } else { 764 mvaddstr_and_log_it(g_currentY++, 74, _("Done.")); 765 765 } 766 766 paranoid_free(dir);
Note:
See TracChangeset
for help on using the changeset viewer.