Changeset 2028 in MondoRescue

Timestamp:

Oct 2, 2008, 1:24:10 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Add support for labeled reiser FS (Tehrani Ulrich <ulrich.tehrani_at_valora.com>)
• Add support for new Qlogic drivers in mindi (Tehrani Ulrich <ulrich.tehrani_at_valora.com>)

Location:

branches/2.2.7

Files:

• mindi/deplist.txt (modified) (1 diff)
• mindi/mindi (modified) (1 diff)
• mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (3 diffs)

branches/2.2.7/mindi/deplist.txt

@@ -20 +20 @@
 
 #----- Covers a multitude of sins, including XFS, JFS, ReiserFS, and RAID -----
-mkfs mkswap mkswapfs mkfs.swap mkfs.ext2 mke2fs mkfs.vfat mkfs.dos mkdosfs mkvfatfs mkfatfs mkreiserfs mkfs.reiserfs mkfs.reiser mkfs.ext3 mke3fs mkfs.jfs mkfs.xfs mkfs.ocfs2 mkxfs mkjfs mkxfsfs mkjfsfs logdump logredo xchkdmp xchklog xpeek mkpv mkraid raid0run raidhotadd raidhotremove raidsetfaulty raidstart raidstop e2label tune2fs e2fsadm mdadm /etc/mke2fs.conf
+mkfs mkswap mkswapfs mkfs.swap mkfs.ext2 mke2fs mkfs.vfat mkfs.dos mkdosfs mkvfatfs mkfatfs mkreiserfs mkfs.reiserfs mkfs.reiser mkfs.ext3 mke3fs mkfs.jfs mkfs.xfs mkfs.ocfs2 mkxfs mkjfs mkxfsfs mkjfsfs logdump logredo xchkdmp xchklog xpeek mkpv mkraid raid0run raidhotadd raidhotremove raidsetfaulty raidstart raidstop e2label tune2fs e2fsadm mdadm /etc/mke2fs.conf reiserfstune
 fsck fsck.ext2 fsck.reiserfs fsck.reiser fsck.xfs fsck.ext3 fsck.jfs badblocks
 vmkfstools

branches/2.2.7/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 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 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod scsi_transport_sas scsi_transport_spi sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule"
+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 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 raw1394 scsi_debug scsi_mod scsi_transport_sas scsi_transport_spi sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule"
 
 # ide-probe-mod

branches/2.2.7/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

@@ -14 +14 @@
 
     if [ "`echo "$1" | grep -E 'LABEL='`" != "" ] ; then
-        opttun="-L"
+        [ "$format" = "reiserfs" ] && opttun="-l" || opttun="-L"
     elif [ "`echo "$1" | grep -E 'UUID='`" != "" ] ; then
-        opttun="-U"
+        [ "$format" = "reiserfs" ] && opttun="-u" || opttun="-U"
     else
         # Nothing to do
@@ -31 +31 @@
             LogIt "Running $command"
             $command
+        elif [ "$format" = "reiserfs" ]; then
+            command="reiserfstune $opttun $label $mountpt"
+            LogIt "Running $command"
+            $command
         elif [ "$format" = "swap" ] ; then
             if [ "$opttun" = "-U" ]; then
@@ -41 +45 @@
             fi
         else
-            LogIt "I am NOT going to run tune2fs: the partition is format '$format', which doesn't like tune2fs anyway"
+            LogIt "I am NOT going to run tune2fs/reiserfstune: the partition is format '$format', which doesn't like tune2fs/reiserfstune anyway"
         fi
     fi