Changeset 1567 in MondoRescue

Timestamp:

Jul 25, 2007, 6:13:51 PM (17 years ago)

Author:

Bruno Cornec

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:

• mindi-busybox/TAG (modified) (1 diff)
• mindi/VERSION (modified) (1 diff)
• mindi/mindi (modified) (2 diffs)
• mondo-doc/VERSION (modified) (1 diff)
• mondo/VERSION (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/restore-scripts/mondo/stabelilo-me (modified) (1 diff)

branches/2.2.5/mindi-busybox/TAG

@@ -1 @@
-3
+4

branches/2.2.5/mindi/VERSION

@@ -1 @@
-1.2.4
+1.2.5

branches/2.2.5/mindi/mindi

@@ -3166 +3166 @@
 
 echo "Ramdisk will be $ramdisk_size KB" >> $LOGFILE
-if [ "$USE_LILO" = "yes" ] ; then
-    if [ "$ARCH" = "ia64" ] ; then
-        PrepareBootDiskImage_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
-    else
+if [ "$ARCH" = "ia64" ] ; then
+    PrepareBootDiskImage_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
+else
+    if [ "$USE_LILO" = "yes" ] ; then
         if ! PrepareBootDiskImage_LILO $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
             LogIt "WARNING - failed to create 1.72MB boot image."
@@ -3179 +3179 @@
             PrepareBootDiskImage_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
         fi
-    fi
-else
-    if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
-        LogIt "WARNING - failed to create 1.72MB boot image."
-        LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
-        if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 2880 $kernelpath $ramdisk_size ; then
-            LogIt "WARNING - failed to create 2.88MB floppy disk image."
-            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
-            PrepareBootDiskImage_SYSLINUX $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
+    else
+        if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
+            LogIt "WARNING - failed to create 1.72MB boot image."
+            LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
+            if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 2880 $kernelpath $ramdisk_size ; then
+                LogIt "WARNING - failed to create 2.88MB floppy disk image."
+                LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
+                PrepareBootDiskImage_SYSLINUX $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
+            fi
         fi
     fi

branches/2.2.5/mondo-doc/VERSION

@@ -1 @@
-2.2.4
+2.2.5

branches/2.2.5/mondo/VERSION

@@ -1 @@
-2.2.4
+2.2.5

branches/2.2.5/mondo/src/common/libmondo-archive.c

@@ -900 +900 @@
             run_program_and_log_output
                 ("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf",
+                 5);
+        }
+        if (!does_file_exist("/etc/elilo.conf")
+            && does_file_exist("/boot/efi/efi/debian/elilo.conf")) {
+            run_program_and_log_output
+                ("ln -sf /boot/efi/efi/debian/elilo.conf /etc/elilo.conf",
+                 5);
+        if (!does_file_exist("/etc/elilo.conf")
+            && does_file_exist("/boot//efi/debian/elilo.conf")) {
+            run_program_and_log_output
+                ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf",
                  5);
         }

branches/2.2.5/mondo/src/restore-scripts/mondo/stabelilo-me

@@ -29 +29 @@
         LogIt "elilo.conf found at /mnt/RESTORING/boot/efi/efi/SuSE/elilo.conf" 2
         old_eliloconf="/mnt/RESTORING/boot/efi/efi/SuSE/elilo.conf"
+        return 0
+    elif [ -f "/mnt/RESTORING/boot/efi/efi/debian/elilo.conf" ] ; then
+        LogIt "elilo.conf found at /mnt/RESTORING/boot/efi/efi/debian/elilo.conf" 2
+        old_eliloconf="/mnt/RESTORING/boot/efi/efi/debian/elilo.conf"
+        return 0
+    elif [ -f "/mnt/RESTORING/boot/efi/debian/elilo.conf" ] ; then
+        LogIt "elilo.conf found at /mnt/RESTORING/boot/efi/debian/elilo.conf" 2
+        old_eliloconf="/mnt/RESTORING/boot/efi/debian/elilo.conf"
         return 0
     else