Changeset 1489 in MondoRescue for branches/stable/mindi

Timestamp:

Jun 6, 2007, 1:46:19 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Avoid to backup ocfs/ocfs2 filesystems (+ afs forgotten in some places)
• Use MINDI_TMP in analyze-my-lvm (good practice and may solve an issue with selinux)
• export MINDI_TMP so that it may be used by subscripts
• Suppress error messages from gunzip when testing for kernel content
• mindi.conf isn't officially supported in that version so man page adapted
• Fix a bug where MINDI_CACHE wasn't excluded from backup
• Add support for Ubuntu 6.04 Dapper LTS
• Fix a bug for CentOS/RHEL 5 where optimized libraries are located /lib/i686/nosegneg (Brandon Poyner <bpoyner_at_ccac.edu>)
• Add support for RHAS 2.1 (rhel_2.1)

(merge -r1480:1488 $SVN_M/branches/2.2.4)

Location:

branches/stable/mindi

Files:

• analyze-my-lvm (modified) (2 diffs)
• mindi (modified) (4 diffs)

branches/stable/mindi/analyze-my-lvm

@@ -53 +53 @@
 GenerateLvcreateParameters() {
     local device stripes stripesize device fname allocation output readahead
-    fname=/tmp/PLF.$$.txt
+    fname=$MINDI_TMP/PLF.$$.txt
     device=$1
     output=""
@@ -81 +81 @@
     local current_VG device fname incoming VG_info_file max_logical_volumes max_physical_volumes physical_extent_size output blanklines
     current_VG=$1
-    VG_info_file=/tmp/$$.vg-info.txt
+    VG_info_file=$MINDI_TMP/$$.vg-info.txt
     $LVMCMD vgdisplay $current_VG > $VG_info_file
     max_logical_volumes=`GetValueFromField "$VG_info_file" "MAX LV"`

branches/stable/mindi/mindi

@@ -114 +114 @@
 BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
 FDISK=$MINDI_SBIN/parted2fdisk
-MINDI_TMP=`mktemp -d $TMPDIR/mindi.XXXXXXXXXX`
+
+# Now we can create what we need
+export MINDI_TMP=`mktemp -d $TMPDIR/mindi.XXXXXXXXXX`
 
 # ----------------------------------------------------------------------------
@@ -473 +475 @@
         echo -en "."
         reason=""
-        vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' | tr -s '/' '/'`
+        vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
         echo "$vanilla_lib_name" >> $filelist
         resolved=$vanilla_lib_name
@@ -868 +870 @@
 
     # scan kernel image for initrd filessystem support
-    lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | gunzip -c | strings | grep -e "$lcMagicCramfs" -e "$lcMagicExt2fs" -e "$lcMagicInitfs"`
+    lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | gunzip -c 2> /dev/null | strings | grep -e "$lcMagicCramfs" -e "$lcMagicExt2fs" -e "$lcMagicInitfs"`
 
     # determine which filesystem to use for initrd image: ext2fs, gzip'ed cpio (initramfs ) or cramfs
@@ -3126 +3128 @@
         mv $MINDI_TMP/* $MINDI_TMP/.??* $MONDO_TMP 2> /dev/null
         rmdir $MINDI_TMP
-        MINDI_TMP=$MONDO_TMP
+        export MINDI_TMP=$MONDO_TMP
         mkdir -p $MINDI_TMP
         # This is the scratch dir in mondo