Changeset 3911 in MondoRescue
- Timestamp:
- May 8, 2025, 6:38:09 PM (6 weeks ago)
- Location:
- branches/3.3
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.3/MondoRescue/lib/MondoRescue/Kernel.pm
r3908 r3911 66 66 =item B<mr_kernel_get_modules> 67 67 68 Tis function takes as input the kernel version to examined (can be undef in which case the running kernel is used) and a list of modules names to examined as well (can be undef in which case all modules ar taken)68 Tis function takes as input the kernel version to examined (can be undef in which case the running kernel is used) and a list of modules names to examined as well (can be undef in which case all modules are taken) 69 69 This function returns back the modules path as a first argument and the list of relative modules path for the modules names passed. 70 70 … … 137 137 pb_log(1,"Analyzing $m\n"); 138 138 if (not defined $modpath{$m}) { 139 # Useful for Debian 11+ distros 139 # Useful for Debian 11+ distros ??? TODO: check 140 140 my $mm; 141 141 $mm = $m; -
branches/3.3/mindi-busybox/util-linux/rdate.c
r3910 r3911 71 71 struct timespec ts; 72 72 ts.tv_sec = remote_time; 73 ts.tv_nsec = 0;73 s ts.tv_nsec = 0; 74 74 if (clock_settime(CLOCK_REALTIME, &ts) < 0) 75 75 bb_perror_msg_and_die("can't set time of day"); 76 76 } 77 }78 77 79 78 if (flags != 1) /* not lone -s */ -
branches/3.3/mindi/mindi
r3909 r3911 854 854 855 855 ListKernelModulePaths() { 856 local module_list module fname r kern 856 # To be replaced by mr_kernel_get_modules 857 local module_list module module2 fname r r2 kern 857 858 module_list="$MODULES" 858 859 # Remove unwanted modules from list … … 877 878 r=`find /lib/modules/$kern -type f | grep "/${module}\..*o" | tail -n1` 878 879 if [ -z "$r" ]; then 879 if [ "`echo "$MODULES" | grep -w $module`" ]; then 880 r="[live module file not found]" 880 module2=`echo ${module} | tr '_' '-'` 881 module2=`echo ${module2} | sed -e 's/x86-64/x86_64/g'` 882 r2=`find /lib/modules/$kern -type f | grep "/${module2}\..*o" | tail -n1` 883 if [ -n "$r2" ]; then 884 [ -f "$r2" ] && echo "$r2" 885 r="$r2" 881 886 else 882 r="[extra module file not found]" 887 if [ "`echo "$MODULES" | grep -w $module`" ]; then 888 r="[live module file not found]" 889 else 890 r="[extra module file not found]" 891 fi 883 892 fi 884 893 else -
branches/3.3/mondo/src/common/libmondo-archive.c
r3893 r3911 2731 2731 if (strcmp(bootldr_ver,"") == 0) { 2732 2732 mr_free(bootldr_ver); 2733 bootldr_ver = call_program_and_get_last_line_of_output("grub2-install --version"); 2733 bootldr_ver = call_program_and_get_last_line_of_output("grub-install --version"); 2734 if (strcmp(bootldr_ver,"") == 0) { 2735 mr_free(bootldr_ver); 2736 bootldr_ver = call_program_and_get_last_line_of_output("grub2-install --version"); 2737 } 2734 2738 } 2735 2739 } else if (bkpinfo->boot_loader == 'R') { -
branches/3.3/mondo/src/mondorestore/mondorestore.c
r3900 r3911 798 798 } else { 799 799 if (filelist_subset_fname != NULL) { 800 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);800 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); 801 801 } else { 802 mr_asprintf(command, "afio -i - b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);802 mr_asprintf(command, "afio -i -8 allowinsecuresymlinks -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname); 803 803 } 804 804 } -
branches/3.3/mondo/src/restore-scripts/mondo/mr-label-partitions-as-necessary
r3732 r3911 41 41 command="tune2fs $opttun $label $mountpt" 42 42 fi 43 LogIt "Running e2fsck -f -p $mountpt" 44 e2fsck -f -p $mountpt 43 45 LogIt "Running $command" 44 46 $command -
branches/3.3/mondo/src/restore-scripts/mondo/mr-make-me-bootable
r3745 r3911 26 26 drive=`echo $i | sed -e 's/[0-9]*$//' -e 's/\([0-9]\)p$/\1/'` 27 27 if [ "$drivetouse" = "$drive" ]; then 28 # We can continue as this is the drive we ne d to work on28 # We can continue as this is the drive we need to work on 29 29 partno=`echo $i | sed -e 's/^.*[^0-9]\([0-9]*\)$/\1/'` 30 30 mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2` … … 49 49 driveline=`grep -E '[ ]/boot[ ]' $1` 50 50 [ ! "$driveline" ] && driveline=`grep -E '[ ]/[ ]' $1` 51 drive=`echo "$driveline" | cut -d' ' -f1 | grep -o '.*[^0-9]'` 51 52 partno=`echo "$driveline" | cut -d' ' -f1 | awk -F "[a-z]" '{print $NF;}'` 52 # echo "driveline=$driveline --> partno=$partno "53 # echo "driveline=$driveline --> partno=$partno and drive=$drive" 53 54 fi 54 55 55 if [ "$drive" ] ; then56 if [ "$drive" ] && [ "$drivetouse" = "$drive" ]; then 56 57 if [ "$partno" = "0" ] || [ ! "$partno" ] ; then 57 58 partno="1" … … 59 60 cmd="" 60 61 for p in $activepart; do 61 # First de sactivate active partitions (coming from previous usage)62 # First deactivate active partitions (coming from previous usage) 62 63 cmd="${cmd}a\n$p\n" 63 64 if [ "$dummy" != "" ] ; then 64 echo "Will de sactivate $p on $drive" >> $LOGFILE65 echo "Will deactivate $p on $drive" >> $LOGFILE 65 66 fi 66 67 done
Note:
See TracChangeset
for help on using the changeset viewer.