Changeset 3278 in MondoRescue for branches/3.2/mindi/mindi

Timestamp:

Apr 30, 2014, 12:30:11 PM (10 years ago)

Author:

Bruno Cornec

Message:

• File KEYMAP-LIVES-HERE, USING-* not used anymore
• Nomalize name usinf iso-dir and ISO-DIR where relevant
• config entry netfs-server-path not used anymore (iso-dir instead when needed)
• In network restore mode, also have the extended boot messages
• Manages grub2 version string as grub 1 was

File:

• branches/3.2/mindi/mindi (modified) (13 diffs)

branches/3.2/mindi/mindi

@@ -35 +35 @@
 MINDI_LIB=LLL
 MINDI_CACHE=/var/cache/mindi
+
+MRCFG=mondorestore.cfg
 
 # Temporary directory for mindi
@@ -400 +402 @@
         LogFile "INFO: Debian-style config detected."
         mkdir -p $bigdir/tmp
-        echo "/etc/console/boottime.kmap.gz" > $bigdir/tmp/KEYMAP-LIVES-HERE
+        echo "keymap-lives-here /etc/console/boottime.kmap.gz" >> $bigdir/tmp/$MRCFG
         KBDEPTH=0
         mkdir -p $bigdir/etc/console
@@ -415 +417 @@
             kbdfile="/etc/console-setup/cached.kmap.gz"
         fi
-        echo $kbdfile > $bigdir/tmp/KEYMAP-LIVES-HERE
+        echo "keymap-lives-here $kbdfile" >> $bigdir/tmp/$MRCFG
         KBDEPTH=0
         mkdir -p $bigdir/etc/console-setup
@@ -479 +481 @@
     LogAll "INFO: Adding the following keyboard mapping tables: "
     mkdir -p $bigdir/tmp
-    echo "$mappath" > $bigdir/tmp/KEYMAP-LIVES-HERE
+    echo "keymap-lives-here $mappath" >> $bigdir/tmp/$MRCFG
     KBDEPTH=0
     AddKeyboardMappingFile $mappath
@@ -652 +654 @@
         if [ -e "$MINDI_TMP/NETFS-SERVER-MOUNT" ] ; then
             LogAll "\nINFO: Incorporating Network-related settings"
-            for r in NETFS-* ISO-PREFIX ; do
+            for r in NETFS-* ; do
                 cp -f $MINDI_TMP/$r $bigdir/tmp 2>> $LOGFILE || Die "Cannot copy $r - did you run out of disk space?"
                 LogFile "INFO: Copying $r to ramdisk"
@@ -974 +976 @@
 }
 
-# Called by TurnTgzIntoRdz, to make /tmp/mondorestore.cfg
+# Called by TurnTgzIntoRdz, to make /tmp/$MRCFG
 MakeMondoConfigFile() {
     local outfile use_lzo use_comp use_star
@@ -1000 +1002 @@
     AddFileToCfgIfExists $MINDI_TMP/ISO-MNT           iso-mnt           $outfile
     AddFileToCfgIfExists $MINDI_TMP/ISO-PREFIX        iso-prefix        $outfile
-    AddFileToCfgIfExists $MINDI_TMP/ISODIR            isodir            $outfile
+    AddFileToCfgIfExists $MINDI_TMP/ISO-DIR           iso-dir           $outfile
     AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.DEVICE bootloader.device $outfile
     AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.NAME   bootloader.name   $outfile
-    AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.VER    bootloader.ver   $outfile
-    AddFileToCfgIfExists $MINDI_TMP/KEYMAP-LIVES-HERE keymap-lives-here $outfile
+    AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.VER    bootloader.ver    $outfile
     AddFileToCfgIfExists $MINDI_TMP/TAPEDEV-HAS-DATA-DISKS tapedev-has-data-disks $outfile
     AddFileToCfgIfExists $MINDI_TMP/BACKUP-MEDIA-TYPE backup-media-type $outfile
     AddFileToCfgIfExists $MINDI_TMP/DIFFERENTIAL      differential      $outfile
-    AddFileToCfgIfExists $MINDI_TMP/ACL      acl      $outfile
-    AddFileToCfgIfExists $MINDI_TMP/XATTR      xattr      $outfile
-    AddFileToCfgIfExists $MINDI_TMP/OBDR      obdr      $outfile
+    AddFileToCfgIfExists $MINDI_TMP/ACL               acl               $outfile
+    AddFileToCfgIfExists $MINDI_TMP/XATTR             xattr             $outfile
+    AddFileToCfgIfExists $MINDI_TMP/OBDR              obdr              $outfile
+
     # Deal with network configuration in a portable way
     if [ -f $MINDI_TMP/NETFS-SERVER-MOUNT ]; then
         mr-net-get-config `cat $MINDI_TMP/NETFS-SERVER-MOUNT` >> $outfile
-        grep netfs-server-path $outfile | awk '{print $2}' > $MINDI_TMP/NETFS-SERVER-PATH
     fi
 }
@@ -1728 +1729 @@
         if [ "$CDRECOVERY" != "yes" ] ; then
             if [ -e "$MINDI_TMP/NETFS-SERVER-MOUNT" ] ; then
