Changeset 3697


Ignore:
Timestamp:
Jan 7, 2018, 2:52:31 PM (7 months ago)
Author:
bruno
Message:

Remove usage of groovy word to clarify what is done

Location:
branches/3.3/mindi
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3/mindi/mindi

    r3693 r3697  
    28202820    tar cf - `cat $MINDI_TMP/perl.lis` 2> $templog | (cd $targetdir ; tar xf -) || LogAll "ERROR: Problem in perl scripts analysis" $templog
    28212821
    2822     for w in cdrom groovy-stuff ; do
    2823         mkdir -p mnt/$w
    2824     done
    2825 
    28262822    tar cf - -C / /dev/fd0*[1,2][4,7,8]* 2> $templog | (cd $targetdir ; tar xf -) || LogAll "ERROR: Problem in fd dev analysis" $templog
    28272823
    28282824    needed_modules=""
    2829     list_of_groovy_mods="$CDROM_MODS $FORCE_MODS"
     2825    list_of_mods="$CDROM_MODS $FORCE_MODS"
    28302826
    28312827    if [ -e "$MINDI_TMP/NETFS-SERVER-MOUNT" ] ; then
    28322828        # For PXE boot
    2833         list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
     2829        list_of_mods="$list_of_mods $NET_MODS"
    28342830    fi
    28352831    for i in $DENY_MODS; do
    28362832        LogFile "INFO: Removing $i from the list of modules to load"
    2837         list_of_groovy_mods=`echo ${list_of_groovy_mods} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
     2833        list_of_mods=`echo ${list_of_mods} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
    28382834    done
    28392835
     
    28482844    [ -e "/$needed_modules_path" ] || LogAll "WARNING: path $needed_modules_path does not exist.\n         If you're not using a modular kernel then mindi won't probably work."
    28492845    LogAll "INFO: Analyzing kernel modules dependencies..."
    2850     needed_modules=`mr-kernel-get-modules $mkgmopt $list_of_groovy_mods`
     2846    needed_modules=`mr-kernel-get-modules $mkgmopt $list_of_mods`
    28512847
    28522848    LogFile "INFO: Adding $needed_modules to the rootfs with $mkgmopt"
  • branches/3.3/mindi/rootfs/etc/init.d/rcS

    r3661 r3697  
    155155    local old_pwd res
    156156    old_pwd=`pwd`
    157     cd $GROOVY
     157    cd $EXTRACTDIR
    158158    [ "$1" != "" ] && tapedev=$1
    159159    [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondorestore.cfg 2>/dev/null | tr -s ' ' ' ' | cut -d' ' -f2`
     
    244244    # Tape takes some time to appear
    245245    sleep 10
    246     cd $GROOVY
     246    cd $EXTRACTDIR
    247247    UntarTapeStuff $tapedev
    248248    res=$?
     
    785785        rm -rf /tmp.old
    786786        mkdir -p /tmp/tmpfs
    787         mkdir -p $GROOVY
     787        mkdir -p $EXTRACTDIR
    788788    echo "Done."
    789789    LogIt "Successfully mounted dynamic /tmp ramdisk"
     
    914914LOGFILE=/var/log/mondorestore.log
    915915PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/games
    916 GROOVY=/tmp/groovy-stuff
     916EXTRACTDIR=/tmp/extract
    917917USER=root
    918918ARCH=`uname -m`
    919919
    920 export PATH GROOVY USER LOGFILE ARCH
     920export PATH EXTRACTDIR USER LOGFILE ARCH
    921921
    922922mount -o remount,rw /
     
    939939mount /sys /sys -t sysfs
    940940
    941 [ ! "$GROOVY" ] && Die "I'm not groovy!"
    942 for i in $GROOVY /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
     941for i in $EXTRACTDIR /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
    943942    mkdir -p $i
    944943done
  • branches/3.3/mindi/rootfs/usr/sbin/find-and-mount-cdrom

    r3359 r3697  
    1212        if [ "`grep "using-cdstream yes" /tmp/mondorestore.cfg 2> /dev/null`" ]; then
    1313            pwd=`pwd`
    14             cd $GROOVY
     14            cd $EXTRACTDIR
    1515            tar -zxf $device 2> /tmp/mount.log
    1616            res=$?
     
    6565
    6666[ "$1" = "--second-try" ] && SECOND_TRY=yes
    67 if [ ! "$GROOVY" ] ; then
    68     LogIt "I'm not groovy!"
    69     exit 1
    70 fi
    7167
    7268TryToFindCDROM
  • branches/3.3/mindi/rootfs/usr/sbin/install-additional-tools

    r3216 r3697  
    1212LogIt "Starting install-additional-tools"
    1313
    14 if [ ! "$GROOVY" ] ; then
    15     LogIt "I'm not groovy!"
    16     exit 1
    17 fi
    18 
    19 mountdir=$GROOVY
     14mountdir=$EXTRACTDIR
    2015
    2116if [ $mountdir = "/" ]; then
Note: See TracChangeset for help on using the changeset viewer.