Changeset 1567


Ignore:
Timestamp:
Jul 25, 2007, 6:13:51 PM (12 years ago)
Author:
bruno
Message:
  • Version updated to 2.2.5
  • Add support of Debian ia64 in mondo
  • Fix mindi iso build for ia64 (test was reversed)
Location:
branches/2.2.5
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi-busybox/TAG

    r1446 r1567  
    1 3
     14
  • branches/2.2.5/mindi/VERSION

    r1380 r1567  
    1 1.2.4
     11.2.5
  • branches/2.2.5/mindi/mindi

    r1566 r1567  
    31663166
    31673167echo "Ramdisk will be $ramdisk_size KB" >> $LOGFILE
    3168 if [ "$USE_LILO" = "yes" ] ; then
    3169     if [ "$ARCH" = "ia64" ] ; then
    3170         PrepareBootDiskImage_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
    3171     else
     3168if [ "$ARCH" = "ia64" ] ; then
     3169    PrepareBootDiskImage_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
     3170else
     3171    if [ "$USE_LILO" = "yes" ] ; then
    31723172        if ! PrepareBootDiskImage_LILO $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
    31733173            LogIt "WARNING - failed to create 1.72MB boot image."
     
    31793179            PrepareBootDiskImage_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
    31803180        fi
    3181     fi
    3182 else
    3183     if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
    3184         LogIt "WARNING - failed to create 1.72MB boot image."
    3185         LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
    3186         if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 2880 $kernelpath $ramdisk_size ; then
    3187             LogIt "WARNING - failed to create 2.88MB floppy disk image."
    3188             LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
    3189             PrepareBootDiskImage_SYSLINUX $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
     3181    else
     3182        if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
     3183            LogIt "WARNING - failed to create 1.72MB boot image."
     3184            LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
     3185            if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 2880 $kernelpath $ramdisk_size ; then
     3186                LogIt "WARNING - failed to create 2.88MB floppy disk image."
     3187                LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
     3188                PrepareBootDiskImage_SYSLINUX $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
     3189            fi
    31903190        fi
    31913191    fi
  • branches/2.2.5/mondo-doc/VERSION

    r1380 r1567  
    1 2.2.4
     12.2.5
  • branches/2.2.5/mondo/VERSION

    r1380 r1567  
    1 2.2.4
     12.2.5
  • branches/2.2.5/mondo/src/common/libmondo-archive.c

    r1563 r1567  
    900900            run_program_and_log_output
    901901                ("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf",
     902                 5);
     903        }
     904        if (!does_file_exist("/etc/elilo.conf")
     905            && does_file_exist("/boot/efi/efi/debian/elilo.conf")) {
     906            run_program_and_log_output
     907                ("ln -sf /boot/efi/efi/debian/elilo.conf /etc/elilo.conf",
     908                 5);
     909        if (!does_file_exist("/etc/elilo.conf")
     910            && does_file_exist("/boot//efi/debian/elilo.conf")) {
     911            run_program_and_log_output
     912                ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf",
    902913                 5);
    903914        }
  • branches/2.2.5/mondo/src/restore-scripts/mondo/stabelilo-me

    r1563 r1567  
    2929        LogIt "elilo.conf found at /mnt/RESTORING/boot/efi/efi/SuSE/elilo.conf" 2
    3030        old_eliloconf="/mnt/RESTORING/boot/efi/efi/SuSE/elilo.conf"
     31        return 0
     32    elif [ -f "/mnt/RESTORING/boot/efi/efi/debian/elilo.conf" ] ; then
     33        LogIt "elilo.conf found at /mnt/RESTORING/boot/efi/efi/debian/elilo.conf" 2
     34        old_eliloconf="/mnt/RESTORING/boot/efi/efi/debian/elilo.conf"
     35        return 0
     36    elif [ -f "/mnt/RESTORING/boot/efi/debian/elilo.conf" ] ; then
     37        LogIt "elilo.conf found at /mnt/RESTORING/boot/efi/debian/elilo.conf" 2
     38        old_eliloconf="/mnt/RESTORING/boot/efi/debian/elilo.conf"
    3139        return 0
    3240    else
Note: See TracChangeset for help on using the changeset viewer.