Changeset 2603 in MondoRescue for branches/2.2.10/mindi/mindi

Timestamp:

Mar 22, 2010, 1:56:30 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3757@localhost: bruno | 2010-03-17 15:05:13 +0100

• Adds a new interface param between mondoarchive and mindi for backup-media-type which was missing
• Improve again logging
• Try to improve keymap support
• Remove some remaining hard coded /proc/cmdline
• Adds a cache for the find command for modules launched twice to make it quicker on my Atom netboot in a QEMU VM
• Remove dependency at build time on mindi to only use MINDI_CONF env var

File:

• branches/2.2.10/mindi/mindi (modified) (7 diffs)

branches/2.2.10/mindi/mindi

@@ -900 +900 @@
     outfile=$1
     > $outfile
+    [ "$BACKUP_MEDIA_TYPE" ]        && echo "backup-media-type $BACKUP_MEDIA_TYPE" >> $outfile
     [ "$TAPESIZE" ]     && echo "media-size $TAPESIZE" >> $outfile
     [ "$TAPEDEV" ]          && echo "media-dev $TAPEDEV" >> $outfile
@@ -1377 +1378 @@
     old_pwd=`pwd`
     cd $MINDI_TMP/iso
+    LogFile "-------------------"
+    LogFile "Content of the ISO:"
+    LogFile "-------------------"
+    ls -Rla >> $LOGFILE
+    LogFile "-------------------"
+
     if [ "$ARCH" != "ia64" ] ; then
         if [ _"$MONDO_SHARE" != _"" ]; then 
@@ -1510 +1517 @@
     cat $MINDI_TMP/usb/syslinux.cfg |tee -a $LOGFILE
     LogAll "------------------------------------------"
+    LogFile "--------------------------"
+    LogFile "Content of the USB device:"
+    LogFile "--------------------------"
+    (cd $MINDI_TMP/usb ; ls -Rla) >> $LOGFILE
+    LogFile "--------------------------"
+
     umount $MINDI_TMP/usb
     if [ "$ARCH" != "ia64" ] ; then
@@ -1808 +1821 @@
         Die "You have $res files present in dependency list\nbut absent from filesystem."
     fi
-    FindAndAddUserKeyboardMappingFile
+    FindAndAddUserKeyboardMappingFile 
     mkdir -p $bigdir/tmp
     [ -d "/mnt/.boot.d" ] && echo "Oh Jebus" > $bigdir/tmp/DUMBASS-GENTOO
@@ -2126 +2139 @@
     # ln.lis will contain the list of files to link to existing files
     # rm.lis will contain the list of files to remove after the copies
+
+    # Get kbd conf from data disk preparation
+    echo $MINDI_CACHE/KEYMAP-LIVES-HERE >> $MINDI_TMP/cp.lis
     # AL04Oct08: Check whether /lib64 is a link and if so explicitly create one in rootfs
     if [ -h "/lib64" ]; then
@@ -2251 +2267 @@
         MakeMondoConfigFile $MINDI_CACHE/mondorestore.cfg
         echo $MINDI_CACHE/mondorestore.cfg >> $MINDI_TMP/cp.lis
+        LogFile "-----------------------------------"
+        LogFile "Content of mondorestore.cfg:       "
+        LogFile "-----------------------------------"
+        cat $MINDI_CACHE/mondorestore.cfg >> $LOGFILE
+        LogFile "-----------------------------------"
     fi
     echo proc >> $MINDI_TMP/mkdir.lis
@@ -2661 +2682 @@
         USE_GZIP="${19}"
         USE_LZMA="${20}"
+        BACKUP_MEDIA_TYPE="${21}"
         [ "$USE_COMP" = "" ] && USE_COMP=yes
         [ "$USE_GZIP" = "" ] && USE_GZIP=no