Changeset 1880 in MondoRescue for branches/2.2.5

Timestamp:

Jan 27, 2008, 9:24:51 PM (16 years ago)

Author:

Bruno Cornec

Message:

CACHE_LOC => MINDI_CACHE (nearer from stable version, will ease future patches)

Location:

branches/2.2.5/mindi

Files:

• mindi (modified) (16 diffs)
• mindi-bkphw (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -6 +6 @@
 # mindi - mini-Linux distro based on the user's filesystem & distribution
 #
-# Mindi can create a multi-floppy boot/root kit. The first floppy is the boot
+# Mindi can create a multi-image boot/root kit. The first image is the boot
 # disk: it contains a kernel, a ramdisk etc. The second disk is data disk #1;
 # the third disk is data disk #2; and so it goes.
@@ -19 +19 @@
 
 #RUN_AFTER_INITIAL_BOOT_PHASE="echo \"Who lives in a pineapple under the sea?\" > /tmp/spongebob.squarepants.txt"
-    # after booting from floppy/CD image but before
+    # after booting from image/CD but before
     # accessing auxiliary data disks (or the rest of
     # the CD), the initscript will run the above command.
@@ -82 +82 @@
 LOGFILE=/var/log/mindi.log
 FDDEVICE=/dev/fd0             ; # 1.44MB floppy #0
-CACHE_LOC=/var/cache/mindi
+MINDI_CACHE=/var/cache/mindi
 FORCE_DUAL_FLOPPIES=no
 BOOT_MEDIA_MESSAGE="\
@@ -112 +112 @@
 
 # Purge from potential old run
-rm -rf $CACHE_LOC/* 2> /dev/null
-mkdir -p $CACHE_LOC
+rm -rf $MINDI_CACHE/* 2> /dev/null
+mkdir -p $MINDI_CACHE
 # ----------------------------------------------------------------------------
 
@@ -142 +142 @@
 Aborted() {
     trap SIGHUP SIGTERM SIGTRAP SIGINT
-    [ "$CACHE_LOC" != "" ] && rm -f $CACHE_LOC/mindi*img $CACHE_LOC/*gz $CACHE_LOC/mindi.iso
+    [ "$MINDI_CACHE" != "" ] && rm -f $MINDI_CACHE/mindi*img $MINDI_CACHE/*gz $MINDI_CACHE/mindi.iso
     [ "$minidir_root" != "" ] && rm -Rf $minidir_root/*
     Die "User abort."
@@ -427 +427 @@
     if [ "$?" -ne "0" ] ; then
         umount $mountpoint
-        Die "Tarball $tarball is too big for disk! (CODI)\nTell Dev Team to adjust MAX_COMPRESSED_SIZE"
+        rmdir $mountpoint
+        Die "Tarball $tarball is too big for disk! (CODI)\nAdjust mindi_max_compressed_size in your $MINDI_CONFIG"
     fi
     [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
@@ -1717 +1718 @@
     [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .    2>> $LOGFILE
     if [ "$ARCH" != "ia64" ] ; then
-        mkisofs -U -J -r -o $CACHE_LOC/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
-    else
-        mkisofs -J -r -o $CACHE_LOC/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
+        mkisofs -U -J -r -o $MINDI_CACHE/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
+    else
+        mkisofs -J -r -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
     fi
     if [ "$?" -ne "0" ] ; then
@@ -1728 +1729 @@
         LogIt "Failed to create ISO image."
     else
-        echo "Created bootable ISO image at $CACHE_LOC/mindi.iso" | tee -a $LOGFILE
+        echo "Created bootable ISO image at $MINDI_CACHE/mindi.iso" | tee -a $LOGFILE
     fi
     rm -f $MINDI_TMP/mkisofs.log
@@ -2049 +2050 @@
         t=vfat
     else
-        mke2fs -N 26 -m 0 -F $imagefile >> $LOGFILE 2>> $LOGFILE
+        echo "Creating ext2 filesystem on $imagefile" >> $LOGFILE
+        mke2fs -N 26 -m 0 -F $imagefile &> /dev/null || Die "Unable to create an ext2 file system on $imagefile"
         t=ext2
     fi
@@ -2880 +2882 @@
 
     # Management of potential HW info (Proliant only at the moment)
-    rm -rf $CACHE_LOC/bkphw
-    mindi-bkphw $CACHE_LOC $MINDI_CONF | tee -a $LOGFILE
-    if [ -d $CACHE_LOC/bkphw ]; then
+    rm -rf $MINDI_CACHE/bkphw
+    mindi-bkphw $MINDI_CACHE $MINDI_CONF | tee -a $LOGFILE
+    if [ -d $MINDI_CACHE/bkphw ]; then
         LogIt "Hardware Information found and saved ..."
-        cp -rp $CACHE_LOC/bkphw .
-        if [ -f $CACHE_LOC/tools.files ]; then
-            lis=`grep -Ev '^#' $CACHE_LOC/tools.files` 
+        cp -rp $MINDI_CACHE/bkphw .
+        if [ -f $MINDI_CACHE/tools.files ]; then
+            lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
             LocateDeps $lis > $MINDI_TMP/tools.lis
             cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
         fi
-        if [ -f $CACHE_LOC/mindi-rsthw ]; then
-            mv -f $CACHE_LOC/mindi-rsthw .
+        if [ -f $MINDI_CACHE/mindi-rsthw ]; then
+            mv -f $MINDI_CACHE/mindi-rsthw .
             chmod 755 ./mindi-rsthw
         fi
-        rm -f $MINDI_TMP/tools.lis $CACHE_LOC/tools.files
+        rm -f $MINDI_TMP/tools.lis $MINDI_CACHE/tools.files
     fi
 
@@ -3338 +3340 @@
         mkdir -p $MINDI_TMP
         # This is the scratch dir in mondo - subdir images
-        CACHE_LOC=$3
-        if [ _"$CACHE_LOC" != _"" ]; then
-            mkdir -p $CACHE_LOC
+        MINDI_CACHE=$3
+        if [ _"$MINDI_CACHE" != _"" ]; then
+            mkdir -p $MINDI_CACHE
         fi
         kernelpath=$4; [ "$kernelpath" = "(null)" ] && kernelpath=""
@@ -3402 +3404 @@
         [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
         # MONDO_ROOT is the real scratchdir
-        MONDO_ROOT=`echo $CACHE_LOC | sed 's/\(.*\)\/.*/\1/'`
+        MONDO_ROOT=`echo $MINDI_CACHE | sed 's/\(.*\)\/.*/\1/'`
         if [ _"$MONDO_ROOT" != _"" ]; then
             mkdir -p $MONDO_ROOT
@@ -3507 +3509 @@
     YOUR_KERNEL_SUCKS="Your kernel sucks"
 fi
-echo -e "Mindi's temp dir = $MINDI_TMP \nMindi's output dir=$CACHE_LOC" >> $LOGFILE
+echo -e "Mindi's temp dir = $MINDI_TMP \nMindi's output dir=$MINDI_CACHE" >> $LOGFILE
 [ "$(($RANDOM%64))" -eq "0" ] && LogIt "Dude, I've looked inside your computer and it's really dusty..."
 
 [ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it.\nGo to http://www.mondorescue.org and download it, then install it."
 
-PrepareDataDiskImages $CACHE_LOC
+PrepareDataDiskImages $MINDI_CACHE
 noof_disks=$?
 ramdisk_size=$(($size_of_all_tools+$EXTRA_SPACE))
@@ -3520 +3522 @@
 echo "Ramdisk will be $ramdisk_size KB" >> $LOGFILE
 if [ "$ARCH" = "ia64" ] ; then
-    PrepareBootDiskImage_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
+    PrepareBootDiskImage_LILO $MINDI_CACHE $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
+        if ! PrepareBootDiskImage_LILO $MINDI_CACHE 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."
         fi
-        if ! PrepareBootDiskImage_LILO $CACHE_LOC 2880 $kernelpath $ramdisk_size ;  then
+        if ! PrepareBootDiskImage_LILO $MINDI_CACHE 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_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
-        fi
-    else
-        if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
+            PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
+        fi
+    else
+        if ! PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 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
+            if ! PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 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 $BOOT_SIZE kB floppy disk image."
+                PrepareBootDiskImage_SYSLINUX $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create $BOOT_SIZE kB floppy disk image."
             fi
         fi
@@ -3549 +3551 @@
 
 if [ _"$MONDO_SHARE" = _"" ]; then
-    ListImagesForUser $CACHE_LOC
+    ListImagesForUser $MINDI_CACHE
     boot_dev=/dev/fd0u1722
     [ ! -e "$boot_dev" ] && mknod $boot_dev b 2 60
@@ -3555 +3557 @@
     [ ! -e "$boot_dev" ] && Die "Oh Lord, will you PLEASE tell the vendor to create the 1.72MB devices in /dev?"
     if [ "$PROMPT_WRITE_BOOT_FLOPPIES" = "yes" ]; then
-        OfferToCopyImagesToDisks $CACHE_LOC $boot_dev $FDDEVICE
+        OfferToCopyImagesToDisks $MINDI_CACHE $boot_dev $FDDEVICE
     fi
     if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ]; then
-        OfferToMakeBootableUSB $CACHE_LOC
-    fi
-    OfferToMakeBootableISO $CACHE_LOC
+        OfferToMakeBootableUSB $MINDI_CACHE
+    fi
+    OfferToMakeBootableISO $MINDI_CACHE
     LogIt "Finished."
 elif [ "$TAPEDEV" ] ; then
-    OfferToMakeBootableISO $CACHE_LOC
-    if [ -e "$CACHE_LOC/all.tar.gz" ] ; then
-        cp -f $CACHE_LOC/all.tar.gz $MINDI_TMP/ 2>> $LOGFILE
+    OfferToMakeBootableISO $MINDI_CACHE
+    if [ -e "$MINDI_CACHE/all.tar.gz" ] ; then
+        cp -f $MINDI_CACHE/all.tar.gz $MINDI_TMP/ 2>> $LOGFILE
     else
         Die "Cannot find all.tar.gz, to be written to tape"
     fi
 elif [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
-    OfferToMakeBootableUSB $CACHE_LOC
+    OfferToMakeBootableUSB $MINDI_CACHE
 else
-    OfferToMakeBootableISO $CACHE_LOC
+    OfferToMakeBootableISO $MINDI_CACHE
 fi
 # cleanup

branches/2.2.5/mindi/mindi-bkphw

@@ -77 +77 @@
         }
         if ($tool =~ /\.scexe$/) {
+            print "Found $tool, that firmware will be applied at restore time on your HP Proliant\n";
             print SCRIPT "$tool\n";
         }