Changeset 2587

Timestamp:

03/03/10 20:24:24 (5 months ago)

Author:

bruno

Message:

r3714@localhost: bruno | 2010-03-03 10:42:28 +0100
svk merge -r3649:3678 //prj/local-mondorescue/branches/2.2.9

r3666@localhost (orig r2578): bruno | 2010-02-12 13:35:29 +0100

• Free the sz_devfile fifo for ntfs later as it was used in between, causing a problem to backup NT
  

FS dev. Fix #392.

r3667@localhost (orig r2579): bruno | 2010-02-12 15:27:07 +0100
analyze-my-lvm now provides an option to call GiveMapperOfdm? that can be used in mindi. Solve #395

r3668@localhost (orig r2580): bruno | 2010-02-12 17:12:18 +0100

• When using excludevs= also exclude from mountlist the devices mentioned. Fix #393.
  
  r3669@localhost (orig r2581): bruno | 2010-02-12 17:15:53 +0100
  
• the post install ascript passed with post= should just exists and not be executable. It's now mad
  

e executable by init. Maybe a fix for #394

r3670@localhost (orig r2582): vicgat | 2010-02-15 19:35:39 +0100

r3671@localhost (orig r2583): bruno | 2010-02-15 20:05:45 +0100

• Fix reporting when a module is not found (pollutes logs)
  
  r3672@localhost (orig r2584): bruno | 2010-02-15 20:09:23 +0100
  
• Adds a missing module for iSCSI support
  
  r3673@localhost (orig r2585): bruno | 2010-02-15 20:45:50 +0100
  
• Fix problems of wrongly detected Duplicate mountpoints in case of lvm
  
  r3674@localhost (orig r2586): bruno | 2010-02-16 13:15:38 +0100
  
• Avoids error messages from stat in analyze-my-lvm
  
  r3663@athonet (orig r2577): bruno | 2010-02-09 02:08:39 +0100
  
• First try to improve OVM support with ocfs2 and Xen modules added
  
  

Files:

• branches/2.2.10/mindi/analyze-my-lvm (modified) (2 diffs)
• branches/2.2.10/mindi/deplist.d/base.conf (modified) (1 diff)
• branches/2.2.10/mindi/mindi (modified) (5 diffs)
• branches/2.2.10/mindi/rootfs/sbin/init (modified) (7 diffs)
• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (2 diffs)

branches/2.2.10/mindi/analyze-my-lvm

