Changeset 2564


Ignore:
Timestamp:
Feb 1, 2010, 2:12:16 PM (10 years ago)
Author:
bruno
Message:
  • Rename some variables exported to avoid accidental conflict (EXCLUDE_DEVS => MINDI_EXCLUDE_DEVS and ADDITIONAL_BOOT_PARAMS => MINDI_ADDITIONAL_BOOT_PARAMS)
Location:
branches/2.2.9/mindi
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.9/mindi/analyze-my-lvm

    r2555 r2564  
    140140
    141141    rm -f $MINDI_TMP/excludedvgs
    142     if [ "$EXCLUDE_DEVS" ] ; then
    143         for ed in $EXCLUDE_DEVS ; do
     142    if [ "$MINDI_EXCLUDE_DEVS" ] ; then
     143        for ed in $MINDI_EXCLUDE_DEVS ; do
    144144            if  [ "`echo " $list_of_devices" | grep " $ed"`" != "" ]; then
    145145                echo $current_VG >> $MINDI_TMP/excludedvgs
     
    165165        # Skip devices excluded, coming from mondoarchive
    166166        skip=0
    167         if [ "$EXCLUDE_DEVS" ] ; then
    168             for ed in $EXCLUDE_DEVS ; do
     167        if [ "$MINDI_EXCLUDE_DEVS" ] ; then
     168            for ed in $MINDI_EXCLUDE_DEVS ; do
    169169                if  [ "`echo " $d " | grep " $ed"`" != "" ]; then
    170170                    skip=1
     
    184184            for d in `cat $MINDI_TMP/pv.tmp2`; do
    185185                skip=0
    186                 if [ "$EXCLUDE_DEVS" ] ; then
    187                     for ed in $EXCLUDE_DEVS ; do
     186                if [ "$MINDI_EXCLUDE_DEVS" ] ; then
     187                    for ed in $MINDI_EXCLUDE_DEVS ; do
    188188                        if  [ "`echo " $d " | grep " $ed"`" != "" ]; then
    189189                            skip=1
     
    239239        fi
    240240        skip=0
    241         if [ "$EXCLUDE_DEVS" ] ; then
    242             for ed in $EXCLUDE_DEVS ; do
     241        if [ "$MINDI_EXCLUDE_DEVS" ] ; then
     242            for ed in $MINDI_EXCLUDE_DEVS ; do
    243243                if  [ "`echo " $rep " | grep " $ed"`" != "" ]; then
    244244                    skip=1
  • branches/2.2.9/mindi/mindi

    r2560 r2564  
    2020
    2121# 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"
     22MINDI_ADDITIONAL_BOOT_PARAMS="devfs=nomount noresume selinux=0 barrier=off udevtimeout=10"
    2323
    2424MINDI_REV=PBREV
     
    12691269        fi
    12701270        skip=0
    1271         if [ "$EXCLUDE_DEVS" ] ; then
    1272             for d in $EXCLUDE_DEVS ; do
     1271        if [ "$MINDI_EXCLUDE_DEVS" ] ; then
     1272            for d in $MINDI_EXCLUDE_DEVS ; do
    12731273                if  [ "`echo " $current_partition " | grep " $d"`" != "" ]; then
    12741274                    echo "Excluding $current_partition from mountlist (due to excluded device $d)" >> $LOGFILE
     
    16431643        [ "$ooo" = "RESTORE" ] && ooo="nuke"
    16441644        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"
    16461646        else
    16471647            ps="/"
     
    16491649                ps=""
    16501650            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"
    16521652        fi
    16531653        echo -en "$outstr"
     
    24962496        dd if=$tempfile bs=1k 2> /dev/null > ${rdz_fname}.tmp 2> /dev/null
    24972497        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"
    24992499        gzip -c9 ${rdz_fname}.tmp > $rdz_fname
    25002500        rm -f ${rdz_fname}.tmp
     
    28282828        LAST_FILELIST_NUMBER=${12}
    28292829        ESTIMATED_TOTAL_NOOF_SLICES=${13}
    2830         export EXCLUDE_DEVS="${14}"
     2830        export MINDI_EXCLUDE_DEVS="${14}"
    28312831        USE_COMP="${15}"
    28322832        USE_LILO="${16}"
  • branches/2.2.9/mindi/rootfs/sbin/init

    r2562 r2564  
    403403        # Exclude devices we may not want
    404404        rm -f /tmp/restorevgs
    405         for d in $EXCLUDE_DEVS ; do
     405        for d in $MINDI_EXCLUDE_DEVS ; do
    406406            echo " == $d"
    407407            EXCLUDE_VGS=`grep " $d" /tmp/i-want-my-lvm | grep vgcreate | awk '{print $4}'`
     
    745745fi
    746746if [ "`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"
    748748else
    749     export EXCLUDE_DEVS=" "
     749    export MINDI_EXCLUDE_DEVS=" "
    750750fi
    751751
Note: See TracChangeset for help on using the changeset viewer.