Changeset 3173 in MondoRescue for branches/3.0/mindi/mindi

Timestamp:

Jul 29, 2013, 9:08:58 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Use 2 README files as embedded doc for restore boot, with function keys
• Improve #628 by adding a comment in order to connect external disks after the boot.
• Improve also boot menu visibility.

File:

• branches/3.0/mindi/mindi (modified) (9 diffs)

branches/3.0/mindi/mindi

@@ -87 +87 @@
 LOGFILE=/var/log/mindi.log
 BOOT_MEDIA_MESSAGE="\
-To format and restore all files automatically, type 'nuke' <enter>.\n\
-To restore some/all files interactively, type 'interactive' <enter>.\n\
-To compare the archives with your filesystem, type 'compare' <enter>.\n\
-To boot to a command-line prompt (expert mode), type 'expert' <enter>.\n\
-You may add one or more of the following parameters as well:-\n\n\
-        donteject - mondorestore will not eject the CD; this is useful if, for\n\
-                    instance, your PC's case has a concealed CD-ROM drive\n\
-        noresize  - your mountlist will not be adjusted to use your unallocated\n\
-                    hard disk space\n\
-        textonly  - do not call any Newt library routines; this is unattractive\n\
-                    but valuable if you find your Newt library has bugs in it\n\n\
-e.g. Type 'nuke donteject textonly' if you have an unstable Newt library and \n\
-a PC whose CD-ROM drive tray would be damaged if it unexpectedly ejected.\n\
+To format and restore all files automatically, type '0enuke07' <enter>.\n\
+To restore some/all files interactively, type '0einteractive07' <enter>.\n\
+To compare the archives with your filesystem, type '0ecompare07' <enter>.\n\
+To boot to a command-line prompt (expert mode), type '0eexpert07' <enter>.\n\
+\n\
+You may add one or more parameters as well as per the function keys below\n\
+e.g. Type '0enuke denymods=\"fdomain impi_si\"07' to not load these 2 modules\n\
+\n\
+If restoring from a local external disk or USB key, do not connect it \n\
+until the boot-up has finished.\n\
+\n\
+\n0eF107-Main | Boot Parameters 0eF207-1/2 | 0eF307-2/2 | 0eF407-PXE\n\
 "
 FDISK=$MINDI_SBIN/parted2fdisk
@@ -1489 +1488 @@
         fi
     done
-    MakeMessageFile | cut -c1-80 > $MINDI_TMP/iso/message.txt
+    MakeMessageFile $MINDI_TMP/iso | cut -c1-80 > $MINDI_TMP/iso/message.txt
     if [ $KERNEL_IS_XEN = "yes" ]; then
         cp $xenkernelpath $MINDI_TMP/iso/xen.gz 2>> $LOGFILE || Die "Cannot copy xen.gz ($xenkernelpath) to mindi tmp ($MINDI_TMP/iso/xen.gz). Did you run out of disk space?"
@@ -1513 +1512 @@
     if [ "$ARCH" != "ia64" ] ; then
         if [ _"$MONDO_SHARE" != _"" ]; then 
-            cp -f $MINDI_TMP/iso/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
+            cp -f $MINDI_TMP/iso/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt,boot*.txt,pxe.txt} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
             if [ $KERNEL_IS_XEN = "yes" ]; then
                 cp -f $MINDI_TMP/iso/{mboot.c32,xen.gz} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy Xen core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
@@ -1661 +1660 @@
     done
     echo -en "."
-    MakeMessageFile | cut -c1-80 > $MINDI_TMP/usb/message.txt
+    MakeMessageFile $MINDI_TMP/usb | cut -c1-80 > $MINDI_TMP/usb/message.txt
     echo -en "."
     cp $kernelpath $MINDI_TMP/usb/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/usb/vmlinuz). Did you run out of disk space?"
@@ -1704 +1703 @@
     if [ -x "/bin/lsb_release" ]; then
         DESC=`/bin/lsb_release -d | cut -d: -f2 | sed "s/[ \t]*//"`
-    elif [ -r /etc/arch-release ]; then  # this code must be written before /etc/issue test to avoid errors                             
-        DESC="Arch Linux"                                                                                                           
-        if [ -r /var/log/pacman.log ]; then                                                                                         
-            # there are no releases but we can get the last system upgrade                                                      
-            # Output example:   Arch Linux [2011-03-03 01:39]                                                                   
-            DESC="$DESC $(tac /var/log/pacman.log | grep -m1 'full system upgrade' | cut -d']' -f1)]"                           
+    elif [ -r /etc/arch-release ]; then  # this code must be written before /etc/issue test to avoid errors
+        DESC="Arch Linux"
+        if [ -r /var/log/pacman.log ]; then
+            # there are no releases but we can get the last system upgrade
+            # Output example:   Arch Linux [2011-03-03 01:39]
+            DESC="$DESC $(tac /var/log/pacman.log | grep -m1 'full system upgrade' | cut -d']' -f1)]"
         fi
     elif [ -r /etc/issue.net ]; then
@@ -1740 +1739 @@
         fi
     fi
-    echo -en "\n\n\n"
+
+    # Also create the other help screens
+    head -24 $MINDI_CONF/README.bootparam | cut -c1-80 > $1/boot1.txt
+    head -48 $MINDI_CONF/README.bootparam | tail -24 | cut -c1-80 > $1/boot2.txt
+    head -24 $MINDI_CONF/README.pxe | cut -c1-80 > $1/pxe.txt
 }
 
@@ -1757 +1760 @@
     # Generic header for conf file
     if [ "$type" != "elilo" ] ; then
-        echo -en "prompt 1\ndisplay message.txt\n"
+        echo -en "prompt 1\ndisplay message.txt\nF1 message.txt\nF2 boot1.txt\nF3 boot2.txt\nF4 pxe.txt\n"
     else
         echo -en "prompt\n"
@@ -1884 +1887 @@
         retval=$(($retval+1))
     fi
-    MakeMessageFile | cut -c1-80 > $mountpoint/message.txt
+    MakeMessageFile $mountpoint | cut -c1-80 > $mountpoint/message.txt
 
     mkdir -p $mountpoint/tmp
@@ -1968 +1971 @@
 
     # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
-    MakeMessageFile | cut -c1-80 > $mountpoint/message.txt
+    MakeMessageFile $mountpoint | cut -c1-80 > $mountpoint/message.txt
     MakeBootConfFile isolinux > $mountpoint/syslinux.cfg
     LogFile "INFO: Copying $MINDI_TMP/initrd.img to $mountpoint/initrd.img..."