Changeset 2605


Ignore:
Timestamp:
Mar 22, 2010, 1:56:38 PM (10 years ago)
Author:
bruno
Message:

r3761@localhost: bruno | 2010-03-18 01:37:30 +0100

  • Removal of useless mindi functions
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/mindi

    r2604 r2605  
    156156    LogFile "Added kbd map $mappath"
    157157    if [ ! -e "$mappath" ] ; then
    158             mappath=`grep "i[3-8]86" $MINDI_TMP/keymaps.find | grep "$locale[^r][^/]" | grep -vx " *#.*"`
     158        mappath=`grep "i[3-8]86" $MINDI_TMP/keymaps.find | grep "$locale[^r][^/]" | grep -vx " *#.*"`
    159159        if [ ! -e "$mappath" ] ; then
    160160            LogAll "Cannot add $mappath: kbd map file not found"
     
    602602
    603603
    604 GetHomeDir() {
    605     local res loc
    606     loc=`which $1 2>/dev/null`
    607     res=`file $loc | $AWK '{print $NF;}'`
    608     dirname $res
    609 }
    610 
    611 
    612604# Check kernel filesystem capabilites for accessing initrd image
    613605# Could be ext2 FS (old mode) or initramfs (new mode)
     
    672664
    673665}
    674 
    675 # Searches parent raid device of given disk device
    676 # $1: disk device (i.e. /dev/hda1)
    677 GetParentRaidDev() {
    678     $AWK "/^[[:space:]]*#/ {next} /^[[:space:]]*raiddev/ {dev=\$2} /^[[:space:]]*device/ {if(\$2==\"$1\") {print dev; exit}}" < /etc/raidtab
    679 }
    680 
    681666
    682667# Searches members of raid device
     
    13291314}
    13301315
    1331 MakeSureNumberIsInteger() {
    1332     res=`echo "$1" | tr -s '\-[0-9]' ' '`
    1333     if [ "$res" != " " ] && [ "$res" != "" ] ; then
    1334     echo "result = '$res'"
    1335         Die "$1 should be an integer"
    1336     fi
    1337 }
    1338 
    1339 
    13401316OfferToMakeBootableISO() {
    13411317    local i old_pwd
     
    19921968    fi
    19931969}
    1994 
    1995 
    1996 StripComments()
    1997 {
    1998     local tempfile
    1999 
    2000     tempfile=$MINDI_TMP/$$.strip.txt
    2001     cp -f $1 $tempfile 2>> $LOGFILE
    2002     $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' $tempfile > $1
    2003     rm -f $tempfile
    2004     LogFile "Stripped comments from $2"
    2005 }
    2006 
    20071970
    20081971
     
    24042367LogFile "-----------------------------"
    24052368
     2369# TODO: Remove that
    24062370[ -e "/sbin/mkdosfs" ] && [ ! -e "/sbin/mkfs.vfat" ] && ln -sf /sbin/mkdosfs /sbin/mkfs.vfat
    24072371
    24082372# Log some capital variables
    24092373[ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."
     2374[ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
    24102375LogFile "MONDO_SHARE = $MONDO_SHARE"
    24112376LogFile "MINDI_DATA = $MINDI_DATA"
    24122377LogFile "MINDI_SBIN = $MINDI_SBIN"
    2413 [ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
    24142378LogFile "MINDI_CONF = $MINDI_CONF"
    24152379if [ -f $MINDI_CONFIG ]; then
     
    24522416fi
    24532417
    2454 ### BERLIOS
     2418### TODO
    24552419### Fix as it's not mandatory on ia64
    24562420if [ "$ARCH" = "ia64" ] ; then
Note: See TracChangeset for help on using the changeset viewer.