Changeset 2156 in MondoRescue

Timestamp:

Feb 19, 2009, 11:46:33 PM (16 years ago)

Author:

Bruno Cornec

Message:

Better support of EMC array (try to fix #301)

File:

• branches/2.2.9/mindi/mindi (modified) (10 diffs)

branches/2.2.9/mindi/mindi

@@ -48 +48 @@
 MY_FSTAB=/etc/fstab
 TAPE_MODS="ht st osst ide-tape ide_tape"
-SCSI_MODS="3w-xxxx 3w_xxxx 3w_9xxx 3w-9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi iscsi_tcp libiscsi scsi_transport_iscsi isp megaraid megaraid_mm megaraid_mbox megaraid_sas mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt"
+SCSI_MODS="3w-xxxx 3w_xxxx 3w_9xxx 3w-9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi iscsi_tcp libiscsi scsi_transport_iscsi isp megaraid megaraid_mm megaraid_mbox megaraid_sas mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt emcpdm emcpgpx emcpmpx emcp"
 
 # ide-probe-mod
@@ -152 +152 @@
 
     mkdir -p $bigdir/etc
-    tar cf - $mappath 2>> $LOGFILE | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
+    tar cf - -C / $mappath 2>> $LOGFILE | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
         included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
@@ -195 +195 @@
             find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir
         elif [ -e "$incoming" ] && [ $found = "false" ]; then
-            tar cf - $incoming 2>> $LOGFILE | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
+            tar cf - -C / $incoming 2>> $LOGFILE | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
 
             # Only uncompress modules if not using udevd
@@ -1889 +1889 @@
         [ "$?" -ne "0" ] && [ _"$MONDO_SHARE" != _"" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
     fi
-    [ -d "/lib/dev-state" ] && tar cf - /lib/dev-state 2>> $LOGFILE | tar xf -
+    [ -d "/lib/dev-state" ] && tar cf - -C / /lib/dev-state 2>> $LOGFILE | tar xf -
     cd $old_pwd
     echo -e "$DONE"
@@ -2182 +2182 @@
         s=`which $w 2> /dev/null`
         if [ -e "$s" ] ; then
-            tar cf - $s 2> /dev/null | tar xf -
+            tar cf - -C / $s 2> /dev/null | tar xf -
         fi
     done
@@ -2212 +2212 @@
         echo "udev device manager found" > $mountpoint/tmp/USE-UDEV
         LogIt "udev device manager found"
-        tar cf - /etc/udev 2>> $LOGFILE | tar xf -
+        tar cf - -C / /etc/udev 2>> $LOGFILE | tar xf -
         # This avoids NIC remapping if on another machine at restore time on Debian at least
         rm -f ./etc/udev/rules.d/z[0-9][0-9]_persistent-net.rules
         # This avoids NIC remapping if on another machine at restore time on Ubuntu at least
         rm -f ./etc/udev/rules.d/[0-9][0-9]-persistent-net.rules
-        tar cf - /lib*/udev 2>> $LOGFILE | tar xf -
+        tar cf - -C / /lib*/udev 2>> $LOGFILE | tar xf -
         if [ -x /sbin/udevd ]; then
             lis2=`grep -Ev '^#' $MINDI_CONF/udev.files` 
@@ -2243 +2243 @@
                 fi
             done
-            tar cf - $lis `sort -u $MINDI_TMP/udev.lis` 2>> $LOGFILE | tar xf -
+            tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2>> $LOGFILE | tar xf -
             rm -f $MINDI_TMP/udev.lis
         else
@@ -2274 +2274 @@
     done
 
-    tar cf - /dev/fd0*[1,2][4,7,8]* 2>> $LOGFILE | tar xf -
+    tar cf - -C / /dev/fd0*[1,2][4,7,8]* 2>> $LOGFILE | tar xf -
 
     cd $old_pwd
@@ -2316 +2316 @@
         [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-        tar cf - $i 2>> $LOGFILE | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy $i to $mountpoint"
+        tar cf - -C / $i 2>> $LOGFILE | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy $i to $mountpoint"
         # Uncompress modules if not using udev and native modprobe
         if [ ! -f $mountpoint/tmp/USE-UDEV ]; then
@@ -2327 +2327 @@
 
     # Also copy modules.dep in case of udev so that normal modprobe works
-    tar cf - /$needed_modules_path/modules.dep 2>> $LOGFILE | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy modules.dep to $mountpoint"
+    tar cf - -C / /$needed_modules_path/modules.dep 2>> $LOGFILE | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy modules.dep to $mountpoint"
 
     if [ ! -e "/sbin/devfsd" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then