Changeset 3697 in MondoRescue

Timestamp:

Jan 7, 2018, 2:52:31 PM (7 years ago)

Author:

Bruno Cornec

Message:

Remove usage of groovy word to clarify what is done

Location:

branches/3.3/mindi

Files:

• mindi (modified) (2 diffs)
• rootfs/etc/init.d/rcS (modified) (5 diffs)
• rootfs/usr/sbin/find-and-mount-cdrom (modified) (2 diffs)
• rootfs/usr/sbin/install-additional-tools (modified) (1 diff)

branches/3.3/mindi/mindi

@@ -2820 +2820 @@
     tar cf - `cat $MINDI_TMP/perl.lis` 2> $templog | (cd $targetdir ; tar xf -) || LogAll "ERROR: Problem in perl scripts analysis" $templog
 
-    for w in cdrom groovy-stuff ; do
-        mkdir -p mnt/$w
-    done
-
     tar cf - -C / /dev/fd0*[1,2][4,7,8]* 2> $templog | (cd $targetdir ; tar xf -) || LogAll "ERROR: Problem in fd dev analysis" $templog
 
     needed_modules=""
-    list_of_groovy_mods="$CDROM_MODS $FORCE_MODS"
+    list_of_mods="$CDROM_MODS $FORCE_MODS"
 
     if [ -e "$MINDI_TMP/NETFS-SERVER-MOUNT" ] ; then
         # For PXE boot
-        list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
+        list_of_mods="$list_of_mods $NET_MODS"
     fi
     for i in $DENY_MODS; do
         LogFile "INFO: Removing $i from the list of modules to load"
-        list_of_groovy_mods=`echo ${list_of_groovy_mods} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
+        list_of_mods=`echo ${list_of_mods} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
     done
 
@@ -2848 +2844 @@
     [ -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."
     LogAll "INFO: Analyzing kernel modules dependencies..."
-    needed_modules=`mr-kernel-get-modules $mkgmopt $list_of_groovy_mods`
+    needed_modules=`mr-kernel-get-modules $mkgmopt $list_of_mods`
 
     LogFile "INFO: Adding $needed_modules to the rootfs with $mkgmopt"

branches/3.3/mindi/rootfs/etc/init.d/rcS

@@ -155 +155 @@
     local old_pwd res
     old_pwd=`pwd`
-    cd $GROOVY
+    cd $EXTRACTDIR
     [ "$1" != "" ] && tapedev=$1
     [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondorestore.cfg 2>/dev/null | tr -s ' ' ' ' | cut -d' ' -f2`
@@ -244 +244 @@
     # Tape takes some time to appear
     sleep 10
-    cd $GROOVY
+    cd $EXTRACTDIR
     UntarTapeStuff $tapedev
     res=$?
@@ -785 +785 @@
         rm -rf /tmp.old
         mkdir -p /tmp/tmpfs
-        mkdir -p $GROOVY
+        mkdir -p $EXTRACTDIR
     echo "Done."
     LogIt "Successfully mounted dynamic /tmp ramdisk"
@@ -914 +914 @@
 LOGFILE=/var/log/mondorestore.log
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/games
-GROOVY=/tmp/groovy-stuff
+EXTRACTDIR=/tmp/extract
 USER=root
 ARCH=`uname -m`
 
-export PATH GROOVY USER LOGFILE ARCH
+export PATH EXTRACTDIR USER LOGFILE ARCH
 
 mount -o remount,rw /
@@ -939 +939 @@
 mount /sys /sys -t sysfs
 
-[ ! "$GROOVY" ] && Die "I'm not groovy!"
-for i in $GROOVY /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
+for i in $EXTRACTDIR /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
     mkdir -p $i
 done

branches/3.3/mindi/rootfs/usr/sbin/find-and-mount-cdrom

@@ -12 +12 @@
         if [ "`grep "using-cdstream yes" /tmp/mondorestore.cfg 2> /dev/null`" ]; then
             pwd=`pwd`
-            cd $GROOVY
+            cd $EXTRACTDIR
             tar -zxf $device 2> /tmp/mount.log
             res=$?
@@ -65 +65 @@
 
 [ "$1" = "--second-try" ] && SECOND_TRY=yes
-if [ ! "$GROOVY" ] ; then
-    LogIt "I'm not groovy!"
-    exit 1
-fi
 
 TryToFindCDROM

branches/3.3/mindi/rootfs/usr/sbin/install-additional-tools

@@ -12 +12 @@
 LogIt "Starting install-additional-tools"
 
-if [ ! "$GROOVY" ] ; then
-    LogIt "I'm not groovy!"
-    exit 1
-fi
-
-mountdir=$GROOVY
+mountdir=$EXTRACTDIR
 
 if [ $mountdir = "/" ]; then