Changeset 1989 in MondoRescue for branches/2.2.7

Timestamp:

Jun 22, 2008, 10:17:59 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Rwmove ChopUpAndCopyFile in mindi
• mindi doesn't use slices anymore (no need as no floppy anymore)
• Removal of sone useless scripts under restore-scripts/mondo

Location:

branches/2.2.7

Files:

• mindi/install.sh (modified) (2 diffs)
• mindi/mindi (modified) (6 diffs)
• mindi/rootfs/sbin/install-additional-tools (modified) (1 diff)
• mindi/rootfs/sbin/post-init (modified) (1 diff)
• mondo/configure.in (modified) (1 diff)
• mondo/src/restore-scripts/Makefile.am (modified) (1 diff)
• mondo/src/restore-scripts/mondo/ISO (deleted)
• mondo/src/restore-scripts/mondo/Makefile.am (modified) (1 diff)
• mondo/src/restore-scripts/mondo/ask-me-a-question (deleted)
• mondo/src/restore-scripts/mondo/compare-subroutine-me (deleted)
• mondo/src/restore-scripts/mondo/edit-mountlist (deleted)
• mondo/src/restore-scripts/mondo/restore-bigfiles-from-iso (deleted)
• mondo/src/restore-scripts/usr (deleted)

branches/2.2.7/mindi/install.sh

@@ -69 +69 @@
 
 echo "Creating target directories ..."
-install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $CACHEDIR # $DOCDIR 
+install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $CACHEDIR
 
 echo "Copying files ..."
@@ -112 +112 @@
 fi
 
-# Special case for SuSE family where doc is put elsewhere in the RPM
-# if [ -e /etc/SuSE-release ]; then
-    # rm -rf $DOCDIR
-# fi
-
-# Special case for Debian family where doc is put elsewhere in the DEB
-# if [ -e /etc/debian_version ]; then
-    # rm -rf $DOCDIR
-# fi
-
 exit 0

branches/2.2.7/mindi/mindi

@@ -160 +160 @@
 
 
-ChopUpAndCopyFile() {
-    local filename slicesize outdir res biggienumber filesize sliceno noof_slices testfile scratchfile
-    filename=$1
-    outdir=$2
-    slicesize=$3
-    biggienumber=$4
-
-    [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend $DEPLIST_FILE accordingly."
-    mkdir -p $outdir
-
-    sliceno=0
-    scratchfile=$MINDI_TMP/blah.$$.dat
-    cp -f $filename $scratchfile 2>> $LOGFILE || Die "CUACF -- cannot copy $filename to $scratchfile - did you run out of disk space?"
-    [ "`head $scratchfile -n1 | grep -F "bin/sh"`" != "" ] && StripComments $scratchfile "-$filename-"
-    [ "`echo "$filename" | grep -F "etc/termcap"`" != "" ] && StripComments $scratchfile "-$filename-"
-
-    # Uncompress modules only if not using udevd
-    if [ "`echo "$filename" | grep -F "lib/modules/" | grep "\.*o\.gz"`" != "" ] && [ "`ps auxww | grep -v grep | grep -qw udevd`" != "" ]; then
-        mv $scratchfile $scratchfile.gz
-        gunzip -f $scratchfile || LogIt "Cannot gunzip $scratchfile.gz"
-        filename=`echo "$filename" | tr '.' '#' | sed s/#o#gz/#o/ | sed s/#ko#gz/#ko/ | tr '#' '.'`
-    fi
-    filesize=`du -sk $scratchfile | cut -f1`
-    noof_slices=$(($filesize/$slicesize))
-    echo "$filename" > $outdir/slice-$biggienumber.name
-    echo "$filesize" > $outdir/slice-$biggienumber.size
-    [ -x "$scratchfile" ] && StripExecutable $scratchfile "-$filename-"
-    while [ "$sliceno" -le "$noof_slices" ] ; do
-        dd if=$scratchfile skip=$(($sliceno*$slicesize)) of=$outdir/slice-$biggienumber.`printf "%03d" $sliceno` bs=1k count=$slicesize &> /dev/null
-        sliceno=$(($sliceno+1))
-    done
-    rm -f $scratchfile
-}
-
-
 CopyDependenciesToDirectory() {
-    local outdir incoming fname filesize counter d found
+    local outdir incoming fname counter d found
     outdir=$1
     mkdir -p $outdir
@@ -218 +183 @@
             find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir
         elif [ -e "$incoming" ] && [ $found = "false" ]; then
-            filesize=`du -sk $incoming | cut -f1`
-            if [ "$filesize" -gt "$(($CHOPSIZE*2))" ] && [ ! -h "$incoming" ] ; then
-                ChopUpAndCopyFile $incoming $outdir $CHOPSIZE $BIGNO
-                BIGNO=$(($BIGNO+1))
-            else
-                tar cf - $incoming 2> /dev/null | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
-    
-                # Only uncompress modules if not using udevd
-                if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] && [ "`ps auxww | grep -v grep | grep -qw udevd`" != "" ]; then
-                    gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming"
-                fi
-                [ -x "$outdir" ] && StripExecutable $outdir "-$filename-"
+            tar cf - $incoming 2> /dev/null | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
+
+            # Only uncompress modules if not using udevd
+            if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] && [ "`ps auxww | grep -v grep | grep -qw udevd`" != "" ]; then
+                gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming"
             fi
+            [ -x "$outdir" ] && StripExecutable $outdir "-$filename-"
             counter=$(($counter+1))
             if [ "$counter" -ge "5" ] ; then
@@ -1808 +1767 @@
         for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
             tar cf - ./$i 2>> $LOGFILE | (cd $bigdir ; tar xf -) || Die "PDDI can't copy $i->$bigdir"