@@ -239 +239 @@
-GiveMapperOfdm () {
-
-
-
+ 2> /dev/null
+ 2> /dev/null
-
-for i in `ls /dev/mapper/*`; do
@@ -325 +325 @@
-
-# -------------------------------- main -----------------------------------
+
+if [ "$1" = "--givemapperofdm" ] ; then
+    shift
+    if [ _"$1" != _"" ] ; then
+        GiveMapperOfdm $1
+    fi
+    exit 0
+fi
+
+
-which lvmdiskscan 2>/dev/null 2>&1 || Die "lvmdiskscan not found. Won't handle LVM."
-if [ -e "/proc/lvm/global" ] && [ "`tr -s '\t' ' ' < /proc/lvm/global | grep "0 VGs 0 PVs 0 LVs"`" != "" ]; then

branches/2.2.10/mindi/deplist.d/base.conf

@@ -26 +26 @@
-/sbin/parted
-/usr/sbin/partprobe
+/sbin/partprobe
-
-# File

branches/2.2.10/mindi/mindi

@@ -53 +53 @@
-MY_FSTAB=/etc/fstab
-TAPE_MODS="ht st osst ide-tape ide_tape"
-
+libiscsi_tcp 
-
-# ide-probe-mod
-
+ blkbk
-PCMCIA_MODS="pcmcia_core ds yenta_socket"
-USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless ums_cypress ums-cypress"
-
+ netbk xenblktap
-CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660"
-# Those modules will only go on the backup media, not the boot media.
-
+ ocfs2 ocfs2_dlm ocfs2_nodemanager configfs
-# Replace with that line for HP OCMP e.g.
-#DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"
@@ -713 +713 @@
-
-ListKernelModulePaths() {
-oss 
+
-    outfile=$1
-    echo -en "Analyzing modules requirements"
-    oss="/root/oss/modules"
-    module_list="$MODULES"
-    # Remove unwanted modules from list
@@ -751 +750 @@
-                r="[extra module file not found]"
-            fi
+        else
+            [ -f "$r" ] && echo "$r"
-        fi
-        LogFile "module $module --> $r" 
-        [ -f "$r" ] && echo "$r" >> $outfile
-        [ -f "$oss" ] && find $oss | grep -F $module >> $outfile
-        progress=$(($progress+1))
-        LogProgress $progress $noof_lines
-    done
-    find /lib/modules/$kern/modules.* -type f 2> /dev/null >> $outfile
-    [ -f "$oss" ] && find $oss.* 2> /dev/null >> $outfile
-}
-
@@ -1160 +1159 @@
-            list_of_devices="`ReadAllLink $current_partition`"
-            for d in $list_of_devices; do
-GiveMapperO
+$MINDI_LIB/analyze-my-lvm --givemappero
-            done
-            list_of_devices="`echo $l | sort -u`"
@@ -1312 +1311 @@
-    # Coherency verification
-    ML01=`cat $file | wc -l`
-cat $file | grep -v ' lvm '
+grep -v ' lvm ' $file
-    ML1=`$AWK '{print $1}' $file | sort -u | wc -l`
-$AWK '{print $2}' $file | grep -v ' lvm 
+grep -v ' lvm ' $file | $AWK '{print $2}
-    if [ "$ML01" -ne "$ML1" ]; then
-        LogFile "--------------------------------------------"

branches/2.2.10/mindi/rootfs/sbin/init

@@ -395 +395 @@
-        rm -f /tmp/restorevgs
-        for d in $MINDI_EXCLUDE_DEVS ; do
-
+LVM exclusion
-            EXCLUDE_VGS=`grep " $d" /tmp/i-want-my-lvm | grep vgcreate | awk '{print $4}'`
-            vg=`echo $EXCLUDE_VGS | sed "s/ /|/g"`
@@ -413 +413 @@
-                for l in $EXCLUDE_LVS; do
-                    # FIXME: Should search for all possible device names here
-/tmp/mountlist.txt > /tmp
-/tmp/mountlist.txt.new > /tmp
+$MINDI_CACHE/mountlist.txt > $MINDI_CACHE
+$MINDI_CACHE/mountlist.txt.new > $MINDI_CACHE
-                done
-            done
@@ -730 +730 @@
-if [ "`grep -i excludedevs /proc/cmdline`" ]; then
-    export MINDI_EXCLUDE_DEVS="`cat /proc/cmdline | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone"
+    for d in $MINDI_EXCLUDE_DEVS ; do
+        echo "Mountlist exclusion == $d"
+        perl -i -ne 'print $_ unless m~$d~' $MINDI_CACHE/mountlist.txt
+    done
-else
-    export MINDI_EXCLUDE_DEVS=" "
@@ -804 +808 @@
-WelcomeMessage
-RstHW
+[ -e "$MINDI_CACHE/mountlist.txt" ] && cp -f $MINDI_CACHE/mountlist.txt $MINDI_CACHE/mountlist.original
-StartRaids
-StartMpath
@@ -817 +822 @@
-    cp -af /dev/md2 /dev/md/2 2> /dev/null
-fi
-[ -e "$MINDI_CACHE/mountlist.txt" ] && cp -f $MINDI_CACHE/mountlist.txt $MINDI_CACHE/mountlist.original
-
-if ! [ "`grep -i "pxe" $CMDLINE`" ] ; then
@@ -899 +903 @@
-        post=`echo $post | sed 's|^/tmp/isodir|/tmp|'`
-    fi
-x
+r
-        echo "Executing final script $post"
-        LogIt "Executing final script $post"
@@ -905 +909 @@
-            mount-me
-        fi
+        chmod 755 $post
-        $post
-        if [ "`echo $post | grep -E '^/mnt/RESTORING'`" ]; then

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

@@ -1964 +1964 @@
-                default:
-                    log_msg(2, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
-                    mr_free(sz_devfile);
-                }
-            }
@@ -1977 +1976 @@
-            }
-            res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, noof_biggie_files, use_ntfsprog);
+
+            /* Free it here as ntfsprog_fifo is not used anymore */
+            mr_free(sz_devfile);
+
-            if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                tmp = calc_checksum_of_file(bigfile_fname);