Changeset 3911 in MondoRescue for branches/3.3/mondo/src

Timestamp:

May 8, 2025, 6:38:09 PM (3 months ago)

Author:

Bruno Cornec

Message:

Debian 11 fixes patch from Christoph.Griesbeck_at_de.fkdelvotec.com adapted where necessary

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (1 diff)
• restore-scripts/mondo/mr-label-partitions-as-necessary (modified) (1 diff)
• restore-scripts/mondo/mr-make-me-bootable (modified) (3 diffs)

branches/3.3/mondo/src/common/libmondo-archive.c

@@ -2731 +2731 @@
         if (strcmp(bootldr_ver,"") == 0) {
             mr_free(bootldr_ver);
-            bootldr_ver = call_program_and_get_last_line_of_output("grub2-install --version");
+            bootldr_ver = call_program_and_get_last_line_of_output("grub-install --version");
+            if (strcmp(bootldr_ver,"") == 0) {
+                mr_free(bootldr_ver);
+                bootldr_ver = call_program_and_get_last_line_of_output("grub2-install --version");
+            }
         }
     } else if (bkpinfo->boot_loader == 'R') {

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -798 +798 @@
             } else {
                 if (filelist_subset_fname != NULL) {
-                    mr_asprintf(command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
+                    mr_asprintf(command, "afio -i -8 allowinsecuresymlinks -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
                 } else {
-                    mr_asprintf(command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
+                    mr_asprintf(command, "afio -i -8 allowinsecuresymlinks -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
                 }
             }

branches/3.3/mondo/src/restore-scripts/mondo/mr-label-partitions-as-necessary

@@ -41 +41 @@
                 command="tune2fs $opttun $label $mountpt"
             fi
+            LogIt "Running e2fsck -f -p $mountpt"
+            e2fsck -f -p $mountpt
             LogIt "Running $command"
             $command

branches/3.3/mondo/src/restore-scripts/mondo/mr-make-me-bootable

@@ -26 +26 @@
     drive=`echo $i | sed -e 's/[0-9]*$//' -e 's/\([0-9]\)p$/\1/'`
     if [ "$drivetouse" = "$drive" ]; then
-        # We can continue as this is the drive we ned to work on
+        # We can continue as this is the drive we need to work on
         partno=`echo $i | sed -e 's/^.*[^0-9]\([0-9]*\)$/\1/'`
         mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2`
@@ -49 +49 @@
     driveline=`grep -E '[   ]/boot[     ]' $1`
     [ ! "$driveline" ] && driveline=`grep -E '[     ]/[     ]' $1`
+    drive=`echo "$driveline" | cut -d' ' -f1 | grep -o '.*[^0-9]'`
     partno=`echo "$driveline" | cut -d' ' -f1 | awk -F "[a-z]" '{print $NF;}'`
-#    echo "driveline=$driveline --> partno=$partno"
+#    echo "driveline=$driveline --> partno=$partno and drive=$drive"
 fi
 
-if [ "$drive" ] ; then
+if [ "$drive" ] && [ "$drivetouse" = "$drive" ]; then
     if [ "$partno" = "0" ] || [ ! "$partno" ] ; then
         partno="1"
@@ -59 +60 @@
     cmd=""
     for p in $activepart; do
-        # First desactivate active partitions (coming from previous usage)
+        # First deactivate active partitions (coming from previous usage)
         cmd="${cmd}a\n$p\n"
         if [ "$dummy" != "" ] ; then
-            echo "Will desactivate $p on $drive" >> $LOGFILE
+            echo "Will deactivate $p on $drive" >> $LOGFILE
         fi
     done