Changeset 2605 in MondoRescue for branches/2.2.10/mindi/mindi

Timestamp:

Mar 22, 2010, 1:56:38 PM (14 years ago)

Author:

Bruno Cornec

Message:

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

• Removal of useless mindi functions

File:

• branches/2.2.10/mindi/mindi (modified) (7 diffs)

branches/2.2.10/mindi/mindi

@@ -156 +156 @@
     LogFile "Added kbd map $mappath" 
     if [ ! -e "$mappath" ] ; then
-            mappath=`grep "i[3-8]86" $MINDI_TMP/keymaps.find | grep "$locale[^r][^/]" | grep -vx " *#.*"`
+        mappath=`grep "i[3-8]86" $MINDI_TMP/keymaps.find | grep "$locale[^r][^/]" | grep -vx " *#.*"`
         if [ ! -e "$mappath" ] ; then
             LogAll "Cannot add $mappath: kbd map file not found"
@@ -602 +602 @@
 
 
-GetHomeDir() {
-    local res loc
-    loc=`which $1 2>/dev/null`
-    res=`file $loc | $AWK '{print $NF;}'`
-    dirname $res
-}
-
-
 # Check kernel filesystem capabilites for accessing initrd image
 # Could be ext2 FS (old mode) or initramfs (new mode)
@@ -672 +664 @@
 
 }
-
-# Searches parent raid device of given disk device
-# $1: disk device (i.e. /dev/hda1)
-GetParentRaidDev() {
-    $AWK "/^[[:space:]]*#/ {next} /^[[:space:]]*raiddev/ {dev=\$2} /^[[:space:]]*device/ {if(\$2==\"$1\") {print dev; exit}}" < /etc/raidtab
-}
-
 
 # Searches members of raid device
@@ -1329 +1314 @@
 }
 
-MakeSureNumberIsInteger() {
-    res=`echo "$1" | tr -s '\-[0-9]' ' '`
-    if [ "$res" != " " ] && [ "$res" != "" ] ; then
-    echo "result = '$res'"
-        Die "$1 should be an integer"
-    fi
-}
-
-
 OfferToMakeBootableISO() {
     local i old_pwd
@@ -1992 +1968 @@
     fi
 }
-
-
-StripComments()
-{
-    local tempfile
-
-    tempfile=$MINDI_TMP/$$.strip.txt
-    cp -f $1 $tempfile 2>> $LOGFILE
-    $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' $tempfile > $1
-    rm -f $tempfile
-    LogFile "Stripped comments from $2" 
-}
-
 
 
@@ -2404 +2367 @@
 LogFile "-----------------------------" 
 
+# TODO: Remove that 
 [ -e "/sbin/mkdosfs" ] && [ ! -e "/sbin/mkfs.vfat" ] && ln -sf /sbin/mkdosfs /sbin/mkfs.vfat
 
 # Log some capital variables
 [ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."
+[ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
 LogFile "MONDO_SHARE = $MONDO_SHARE" 
 LogFile "MINDI_DATA = $MINDI_DATA" 
 LogFile "MINDI_SBIN = $MINDI_SBIN" 
-[ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
 LogFile "MINDI_CONF = $MINDI_CONF" 
 if [ -f $MINDI_CONFIG ]; then
@@ -2452 +2416 @@
 fi
 
-### BERLIOS
+### TODO
 ### Fix as it's not mandatory on ia64
 if [ "$ARCH" = "ia64" ] ; then