Changeset 85


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

Patch allowing to restore on ia64 till 3rd CD :-)

Location:
branches/2.04_berlios
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.04_berlios/mindi/aux-tools/sbin/format-and-kludge-vfat

    r30 r85  
    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
  • branches/2.04_berlios/mondo/mondo/common/libmondo-devices.c

    r30 r85  
    11/* libmondo-devices.c                 Subroutines for handling devices
    2    $Id: libmondo-devices.c,v 1.26 2004/06/21 20:20:36 hugo Exp $
     2   $Id$
    33.
    44
     
    252252
    253253/*@unused@*/
    254 //static char cvsid[] = "$Id: libmondo-devices.c,v 1.26 2004/06/21 20:20:36 hugo Exp $";
     254//static char cvsid[] = "$Id$";
    255255
    256256extern int g_current_media_number;
     
    26692669  char *tmp;
    26702670  char *command;
     2671  char *fdisk;
     2672  struct stat buf;
    26712673   
    26722674  malloc_string(tmp);
    26732675  malloc_string(command);
     2676  malloc_string(fdisk);
    26742677  log_msg(0, "Looking for partition table format type");
    2675   sprintf(command, "fdisk -l %s | grep 'EFI GPT'", drive);
     2678// BERLIOS: Do that temporarily: we need to put back parted2fdisk everywhere
     2679#ifdef __IA64__
     2680  sprintf(fdisk, "/usr/local/bin/fdisk");
     2681  if (stat(fdisk, &buf) != 0) {
     2682#endif
     2683      sprintf(fdisk, "/sbin/fdisk");
     2684#ifdef __IA64__
     2685  }
     2686#endif
     2687  log_msg(1, "Using %s",fdisk);
     2688  sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
    26762689  strcpy(tmp, call_program_and_get_last_line_of_output(command));
    26772690  if (strstr(tmp,"GPT") == NULL) {
     
    26832696  paranoid_free(command);
    26842697  paranoid_free(tmp);
     2698  paranoid_free(fdisk);
    26852699  return(output);
    26862700}
  • branches/2.04_berlios/mondo/mondo/mondorestore/mondo-prep.c

    r71 r85  
    834834        sprintf(program, "newfs_msdos -F 32 %s", device);
    835835#else
     836#ifdef __IA64__
     837        /* For EFI partitions take fat16
     838         * as we want to make small ones */
     839        sprintf(program, "mkfs -t %s -F 16 %s", format, device);
     840#else
    836841        sprintf(program, "mkfs -t %s -F 32 %s", format, device);
     842#endif
    837843#endif
    838844        res = run_program_and_log_output(program, FALSE);
Note: See TracChangeset for help on using the changeset viewer.