Ignore:
Timestamp:
May 7, 2007, 2:07:32 PM (13 years ago)
Author:
Bruno Cornec
Message:
  • Fix a Debian packaging bug
  • Do not use mindi-boot.2880.img (which may not exist) anymore in mondorestore
  • Adds a debuging message for image_devs for mondo
  • Adds some useful log info for debugging at restore time in init
  • Debian stores its optimised libraries in /lib/i686/cmov now. (Andree Leidenfrost)
  • Fix a bug on lsmod | sed. (Andree Leidenfrost). As a consequence, lsmod is not used anymo

re in mindi (except for log). Replaced by /proc/modules. And the MODULES variable is now us
ed to avoid code duplication.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r1350 r1408  
    473473        echo -en "."
    474474        reason=""
    475         vanilla_lib_name=`echo "$optimized_lib_name" | sed s/i[5-7]86// | tr -s '/' '/'`
     475        vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' | tr -s '/' '/'`
    476476        echo "$vanilla_lib_name" >> $filelist
    477477        resolved=$vanilla_lib_name
     
    940940    local module_list module fname oss r kern
    941941    oss="/root/oss/modules"
    942     module_list="`lsmod | sed -n '2,$s/ .*//'`"
     942    module_list="$MODULES"
    943943    # Remove unwanted modules from list
    944944    for i in $DENY_MODS; do
     
    977977            if echo $fname | grep lvm &> /dev/null ; then
    978978                echo "This warning only affects you if you are using LVM." >> $LOGFILE
    979                 if lsmod | grep lvm &> /dev/null ; then
     979                if echo "$MODULES" | grep lvm &> /dev/null ; then
    980980                    echo "I think you are, so please take heed!" >> $LOGFILE
    981981                else
     
    10841084    echo -en "for outerloop in 1 2 3 4 5 ; do\necho -en \".\"\n" >> $outfile
    10851085    # BERLIOS: That code is duplicated - Should be done once only
    1086     list_to_echo="`lsmod | sed -n '2,$s/ .*//'`"
     1086    list_to_echo="$MODULES"
    10871087    # Remove unwanted modules from list
    10881088    for i in $DENY_MODS; do
     
    26962696    fi
    26972697
    2698     lsmod > tmp/original-lsmod.txt
    2699    
    27002698    cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
    27012699    cd $old_pwd
     
    28142812WhichOfTheseModulesAreLoaded() {
    28152813    local modname loaded_modules
    2816     loaded_modules=" `lsmod | tr -s ' ' '\t' | cut -f1 | grep -Fvx "Modules" | tr '\n' ' '` "
     2814    loaded_modules="$MODULES"
    28172815    for modname in $1 ; do
    28182816        [ "`echo "$loaded_modules" | grep -F " $modname "`" ] && echo "$modname"
     
    28692867    Die "MINDI_CACHE undefined"
    28702868fi
    2871 rm -rf $MINDI_CACHE 2> /dev/null
     2869rm -rf $MINDI_CACHE/* 2> /dev/null
    28722870mkdir -p $MINDI_CACHE
    28732871
     
    30373035echo "-------------" >> $LOGFILE
    30383036lsmod >> $LOGFILE
     3037MODULES="`cat /proc/modules | awk '{print $1}'`"
    30393038echo "-------------" >> $LOGFILE
    30403039echo "Liste of extra modules is:" >> $LOGFILE
     
    32883287[ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it.\nGo to http://www.mondorescue.org and download it, then install it."
    32893288
    3290 rm -f $MINDI_CACHE/{*img,*gz,*iso}
    3291 
    32923289PrepareDataDiskImages $MINDI_CACHE
    32933290noof_disks=$?
Note: See TracChangeset for help on using the changeset viewer.