Changeset 3795 in MondoRescue for branches/3.0

Timestamp:

Feb 15, 2024, 3:55:18 PM (2 months ago)

Author:

Bruno Cornec

Message:

Untag v3.3.0 never really published in the past - will start from here

Location:

branches/3.0/mindi

Files:

• deplist.d/minimal.conf (modified) (1 diff)
• mindi (modified) (10 diffs)

branches/3.0/mindi/deplist.d/minimal.conf

@@ -120 +120 @@
 /etc/conf.modules
 /etc/modules.conf.local
+/etc/depmod.d/hpvsa.conf
 # Debian 7
 /bin/kmod

branches/3.0/mindi/mindi

@@ -39 +39 @@
 TMPDIR=/tmp
 
-EXTRA_SPACE=120000      # increase if you run out of ramdisk space
-BOOT_SIZE=65600         # size of the boot disk
+EXTRA_SPACE=140000      # increase if you run out of ramdisk space
+BOOT_SIZE=75600         # size of the boot disk
 
 PROMPT_MAKE_CD_IMAGE="yes"
@@ -221 +221 @@
     trap SIGHUP SIGTERM SIGTRAP SIGINT
     [ "$MINDI_CACHE" != "" ] && rm -f $MINDI_CACHE/mindi*img $MINDI_CACHE/*gz $MINDI_CACHE/mindi.iso
-    [ "$minidir_root" != "" ] && rm -Rf $minidir_root/*
     Die "User abort."
 }
@@ -655 +654 @@
         if [ -e "$MINDI_TMP/post-nuke.tgz" ] ; then
             LogAll "\nINFO: Incorporating post-nuke tarball"
-            old_pwd=`pwd`
-            cd "$bigdir"
-            tar -zxf $MINDI_TMP/post-nuke.tgz 2>> $MINDI_TMP/$$.log || LogAll "ERROR: when untarring post-nuke tarball" $MINDI_TMP/$$.log
-            cd "$old_pwd"
+            (cd "$bigdir" ; tar -zxf $MINDI_TMP/post-nuke.tgz 2>> $MINDI_TMP/$$.log ) || LogAll "ERROR: when untarring post-nuke tarball" $MINDI_TMP/$$.log
         fi
         if cp -f $MINDI_TMP/mondo*restore $bigdir/usr/bin 2>> $LOGFILE ; then
@@ -1498 +1494 @@
 
 OfferToMakeBootableISO() {
-    local i old_pwd
+    local i
     if [ -z "$ISO_CMD" ]; then
         LogAll "ERROR: Neither mkisofs nor genisoimage found, unable to make CD image"
@@ -1553 +1549 @@
         cp $ISOLINUX $MINDI_TMP/iso/isolinux.bin 2>> $LOGFILE || Die "Cannot copy isolinux.bin ($ISOLINUX) to $MINDI_TMP/iso - did you run out of disk space?"
     fi
-    old_pwd=`pwd`
-    cd "$MINDI_TMP/iso"
     if [ "$ARCH" != "ia64" ] ; then
         if [ _"$MONDO_SHARE" != _"" ]; then 
@@ -1566 +1560 @@
             cp -f $MONDO_SHARE/autorun $MINDI_TMP/iso 2>> $LOGFILE
         fi
-        $ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
-    else
-        $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c images/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
+        (cd $MINDI_TMP/iso ; $ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log)
+    else
+        (cd $MINDI_TMP/iso ; $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c images/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log)
     fi
     if [ "$?" -ne "0" ] ; then
@@ -1579 +1573 @@
     fi
     rm -f $MINDI_TMP/mkisofs.log
-    cd "$old_pwd"
 }
 
@@ -2601 +2594 @@
             Die "ERROR: Unable to copy $f to the target dir. Check your installation or McAfee presence"
         else
-            cp -Rdf $f . 2>&1 >> $LOGFILE
+            if [ -d $f ]; then
+                # Allow to suport target dirs being a symlink
+                td=`basename $f`
+                if [ ! -e $td ]; then
+                    mkdir -p $td
+                fi
+                cp -Rdf $f/* $td 2>&1 >> $LOGFILE
+            else
+                cp -df $f . 2>&1 >> $LOGFILE
+            fi
         fi
     done
@@ -2637 +2639 @@
     if [ $? -eq 0 ]; then
         # We want to use the real mount and all the supported variants (nfs, cifs, ...)
-        rm -f bin/mount
+        rm -f $mountpoint/bin/mount
     fi
 
@@ -2686 +2688 @@
         tar cf - -C / /etc/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /etc/udev analysis" $MINDI_TMP/$$.log
         # This avoids NIC remapping if on another machine at restore time on Debian/Ubuntu at least
-        rm -f ./etc/udev/rules.d/[z]*[0-9][0-9][-_]persistent-net.rules
+        rm -f $mountpoint/etc/udev/rules.d/[z]*[0-9][0-9][-_]persistent-net.rules
         # Do not do it if it's a link (Ubuntu 64 bits #503)
         if [ -e "/lib64/udev" ] && [ ! -h "/lib64" ] && [ ! -h "/lib64/udev" ]; then