-            if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
-                tar cf - $i 2>> $LOGFILE | (cd $bigdir ; tar xf -)
-            else
-                ChopUpAndCopyFile $i $bigdir $CHOPSIZE $BIGNO
-                BIGNO=$(($BIGNO+1))
-            fi
         done
         for i in $EXTRA_MODS ; do
@@ -1819 +1772 @@
             [ ! "$j" ] && echo "WARNING - cannot find failsafe module $i.o.gz" >> $LOGFILE
             for k in $j ; do
-                if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
-                    tar cf - $k 2>> $LOGFILE | (cd $bigdir ; tar xf -)
-                else
-                    ChopUpAndCopyFile $k $bigdir $CHOPSIZE $BIGNO
-                    BIGNO=$(($BIGNO+1))
-                fi
+                tar cf - $k 2>> $LOGFILE | (cd $bigdir ; tar xf -)
                 echo "Added failsafe module $k to ramdisk" >> $LOGFILE
             done
@@ -2484 +2432 @@
 trap "Aborted" SIGTERM
 DONE="\r\t\t\t\t\t\t\t\tDone.         "
-CHOPSIZE=240
-BIGNO=0
-MAX_COMPRESSED_SIZE=1300
 kernelpath=""
 MONDO_ROOT=/var/cache/mondo
@@ -2559 +2504 @@
 fi
 
-if [ "$#" -ge "2" ] ; then
-    if [ "$1" = "--max-compressed-size" ] ; then
-        MAX_COMPRESSED_SIZE=$2
-        shift; shift
-    fi
-fi
-
 FLOPPY_WAS_MOUNTED=""
 for mtpt in /media/floppy /mnt/floppy /floppy ; do

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

@@ -50 +50 @@
 fi
 
-LogIt "Recombining large files..." 1
-biggienumber=0
-while [ -e "$mountdir/slice-$biggienumber.name" ] ; do
-    stub=$mountdir/slice-$biggienumber
-    biggiefname=`cat $stub.name`
-    if [ -f $biggiefname ]; then
-        LogIt "$biggiefname already exists - skipped" 1
-        biggienumber=$(($biggienumber+1))
-        continue
-    fi
-    biggiefsize=`cat $stub.size`
-    rm -f $stub.name $stub.size
-    > /tmp/out.dat
-    sliceno=0
-    while [ "$sliceno" -le "999" ] ; do
-        slicefile=$stub.
-        [ "$sliceno" -lt "100" ] && slicefile="$slicefile"0
-        [ "$sliceno" -lt "10" ]  && slicefile="$slicefile"0
-        slicefile="$slicefile"$sliceno
-        [ ! -e "$slicefile" ] && break
-        cat $slicefile >> /tmp/out.dat
-        rm -f $slicefile
-        sliceno=$(($sliceno+1))
-        done
-
-    LogIt "$biggiefname ($biggiefsize KB) restored. $sliceno slices." 1
-
-    mkdir -p $biggiefname
-    rmdir $biggiefname 2> /dev/null
-    chmod +x /tmp/out.dat
-    cp -f /tmp/out.dat $biggiefname
-    rm -f /tmp/out.dat
-    biggienumber=$(($biggienumber+1))
-done
-rm -f /slice*
-
 LogIt "Populating / with tar file content..." 1
 

branches/2.2.7/mindi/rootfs/sbin/post-init

@@ -151 +151 @@
         if which mondorestore > /dev/null 2> /dev/null ; then
             LogIt "Type 'mondorestore' to begin the restore/compare process." 1
-            loc=`which ISO 2> /dev/null`
         fi
     fi

branches/2.2.7/mondo/configure.in

@@ -120 +120 @@
 AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr mkdtemp])
 
-AC_OUTPUT([Makefile src/Makefile src/common/Makefile src/mondoarchive/Makefile src/mondorestore/Makefile src/restore-scripts/Makefile src/restore-scripts/mondo/Makefile src/restore-scripts/usr/Makefile src/restore-scripts/usr/bin/Makefile src/post-nuke.sample/Makefile src/post-nuke.sample/usr/Makefile src/post-nuke.sample/usr/bin/Makefile])
+AC_OUTPUT([Makefile src/Makefile src/common/Makefile src/mondoarchive/Makefile src/mondorestore/Makefile src/restore-scripts/Makefile src/restore-scripts/mondo/Makefile src/post-nuke.sample/Makefile src/post-nuke.sample/usr/Makefile src/post-nuke.sample/usr/bin/Makefile])

branches/2.2.7/mondo/src/restore-scripts/Makefile.am

@@ -1 @@
-SUBDIRS = mondo usr
+SUBDIRS = mondo
 
 restoreetcdir       = $(pkgdatadir)/restore-scripts/etc

branches/2.2.7/mondo/src/restore-scripts/mondo/Makefile.am

@@ -1 +1 @@
 restoremondodir = $(pkgdatadir)/restore-scripts/mondo
-restoremondo_SCRIPTS = ISO ask-me-a-question compare-subroutine-me \
-                        edit-mountlist grub-MR hack-fstab hack-grub hack-lilo hack-elilo \
+restoremondo_SCRIPTS = grub-MR hack-fstab hack-grub hack-lilo hack-elilo \
                         label-partitions-as-necessary \
                         make-me-bootable mount-me mount-subroutine-me raw-MR \
-                        restore-bigfiles-from-iso stabgrub-me stablilo-me stabelilo-me \
+                        stabgrub-me stablilo-me stabelilo-me \
                         stabraw-me unmount-me unmount-subroutine-me
                         format-and-kludge-vfat