Changeset 86 for trunk


Ignore:
Timestamp:
Oct 22, 2005, 12:40:18 AM (14 years ago)
Author:
bcornec
Message:

apply patch r83:85 from the 2.04_berlios branch

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/aux-tools/sbin/format-and-kludge-vfat

    r30 r86  
    9494    exit 1
    9595fi
    96 LogIt "Fixing the boot block of $device with ms-sys" 2
    97 ms-sys -w $device 2> /tmp/fakv.log > /dev/null
    98 res=$?
    99 retval=$(($retval+$res))
    100 if [ "$res" -ne "0" ]; then
    101     LogIt "Errors occurred while fixing the boot block of $device!" 1
    102     cat /tmp/fakv.log
    103     exit 1
     96if [ "`arch`" != "ia64" ] ; then
     97    LogIt "Fixing the boot block of $device with ms-sys" 2
     98    ms-sys -w $device 2> /tmp/fakv.log > /dev/null
     99    res=$?
     100    retval=$(($retval+$res))
     101    if [ "$res" -ne "0" ]; then
     102            LogIt "Errors occurred while fixing the boot block of $device!" 1
     103            cat /tmp/fakv.log
     104            exit 1
     105    fi
    104106fi
    105107[ ! -e "/mnt/tmpK" ] && mkdir /mnt/tmpK
  • trunk/mondo/mondo/common/libmondo-devices.c

    r75 r86  
    28912891    char *tmp;
    28922892    char *command;
     2893    char *fdisk;
     2894    struct stat buf;
    28932895
    28942896    malloc_string(tmp);
    28952897    malloc_string(command);
     2898    malloc_string(fdisk);
    28962899    log_msg(0, "Looking for partition table format type");
    2897     sprintf(command, "fdisk -l %s | grep 'EFI GPT'", drive);
     2900// BERLIOS: Do that temporarily: we need to put back parted2fdisk everywhere
     2901#ifdef __IA64__
     2902    sprintf(fdisk, "/usr/local/bin/fdisk");
     2903    if (stat(fdisk, &buf) != 0) {
     2904#endif
     2905        sprintf(fdisk, "/sbin/fdisk");
     2906#ifdef __IA64__
     2907    }
     2908#endif
     2909    log_msg(1, "Using %s",fdisk);
     2910    sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
    28982911    strcpy(tmp, call_program_and_get_last_line_of_output(command));
    28992912    if (strstr(tmp, "GPT") == NULL) {
     
    29052918    paranoid_free(command);
    29062919    paranoid_free(tmp);
     2920    paranoid_free(fdisk);
    29072921    return (output);
    29082922}
  • trunk/mondo/mondo/mondorestore/mondo-prep.c

    r59 r86  
    885885        sprintf(program, "newfs_msdos -F 32 %s", device);
    886886#else
     887#ifdef __IA64__
     888        /* For EFI partitions take fat16
     889         * as we want to make small ones */
     890        sprintf(program, "mkfs -t %s -F 16 %s", format, device);
     891#else
    887892        sprintf(program, "mkfs -t %s -F 32 %s", format, device);
     893#endif
    888894#endif
    889895        res = run_program_and_log_output(program, FALSE);
Note: See TracChangeset for help on using the changeset viewer.