Changeset 2773 in MondoRescue

Timestamp:

Apr 22, 2011, 2:22:24 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Propose more variables in the mindi.conf example
• More explicit messages when size unsufficient in mindi for kernel + initrd as per #471
• Better loging of labeling in mondo when in nuke mode

Location:

branches/2.2.9

Files:

• mindi/mindi (modified) (4 diffs)
• mindi/mindi.conf (modified) (1 diff)
• mondo/src/mondorestore/mondorestore.c (modified) (1 diff)

branches/2.2.9/mindi/mindi

@@ -1772 +1772 @@
         LogIt "Failed to copy $MINDI_TMP/initrd.img to $mountpoint"
         cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
-        LogIt "Please unload some of your modules and try again."
+        LogIt "Please unload some of your modules and try again. Or increase EXTRA_SPACE and BOOT_SIZE in $MINDI_CONFIG"
         rm -f $MINDI_TMP/mtpt.$$
         LogIt "Cannot incorporate initrd.img in bootdisk (kernel / modules too big?)"
@@ -1800 +1800 @@
     #   losetup /dev/loop0 -d
         [ "$imagefile" != "" ] && rm -f $imagefile
-        Die "Sorry, your kernel is too big for your image"
+        LogIt "Sorry, your kernel is too big for your image"
+        Die "Try to increase EXTRA_SPACE and BOOT_SIZE in $MINDI_CONFIG"
         return 0
     fi
@@ -1869 +1870 @@
         LogIt "Please unload some of your modules and try again."
         rm -f $MINDI_TMP/mtpt.$$
-        LogIt "Cannot incorporate initrd.img in bootdisk (kernel / modules too big?)"
+        LogIt "Cannot incorporate initrd.img in bootdisk (kernel / modules too big?). Try to increase EXTRA_SPACE and BOOT_SIZE in $MINDI_CONFIG"
         retval=$(($retval+1))
     fi
@@ -1901 +1902 @@
         rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
 
-        Die "Sorry, your kernel is too big for your image"
-        return 0
+        LogIt "Sorry, your kernel is too big for your image"
+        Die "Try to increase EXTRA_SPACE and BOOT_SIZE in $MINDI_CONFIG"
     fi
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))

branches/2.2.9/mindi/mindi.conf

@@ -5 +5 @@
 #
 # FORCE_MODS="crc_ccitt crc_ccitt"
+#
+# EXTRA_SPACE=80152     # increase if you run out of ramdisk space
+# BOOT_SIZE=32768       # size of the boot disk

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -890 +890 @@
                         "Using tune2fs to identify your ext2,3 partitions");
 
-    sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab",
-            g_mountlist_fname);
+    sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
     res = run_program_and_log_output(tmp, TRUE);
     if (res) {