Changeset 2850 in MondoRescue for branches/2.2.10/mindi/mindi
- Timestamp:
- Jul 24, 2011, 4:12:44 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mindi/mindi
r2830 r2850 57 57 MY_FSTAB=/etc/fstab 58 58 TAPE_MODS="ht st osst ide-tape ide_tape" 59 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 hpsa 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 libiscsi_tcp isp megaraid megaraid_mm megaraid_mbox megaraid_sas mega_sr 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 dc395x diskdumplib scsi_dump_register "59 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 hpsa 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 libiscsi_tcp isp megaraid megaraid_mm megaraid_mbox megaraid_sas mega_sr 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 dc395x diskdumplib scsi_dump_register arcmsr" 60 60 61 61 # ide-probe-mod … … 369 369 echo -e "$DONE" 370 370 return 0 371 elif [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then371 elif [ -e "/etc/console-setup/boottime.kmap.gz" ] || [ -e "/etc/console-setup/cached.kmap.gz" ] ; then 372 372 LogFile "Ubuntu-style config detected." 373 373 mkdir -p $bigdir/tmp 374 echo "/etc/console-setup/boottime.kmap.gz" > $MINDI_CACHE/KEYMAP-LIVES-HERE 374 if [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then 375 kbdfile="/etc/console-setup/boottime.kmap.gz" 376 else 377 kbdfile="/etc/console-setup/cached.kmap.gz" 378 fi 379 echo $kbdfile > $bigdir/tmp/KEYMAP-LIVES-HERE 375 380 KBDEPTH=0 376 381 mkdir -p $bigdir/etc/console-setup 377 cp /etc/console-setup/boottime.kmap.gz$bigdir/etc/console-setup 2>> $LOGFILE382 cp $kbdfile $bigdir/etc/console-setup 2>> $LOGFILE 378 383 echo -e "$DONE" 379 384 return 0 … … 938 943 [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile 939 944 AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-MOUNT netfs-server-mount $outfile 945 AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-USER netfs-server-user $outfile 940 946 AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-PATH netfs-server-path $outfile 947 AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-IPADDR netfs-server-ipaddr $outfile 948 AddFileToCfgIfExists $MINDI_TMP/NETFS-PROTO netfs-proto $outfile 941 949 AddFileToCfgIfExists $MINDI_TMP/NETFS-DEV netfs-dev $outfile 942 950 AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-IPADDR netfs-client-ipaddr $outfile … … 944 952 AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-BROADCAST netfs-client-broadcast $outfile 945 953 AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-DEFGW netfs-client-defgw $outfile 954 AddFileToCfgIfExists $MINDI_TMP/ISO-DEV iso-dev $outfile 955 AddFileToCfgIfExists $MINDI_TMP/ISO-MNT iso-mnt $outfile 956 AddFileToCfgIfExists $MINDI_TMP/ISO-PREFIX iso-prefix $outfile 957 AddFileToCfgIfExists $MINDI_TMP/ISODIR isodir $outfile 946 958 AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.DEVICE bootloader.device $outfile 947 959 AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.NAME bootloader.name $outfile … … 1042 1054 # 1st try, findfs - the RHEL way of finding labels and their partitions 1043 1055 if [ -x "/sbin/findfs" ]; then 1044 actual_dev=`/sbin/findfs LABEL= ${redhat_label}2> /dev/null`1056 actual_dev=`/sbin/findfs LABEL="${redhat_label}" 2> /dev/null` 1045 1057 fi 1046 1058 … … 2137 2149 fi 2138 2150 fi 2139 possible_kernels=`echo "$possible_kernels" | tr -s ' ' '\n' | grep -vi "xen" | sort -u | tr '\n' ' '`2140 noof_kernels=`CountItemsIn "$possible_kernels"`2141 2151 if [ $KERNEL_IS_XEN = "yes" ]; then 2142 2152 possible_xenkernels=`echo "$possible_kernels" | tr -s ' ' '\n' | grep -i "xen" | sort -u | tr '\n' ' '` … … 2144 2154 FindMboot32Binary 2145 2155 fi 2156 possible_kernels=`echo "$possible_kernels" | tr -s ' ' '\n' | grep -vi "xen" | sort -u | tr '\n' ' '` 2157 noof_kernels=`CountItemsIn "$possible_kernels"` 2146 2158 if [ "$noof_kernels" -eq "0" ] ; then 2147 2159 LogAll "Could not find your kernel." … … 2160 2172 if echo $i | grep "$KERVERRUN" ; then 2161 2173 LogAll "OK, I used my initiative and found that " 2162 2174 LogAll "$i is probably your kernel. " 2163 2175 output="$i" 2164 2176 fi … … 2184 2196 else 2185 2197 for i in $possible_xenkernels ; do 2186 if echo $i | grep "$KERVERRUN" ; then2198 if echo $i | grep "$KERVERRUN" ; then 2187 2199 LogIt "OK, I used my initiative and found that " 2188 LogIt "$i is probably your Xen kernel. "2200 LogIt "$i is probably your Xen kernel. " 2189 2201 xenkernelpath="$i" 2190 2202 fi … … 2196 2208 LogIt "Using $xenkernelpath" 2197 2209 else 2198 LogIt "Two or more possible Xen kernels found. You may specify any one of them and the "2210 LogIt "Two or more possible Xen kernels found. You may specify any one of them and the " 2199 2211 LogIt "boot disks will still work, probably. If one does not work, try another." 2200 LogIt "$possible_xenkernels"2212 LogIt "$possible_xenkernels" 2201 2213 echo "" 2202 2214 xenkernelpath=`echo $possible_xenkernels | tr -s ' ' '\n' | head -1` … … 2681 2693 export MONDO_SHARE="" 2682 2694 if [ "$res" = "" ] ; then 2683 MindiExit -1 2695 if [ $KERNEL_IS_XEN = "yes" ]; then 2696 echo "$xenkernelpath" 2697 MindiExit 0 2698 else 2699 MindiExit -1 2700 fi 2684 2701 else 2685 2702 echo "$res"
Note:
See TracChangeset
for help on using the changeset viewer.