Changeset 1902 in MondoRescue for branches/2.2.6/mindi/rootfs/sbin/install-additional-tools

Timestamp:

Apr 9, 2008, 12:05:24 AM (16 years ago)

Author:

Bruno Cornec

Message:

mindi simplification, by not managing multiple data disks anymore

File:

• branches/2.2.6/mindi/rootfs/sbin/install-additional-tools (modified) (1 diff)

branches/2.2.6/mindi/rootfs/sbin/install-additional-tools

@@ -20 +20 @@
 mountdir=$GROOVY
 # Should be the same as in mindi => conf param
-MAX_DISKS=99
 mkdir -p $mountdir
-diskno=1
 res=0
 if [ -e "/tmp/TAPEDEV-HAS-DATA-DISKS" ] ; then
     LogIt "I am assuming the data disks' contents are already in $mountdir."
 else
-    while [ "$diskno" -lt "$MAX_DISKS" ] ; do
-        LogIt "PLEASE WAIT. Untarring disk #$diskno" 2
-        untar $diskno $mountdir
-        res=$(($res+$?))
-        [ -e "/LAST-DISK" ] && diskno=999
-        diskno=$(($diskno+1))
-        [ -e "/tmp/CDROM-LIVES-HERE" ] && [ ! -f "/mnt/cdrom/images/$diskno.tar.gz" ] && break
-    done
+    LogIt "PLEASE WAIT. Untarring data content" 2
+
+    mountpoint=/dev/null
+    [ -e "/tmp/CDROM-LIVES-HERE" ] && mountpoint=/mnt/cdrom/images
+    tarball=$mountpoint/all.tar.gz
+    if [ -e "/tmp/CDROM-LIVES-HERE" ] ; then
+        [ -e "$tarball" ] || LogIt "Can't find CD's $tarball" 1
+    fi
+
+    old_pwd=`pwd`
+    cd $mountdir
+    counter=0
+    for fname in `tar -zxvf $tarball` ; do
+     counter=$(($counter+1))
+        [ "$(($counter % 4))" -eq "0" ] && echo -en "\r\t\t\t\t\t\t\t\\"
+        [ "$(($counter % 4))" -eq "1" ] && echo -en "\r\t\t\t\t\t\t\t|"
+        [ "$(($counter % 4))" -eq "2" ] && echo -en "\r\t\t\t\t\t\t\t/"
+        [ "$(($counter % 4))" -eq "3" ] && echo -en "\r\t\t\t\t\t\t\t-"
+    done
+    cd $old_pwd
+    echo -e -n "\r"
+    [ ! -e "/tmp/CDROM-LIVES-HERE" ] && umount $mountpoint
+    sleep 1
 fi
-rm -f /LAST-DISK
 
 LogIt "Recombining large files..." 1