Changeset 197 for trunk/mondo


Ignore:
Timestamp:
Dec 14, 2005, 12:12:15 AM (14 years ago)
Author:
bcornec
Message:

merge -r193:196 $SVN_M/branches/2.05

Location:
trunk/mondo
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/ChangeLog

    r173 r197  
    2222- Quadrupled ARBITRARY_MAXIMUM from 500 to 2000 for mondorestore's filebrowser
    2323  (Andree Leidenfrost)
     24- remove the renice of mondoarchive (Hugo Rabson)
     25- relocate what was under /usr/share to /usr/lib (FHS compliance)
     26  (Bruno Cornec/Andree Leidenfrost)
     27- manage non ambiguous delivery under /usr (packages) or /usr/local (tar ball)
     28  (Bruno Cornec)
     29- disable x11 build by default (Bruno Cornec)
     30- remove sbminst (Bruno Cornec/Andree Leidenfrost)
     31- use parted2fdisk everywhere (Bruno Cornec)
    2432
    2533v2.05 (2005-11-19)
  • trunk/mondo/mondo/common/libmondo-devices.c

    r171 r197  
    22642264    assert(which_device != NULL);
    22652265    asprintf(&list_drives_cmd,
    2266             // "parted2fdisk
    2267             "fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s",
     2266            "parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s",
    22682267            where_is_root_mounted());
    22692268    log_it("list_drives_cmd = %s", list_drives_cmd);
     
    24192418
    24202419    log_msg(0, "Looking for partition table format type");
    2421 // BERLIOS: Do that temporarily: we need to put back parted2fdisk everywhere
    2422 #ifdef __IA64__
    2423     struct stat buf;
    2424 
    2425     asprintf(&fdisk, "/usr/local/bin/fdisk");
    2426     if (stat(fdisk, &buf) != 0) {
    2427         paranoid_free(fdisk);
    2428 #endif
    2429         asprintf(&fdisk, "/sbin/fdisk");
    2430 #ifdef __IA64__
    2431     }
    2432 #endif
     2420    asprintf(&fdisk, "/sbin/parted2fdisk");
    24332421    log_msg(1, "Using %s", fdisk);
    24342422    asprintf(&command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
  • trunk/mondo/mondo/common/libmondo-files.c

    r194 r197  
    10381038    char *nfs_client_ipaddr;
    10391039    char *nfs_client_netmask;
     1040    char *nfs_client_broadcast;;
    10401041    char *nfs_client_defgw;
    10411042    char *nfs_server_ipaddr;
     
    10791080
    10801081    asprintf(&command,
     1082            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
     1083    strcpy(nfs_client_broadcast,
     1084           call_program_and_get_last_line_of_output(command));
     1085    sprintf(command,
    10811086            "route -n | grep '^0.0.0.0' | awk '{printf $2}'");
    10821087    asprintf(&nfs_client_defgw,
     
    11041109    }
    11051110    fprintf(fout, "ifconfig lo 127.0.0.1  # config loopback\n");
    1106     fprintf(fout, "ifconfig %s %s netmask %s    # config client\n", nfs_dev,
    1107             nfs_client_ipaddr, nfs_client_netmask);
     1111    fprintf(fout, "ifconfig %s %s netmask %s broadcast %s   # config client\n", nfs_dev,
     1112            nfs_client_ipaddr, nfs_client_netmask, nfs_client_broadcast);
    11081113    fprintf(fout, "route add default gw %s  # default route\n", nfs_client_defgw);
    11091114    fprintf(fout, "ping -c 1 %s # ping server\n", nfs_server_ipaddr);
     
    11411146    write_one_liner_data_file(tmp, nfs_client_defgw);
    11421147    paranoid_free(nfs_client_defgw);
     1148    paranoid_free(tmp);
     1149
     1150    asprintf(&tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
     1151    write_one_liner_data_file(tmp, nfs_client_broadcast);
     1152    paranoid_free(nfs_client_broadcast);
    11431153    paranoid_free(tmp);
    11441154
  • trunk/mondo/mondo/common/libmondo-tools.c

    r183 r197  
    993993    }
    994994
    995     if (!run_program_and_log_output("fdisk -l | grep -i raid", 1)
     995    if (!run_program_and_log_output("parted2fdisk -l | grep -i raid", 1)
    996996        && !does_file_exist("/etc/raidtab")) {
    997997        log_to_screen
  • trunk/mondo/mondo/mondoarchive/main.c

    r171 r197  
    188188    register_pid(g_main_pid, "mondo");
    189189    set_signals(TRUE);          // catch SIGTERM, etc.
    190     nice(10);
    191190    run_program_and_log_output("date", 1);
    192191    run_program_and_log_output("dmesg -n1", TRUE);
  • trunk/mondo/mondo/mondorestore/mondo-prep.c

    r146 r197  
    15251525#else
    15261526    make_hole_for_file(FDISK_LOG);
    1527 #ifdef __IA64__
    1528     sprintf(tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG,
    1529             FDISK_LOG);
    1530 #else
    1531     sprintf(tmp, "fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
    1532 #endif
     1527    sprintf(tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
    15331528    pout_to_fdisk = popen(tmp, "w");
    15341529    if (!pout_to_fdisk) {
    1535         log_to_screen("Cannot call fdisk to configure %s", drivename);
     1530        log_to_screen("Cannot call parted2fdisk to configure %s", drivename);
    15361531        paranoid_free(device_str);
    15371532        paranoid_free(format);
  • trunk/mondo/mondo/restore-scripts/mondo/grub-MR

    r140 r197  
    166166    line=`cat /proc/mdstat | grep $base | head -n1`
    167167    echo "mbrpart was $mbrpart"
    168     mbrpart=`fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' \
     168    mbrpart=`parted2fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' \
    169169| cut -d' ' -f2`
    170170    echo "mbrpart is $mbrpart"
  • trunk/mondo/mondo/restore-scripts/mondo/make-me-bootable

    r30 r197  
    3131            boot_drv=$drive
    3232            boot_part=$partno
    33 #       if [ "$mountpt" = "/" ] || [ "$mountpt" = "/boot" ] || [ "$format" = "vfat" ] ; then
    34 #           LogIt "Making $i bootable (drive=$drive, partno=$partno)"
    35 #           echo -e -n "a\n$partno\nw\n" | fdisk $drive >> $LOGFILE 2>> $LOGFILE
    36 #            HAVE_ACTIVE="true"
    3733        fi
    3834    fi
Note: See TracChangeset for help on using the changeset viewer.