-                echo -en "Press <enter> to continue.\n"
+                echo -en "Press <enter> for network restore\n"
+                echo -en "$BOOT_MEDIA_MESSAGE"
             elif [ ! "$MINDI_TMP" ] ; then
                 echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
@@ -1893 +1895 @@
 
     mkdir -p $mountpoint/tmp
-    if [ -f "$MINDI_TMP/mondorestore.cfg" ]; then
-        cp -f $MINDI_TMP/mondorestore.cfg $mountpoint/tmp
+    if [ -f "$MINDI_TMP/$MRCFG" ]; then
+        cp -f $MINDI_TMP/$MRCFG $mountpoint/tmp
     fi
 
@@ -1988 +1990 @@
 
     mkdir -p $mountpoint/tmp
-    if [ -f "$MINDI_TMP/mondorestore.cfg" ]; then
-        cp -f $MINDI_TMP/mondorestore.cfg $mountpoint/tmp
+    if [ -f "$MINDI_TMP/$MRCFG" ]; then
+        cp -f $MINDI_TMP/$MRCFG $mountpoint/tmp
     fi
 
@@ -2095 +2097 @@
     if [ _"$MONDO_SHARE" != _"" ]; then
         # BCO: no reason to have the cfg file stored twice
-        MakeMondoConfigFile $MINDI_TMP/mondorestore.cfg
-        cp -f $MINDI_TMP/mondorestore.cfg $bigdir/tmp &> /dev/null
+        MakeMondoConfigFile $MINDI_TMP/$MRCFG
+        cp -f $MINDI_TMP/$MRCFG $bigdir/tmp &> /dev/null
     fi
     [ -d "/mnt/.boot.d" ] && echo "GENTOO" > $bigdir/tmp/DUMBASS-GENTOO
@@ -2772 +2774 @@
     [ "$TAPEDEV" ] && echo -en "$TAPEDEV" > $mountpoint/tmp/TAPEDEV-LIVES-HERE
     if [ _"$MONDO_SHARE" != _"" ]; then
-        MakeMondoConfigFile $mountpoint/tmp/mondorestore.cfg
-        cp -f $mountpoint/tmp/mondorestore.cfg $MINDI_TMP 2>> $LOGFILE || Die "Cannot copy mondorestore.cfg to ramdisk"
+        MakeMondoConfigFile $mountpoint/tmp/$MRCFG
+        cp -f $mountpoint/tmp/$MRCFG $MINDI_TMP 2>> $LOGFILE || Die "Cannot copy $MRCFG to ramdisk"
         cp -f $MINDI_TMP/mountlist.txt $mountpoint/tmp/ 2>> $LOGFILE || Die "Cannot copy mountlist to ramdisk"
         echo -en "$FILES_IN_FILELIST" > $mountpoint/tmp/FILES-IN-FILELIST
         echo -en "$LAST_FILELIST_NUMBER" > $mountpoint/tmp/LAST-FILELIST-NUMBER
-        [ "$USE_LZO" = "yes" ] && echo -en "Pras 4 Pres 2004" >> $mountpoint/tmp/USING-LZO
-        [ "$USE_GZIP" = "yes" ] && echo -en "YES" >> $mountpoint/tmp/USING-GZIP
-        [ "$USE_COMP" = "yes" ] && echo -en "Compression, yep" >> $mountpoint/tmp/USING-COMP
-        [ "$USE_STAR" = "yes" ] && echo -en "Using star. Hooray." >> $mountpoint/tmp/USING-STAR
     fi
     mkdir -p $mountpoint/proc
@@ -3292 +3290 @@
 LogFile "NOT_BOOT = '$NOT_BOOT'"
 if [ "$NOT_BOOT" != "" ] && [ "$NOT_BOOT" != "0" ] && [ "$NOT_BOOT" != "no" ] ; then
-    LogIt "INFO: Just creating mondorestore.cfg and a small all.tar.gz for Mondo. Nothing else."
-    MakeMondoConfigFile $MINDI_TMP/mondorestore.cfg
+    LogIt "INFO: Just creating $MRCFG and a small all.tar.gz for Mondo. Nothing else."
+    MakeMondoConfigFile $MINDI_TMP/$MRCFG
     MakeMountlist $MINDI_TMP/mountlist.txt
     CheckMountlist $MINDI_TMP/mountlist.txt
     mkdir -p $MINDI_TMP/small-all/tmp
     cd "$MINDI_TMP/small-all"
-    cp -f $MINDI_TMP/{mountlist.txt,mondorestore.cfg,filelist.full.gz,biggielist.txt} tmp 2>> $LOGFILE || Die "Cannot copy small all.tar.gz"
+    cp -f $MINDI_TMP/{mountlist.txt,$MRCFG,filelist.full.gz,biggielist.txt} tmp 2>> $LOGFILE || Die "Cannot copy small all.tar.gz"
     tar -cv ./tmp | gzip -9 > $MINDI_TMP/all.tar.gz 2>> $MINDI_TMP/$$.log || Die "Cannot make small all.tar.gz" $MINDI_TMP/$$.log
     sleep 2