Changeset 2564 in MondoRescue
- Timestamp:
- Feb 1, 2010, 2:12:16 PM (15 years ago)
- Location:
- branches/2.2.9/mindi
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mindi/analyze-my-lvm
r2555 r2564 140 140 141 141 rm -f $MINDI_TMP/excludedvgs 142 if [ "$ EXCLUDE_DEVS" ] ; then143 for ed in $ EXCLUDE_DEVS ; do142 if [ "$MINDI_EXCLUDE_DEVS" ] ; then 143 for ed in $MINDI_EXCLUDE_DEVS ; do 144 144 if [ "`echo " $list_of_devices" | grep " $ed"`" != "" ]; then 145 145 echo $current_VG >> $MINDI_TMP/excludedvgs … … 165 165 # Skip devices excluded, coming from mondoarchive 166 166 skip=0 167 if [ "$ EXCLUDE_DEVS" ] ; then168 for ed in $ EXCLUDE_DEVS ; do167 if [ "$MINDI_EXCLUDE_DEVS" ] ; then 168 for ed in $MINDI_EXCLUDE_DEVS ; do 169 169 if [ "`echo " $d " | grep " $ed"`" != "" ]; then 170 170 skip=1 … … 184 184 for d in `cat $MINDI_TMP/pv.tmp2`; do 185 185 skip=0 186 if [ "$ EXCLUDE_DEVS" ] ; then187 for ed in $ EXCLUDE_DEVS ; do186 if [ "$MINDI_EXCLUDE_DEVS" ] ; then 187 for ed in $MINDI_EXCLUDE_DEVS ; do 188 188 if [ "`echo " $d " | grep " $ed"`" != "" ]; then 189 189 skip=1 … … 239 239 fi 240 240 skip=0 241 if [ "$ EXCLUDE_DEVS" ] ; then242 for ed in $ EXCLUDE_DEVS ; do241 if [ "$MINDI_EXCLUDE_DEVS" ] ; then 242 for ed in $MINDI_EXCLUDE_DEVS ; do 243 243 if [ "`echo " $rep " | grep " $ed"`" != "" ]; then 244 244 skip=1 -
branches/2.2.9/mindi/mindi
r2560 r2564 20 20 21 21 # In case of problem with udev you can try to add udevdebug 22 ADDITIONAL_BOOT_PARAMS="devfs=nomount noresume selinux=0 barrier=off udevtimeout=10"22 MINDI_ADDITIONAL_BOOT_PARAMS="devfs=nomount noresume selinux=0 barrier=off udevtimeout=10" 23 23 24 24 MINDI_REV=PBREV … … 1269 1269 fi 1270 1270 skip=0 1271 if [ "$ EXCLUDE_DEVS" ] ; then1272 for d in $ EXCLUDE_DEVS ; do1271 if [ "$MINDI_EXCLUDE_DEVS" ] ; then 1272 for d in $MINDI_EXCLUDE_DEVS ; do 1273 1273 if [ "`echo " $current_partition " | grep " $d"`" != "" ]; then 1274 1274 echo "Excluding $current_partition from mountlist (due to excluded device $d)" >> $LOGFILE … … 1643 1643 [ "$ooo" = "RESTORE" ] && ooo="nuke" 1644 1644 if [ "$type" = "elilo" ]; then 1645 outstr="image=/vmlinuz\n\tlabel=$i\n\tinitrd=/initrd.img\n\troot=/dev/ram0 append=\" rw ramdisk_size=$ramdisk_size $ooo $ ADDITIONAL_BOOT_PARAMS \"\n"1645 outstr="image=/vmlinuz\n\tlabel=$i\n\tinitrd=/initrd.img\n\troot=/dev/ram0 append=\" rw ramdisk_size=$ramdisk_size $ooo $MINDI_ADDITIONAL_BOOT_PARAMS \"\n" 1646 1646 else 1647 1647 ps="/" … … 1649 1649 ps="" 1650 1650 fi 1651 outstr="label $i\n\tkernel ${ps}vmlinuz\n\tappend initrd=${ps}initrd.img root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo} $ ADDITIONAL_BOOT_PARAMS\n"1651 outstr="label $i\n\tkernel ${ps}vmlinuz\n\tappend initrd=${ps}initrd.img root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo} $MINDI_ADDITIONAL_BOOT_PARAMS\n" 1652 1652 fi 1653 1653 echo -en "$outstr" … … 2496 2496 dd if=$tempfile bs=1k 2> /dev/null > ${rdz_fname}.tmp 2> /dev/null 2497 2497 bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'` 2498 ADDITIONAL_BOOT_PARAMS="$ADDITIONAL_BOOT_PARAMS ramdisk_blocksize=$bs"2498 MINDI_ADDITIONAL_BOOT_PARAMS="$MINDI_ADDITIONAL_BOOT_PARAMS ramdisk_blocksize=$bs" 2499 2499 gzip -c9 ${rdz_fname}.tmp > $rdz_fname 2500 2500 rm -f ${rdz_fname}.tmp … … 2828 2828 LAST_FILELIST_NUMBER=${12} 2829 2829 ESTIMATED_TOTAL_NOOF_SLICES=${13} 2830 export EXCLUDE_DEVS="${14}"2830 export MINDI_EXCLUDE_DEVS="${14}" 2831 2831 USE_COMP="${15}" 2832 2832 USE_LILO="${16}" -
branches/2.2.9/mindi/rootfs/sbin/init
r2562 r2564 403 403 # Exclude devices we may not want 404 404 rm -f /tmp/restorevgs 405 for d in $ EXCLUDE_DEVS ; do405 for d in $MINDI_EXCLUDE_DEVS ; do 406 406 echo " == $d" 407 407 EXCLUDE_VGS=`grep " $d" /tmp/i-want-my-lvm | grep vgcreate | awk '{print $4}'` … … 745 745 fi 746 746 if [ "`grep -i excludedevs /proc/cmdline`" ]; then 747 export EXCLUDE_DEVS="`cat /proc/cmdline | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone"747 export MINDI_EXCLUDE_DEVS="`cat /proc/cmdline | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone" 748 748 else 749 export EXCLUDE_DEVS=" "749 export MINDI_EXCLUDE_DEVS=" " 750 750 fi 751 751
Note:
See TracChangeset
for help on using the changeset viewer.