Changeset 2703 in MondoRescue

Timestamp:

Jan 27, 2011, 7:31:20 PM (13 years ago)

Author:

Bruno Cornec

Message:

r4179@localhost: bruno | 2011-01-27 08:06:03 +0100

• Replace usage of pvs with pvscan for speed reasons in analyze-my-lvm (still some speed optimizations to do in that script)
• Workaround problems met on RHEL 5.2 and 5.4 around pvs command generating a list of \n separated pvs with back quotes in an unexpected way. Could be linked to a b ash bug in this context ?
• Adds /etc/rpc and /etc/netconfig as minimal deps for mindi for latest NFS support (mdv 2010.2 at least)

Port 2.2.9 recent changes to 2.2.10
svk merge -r 4174:4178 local/mondorescue/branches/2.2.9 .

Location:

branches/2.2.10

Files:

• mindi/analyze-my-lvm (modified) (2 diffs)
• mindi/deplist.d/minimal-net.conf (modified) (1 diff)
• mindi/mindi-bkphw (modified) (2 diffs)
• mondo/src/common/newt-specific.c (modified) (2 diffs)

branches/2.2.10/mindi/analyze-my-lvm

@@ -134 +134 @@
     if [ $lvmversion = 2 ]; then
         VG_params=`GenerateVgcreateParameters $current_VG`
-        current_PVs=`$LVMCMD pvs | grep " $current_VG " | awk '{print $1}'`
+        current_PVs=`$LVMCMD pvscan | grep " $current_VG " | awk '{print $2}' | tr '\n' ' '`
         list_of_devices=$current_PVs
     else
@@ -142 +142 @@
         list_of_devices=""
         for i in $physical_volumes ; do
-            fname=/proc/lvm/VGs/$current_VG/PVs/$i
-            device=`GetValueFromField $fname "name:"`
-            list_of_devices="$list_of_devices $device"
+            fname=/proc/lvm/VGs/$current_VG/PVs/$i
+            device=`GetValueFromField $fname "name:"`
+            list_of_devices="$list_of_devices $device"
         done
         current_PVs=$list_of_devices

branches/2.2.10/mindi/deplist.d/minimal-net.conf

@@ -12 +12 @@
 /sbin/mount.nfs
 /sbin/mount.nfs4 
+/etc/rpc
+/etc/netconfig
 /usr/bin/sshfs 
 /sbin/mount.fuse

branches/2.2.10/mindi/mindi-bkphw

@@ -54 +54 @@
         chomp($tool);
         $tooldir = dirname($tool);
-        if (! (-e $tool)) {
+        if (! (-x $tool)) {
             print "You should install the SmartStart Scripting toolkit tool $tool\nto benefit from mindi's enhanced hardware support\n";
             print "Get it from http://www.hp.com/servers/sstoolkit\n";
@@ -73 +73 @@
             print TOOLS "$tooldir/bld\n";
         }
-        if ($tool =~ /\/.hpacucli$/) {
+        if ($tool =~ /\/hpacucli$/) {
             my $dir=basename($tool);
             $ret = system("export ACUXE_BIN_INSTALLATION_DIR=$dir ; export IM_CFGFILE_PATH=$dir ; export ACUXE_LOCK_FILES_DIR=$dir/locks ; $tool -c $bkpdir/hpacucli.dat");

branches/2.2.10/mondo/src/common/newt-specific.c

@@ -453 +453 @@
                     if (!strncmp(err_log_lines[i], "root:", 5)) {
                         mr_asprintf(tmp, "%s", err_log_lines[i] + 6);
-                        strcpy(err_log_lines[i], tmp);
+                        strncpy(err_log_lines[i], tmp, (size_t)MAX_NEWT_COMMENT_LEN);
                         mr_free(tmp);
                     }
@@ -486 +486 @@
 
         va_start(args, fmt);
-        vsprintf(output, fmt, args);
+        vsnprintf(output, MAX_STR_LEN-1, fmt, args);
         log_msg(0, output);
         output[80] = '\0';