Changeset 1902 in MondoRescue for branches/2.2.6/mindi/mindi

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/mindi (modified) (13 diffs)

branches/2.2.6/mindi/mindi

@@ -141 +141 @@
 AddFileToCfgIfExists() {
     [ -e "$1" ] && echo -en "$2 `cat $1`\n" >> $3
-}
-
-
-AddFileToDir() {
-    local filename minidir_root noof_disks diskno res filesize would_occupy zipsize complevel cutoff compressed_fname siz
-    filename=$1
-    minidir_root=$2
-    noof_disks=$3
-
-    diskno=$noof_disks
-    mkdir -p $minidir_root/$diskno
-    [ "$LAST_COMPRESSED_SIZE" = "" ] && LAST_COMPRESSED_SIZE=0
-    if [ ! -e "$filename" ] ; then
-        if [ -h "$filename" ] ; then
-            cp --parents -pRdf $filename $minidir_root/$diskno 2>> $LOGFILE
-            return $noof_disks
-        else
-            Die "AddFileToDir asked me to add $filename, which does not exist. Oops! Did you run out of disk space or is your Linux distro severely broken?"
-        fi
-    fi
-
-    # move to the disk that has room on it (or end up using the last, if all full)
-    while [ "$diskno" -lt $MAX_DISKS ] ; do
-        mkdir -p $minidir_root/$diskno
-        filesize=`du -sk $filename | cut -f1`
-        cp --parents -Rdf $filename $minidir_root/$diskno 2>> $LOGFILE
-        if [ "$filesize" -le "4" ] ; then
-            siz=$filesize
-        elif [ ! -f "$filename" ] ; then
-            siz=0
-        else
-            siz=`grep -m 1 "$filename.gz$" $minidir_root/compressed/compressed.txt | cut -f1`
-            [ "$siz" = "" ] && Die "FIXME - can't find $filename's size."
-            siz=$(($siz-2));# to allow for sectors & the fact that they round up
-        fi
-        [ ! "$siz" ] && siz=4
-        [ "$siz" -lt "0" ] && siz=0
-        LAST_COMPRESSED_SIZE=$(($LAST_COMPRESSED_SIZE+$siz))
-        [ "$LAST_COMPRESSED_SIZE" -le "$MAX_COMPRESSED_SIZE" ] &&return $diskno
-        echo "disk=$diskno siz=$LAST_COMPRESSED_SIZE" >> $LOGFILE
-        LAST_COMPRESSED_SIZE=0
-        rm -f $minidir_root/$diskno/$filename
-        diskno=$(($diskno+1))
-    done
-    return 0 ; # failed
 }
 
@@ -377 +332 @@
     done
     echo $r
-}
-
-
-CreateDataDiskImagesFromTarballs() {
-    local tardir outdir diskno noof_disks kp
-    tardir=$1
-    outdir=$2
-    noof_disks=$3
-
-    mkdir -p $outdir
-    diskno=1
-    echo -en "Creating data disk "
-    while [ "$diskno" -le "$noof_disks" ] ; do
-        echo -en "#$diskno..."
-        cp -f $tardir/$diskno.tar.gz $outdir 2>> $LOGFILE || LogIt "[line 424] Cannot copy $tardir/$diskno.tar.gz to $outdir"
-        CreateOneDataDiskImage $tardir/$diskno.tar.gz $outdir/mindi-data-$diskno.img $diskno $noof_disks
-        diskno=$(($diskno+1))
-    done
-    mv -f $tardir/all.tar.gz $outdir
-    du -sk $outdir/*gz >> $LOGFILE
-    echo -e "$DONE"
-}
-
-
-
-CreateOneDataDiskImage() {
-    local tarball imagefile dev diskno noof_disks mountpoint
-    tarball=$1
-    imagefile=$2
-    diskno=$3
-    noof_disks=$4
-
-    mountpoint=$MINDI_TMP/mountpoint.$$
-    mkdir -p $mountpoint
-    dd if=/dev/zero of=$imagefile bs=1k count=1440 &> /dev/null || LogIt "Cannot dd (CODI)"
-    echo "Creating ext2 filesystem on $imagefile" >> $LOGFILE
-    mke2fs -N 12 -F $imagefile >> $LOGFILE 2>> $LOGFILE || Die "Unable to create an ext2 file system on $imagefile"
-    mount -t ext2 -o loop $imagefile $mountpoint || Die "Can't loopmount $imagefile to $mountpoint! The reason may be missing support for loopfs or ext2 (or both) in the running kernel."
-    mv $tarball $mountpoint/
-    if [ "$?" -ne "0" ] ; then
-        umount $mountpoint
-        rmdir $mountpoint
-        Die "Tarball $tarball is too big for disk! (CODI)\nAdjust mindi_max_compressed_size in your $MINDI_CONFIG"
-    fi
-    [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
-    umount $mountpoint || LogIt "Cannot umount (CODI)"
-    rmdir $mountpoint || LogIt "Cannot rmdir (CODI)"
 }
 
@@ -1604 +1512 @@
 
 
-MoveHyperlinkSensibly() {
-    local filename minidir_root resides_on_diskno noof_disks old_diskno d old_pwd
-    filename=$1
-    minidir_root=$2
-    resides_on_diskno=$3
-    noof_disks=$4
-
-    [ -h "$minidir_root/$resides_on_diskno/$filename" ] || Die "$filename isn't a softlink (or doesn't exist): how can I move it sensibly?"
-
-    old_diskno=$resides_on_diskno
-    d=1
-    while [ "$d" -le "$noof_disks" ] ; do
-        if [ "$d" -ne "$old_diskno" ] ; then
-            old_pwd=`pwd`
-            cd $minidir_root/$old_diskno
-            cp --parents -Rdf $filename $minidir_root/$d/ 2>> $LOGFILE || Die "Can't move $filename (sensibly) from $old_diskno to $d"
-            rm -f $filename
-            cd $old_pwd
-        fi
-# when the softlink is resolvable, our work here is done
-        [ -e "$minidir_root/$d/$filename" ] && return 0
-        old_diskno=$d
-        d=$(($d+1))
-    done
-    return 1
-}
-
-
 OfferToMakeBootableISO() {
     local i old_pwd
@@ -1825 +1705 @@
     fi
     echo -en "."
-}
-
-
-PluralOrNot() {
-    [ "$1" -gt "1" ] && echo -en "s"
 }
 
@@ -2168 +2043 @@
 
 PrepareDataDiskImages() {
-    local needlist bigdir minidir_root tardir diskdir imagesdir res i j k old_pwd lines lfiles
+    local needlist bigdir diskdir imagesdir res i j k old_pwd lines lfiles
 
     imagesdir=$1
-    rm -f $imagesdir/mindi-*.img $imagesdir/[0-9]*.tar.gz $imagesdir/mindi.iso
+    rm -f $imagesdir/mindi.iso
     needlist=$MINDI_TMP/what-we-need.txt
     bigdir=$MINDI_TMP/bigdir
-    minidir_root=$MINDI_TMP/minidir
-    mkdir -p $minidir_root
     mkdir -p $bigdir/usr/bin
-    tardir=$MINDI_TMP/tardir
 
     lfiles="$DEPLIST_FILE"
@@ -2213 +2085 @@
     fi
     if [ "$res" -ne "0" ] ; then
-        Die "You have $res file`PluralOrNot $res` present in dependency list\nbut absent from filesystem."
+        Die "You have $res files present in dependency list\nbut absent from filesystem."
     fi
     FindAndAddUserKeyboardMappingFile
@@ -2263 +2135 @@
     echo -e "$DONE"
     TOTAL_BIGDIR_SIZE=`du -sk $bigdir | cut -f1`
-    SplitDirectoryIntoMinidirs $bigdir $minidir_root
-    noof_disks=$?
-    [ "$noof_disks" -eq "0" ] && Die "Too much stuff!"
     MakeMountlist $MINDI_TMP/mountlist.txt
-    mkdir -p $minidir_root/$noof_disks/tmp
-    cp -f $MINDI_TMP/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt 2> /dev/null || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
+    mkdir -p $bigdir/tmp
+    cp -f $MINDI_TMP/mountlist.txt $bigdir/tmp/mountlist.txt 2> /dev/null || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
     if [ _"$MONDO_SHARE" != _"" ]; then
-        cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
-    fi
-    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false"
-    cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
-    ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
-    CreateDataDiskImagesFromTarballs $tardir $imagesdir $noof_disks
+        cp -f $bigdir/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
+    fi
+    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $bigdir/tmp/i-want-my-lvm || LVM="false"
+    cat $bigdir/tmp/mountlist.txt >> $LOGFILE
+    echo -en "$FILES_IN_FILELIST" > $bigdir/FILES-IN-FILELIST 2> /dev/null
+    echo -en "$LAST_FILELIST_NUMBER" > $bigdir/LAST-FILELIST-NUMBER 2> /dev/null
+    if [ _"$MONDO_SHARE" != _"" ]; then
+        for q in filelist.full.gz biggielist.txt ; do
+            [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
+            cp -pRdf $MINDI_TMP/$q $bigdir/tmp 2>> $LOGFILE
+        done
+    fi
+
+    echo -en "Tarring and zipping the data content..."
+    size_of_all_tools=`du -sk $bigdir | cut -f1`
+    (cd $bigdir ; tar -b 4096 -cf - . 2> /dev/null | gzip -9 > $imagesdir/all.tar.gz)
+    du -sk $imagesdir/*gz >> $LOGFILE
+    echo -e "$DONE"
+
     FRIENDLY_OUTSTRING="Boot and data disk images were created."
-    # One 1.72MB boot disk, one 2.88MB boot disk and $noof_disks data disk images
-    rmdir $tardir $bigdir
+    rm -rf $bigdir
     rm -f $needlist
-    return $noof_disks
 }
 
@@ -2332 +2212 @@
 
 
-RejigHyperlinks() {
-    local minidir_root noof_disks fname path diskno old_pwd awk_loc gawk_loc dir i
-    minidir_root=$1
-    noof_disks=$2
-
-    old_pwd=`pwd`
-    diskno=1
-    while [ "$diskno" -le "$noof_disks" ] ; do
-        mkdir -p $minidir_root/$diskno
-        cd $minidir_root/$diskno
-        for fname in `find -type d -o -print` ; do
-            [ -h "$minidir_root/$diskno/$fname" ] && MoveHyperlinkSensibly $fname $minidir_root $diskno $noof_disks
-        done
-        diskno=$(($diskno+1))
-    done
-
-    cd $old_pwd
-    return
-}
-
-
 ReplaceIndividualLine() {
     local orig_file new_file lino newstring lines_total lines_remaining
@@ -2439 +2298 @@
 
 
-SplitDirectoryIntoMinidirs() {
-    local bigdir minidir_root i noof_disks old_pwd res
-
-    bigdir=$1
-    minidir_root=$2
-    [ "$minidir_root" != "" ] && rm -Rf $minidir_root/*
-
-    TryToFitDataIntoSeveralDirs $bigdir $minidir_root
-    noof_disks=$?
-    if [ "$noof_disks" -eq "0" ] ; then
-        echo "Failed to fit data into several dirs."
-        return 0
-    fi
-    RejigHyperlinks $minidir_root $noof_disks
-    [ "$bigdir" != "" ] && rm -Rf $bigdir/*
-    return $noof_disks
-}
-
 
 StripExecutable()
@@ -2471 +2312 @@
     fi
     rm -f $tmpfile
-}
-
-
-TemporarilyCompressAllFiles() {
-    local i orig_fname out_fname out_list
-
-    i=0
-    out_list=$2/compressed/compressed.txt
-    mkdir -p $2/compressed
-    > $out_list
-    for orig_fname in $1 ; do
-        out_fname=$2/compressed/$orig_fname.gz
-        mkdir -p $out_fname 2> /dev/null
-        rmdir $out_fname 2> /dev/null
-        gzip -c6 $orig_fname > $out_fname 2> /dev/null
-        i=$(((($i+1))%15))
-        [ "$i" -eq "0" ] && echo -en "."
-        du -sk $out_fname >> $out_list
-    done
 }
 
@@ -2587 +2409 @@
     fi
     echo "$output" | tr -s ' ' '\n' | sort -u | tr '\n' ' '
-}
-
-
-TryToFitDataIntoSeveralDirs() {
-    local bigdir minidir_root noof_disks diskno list_of_files filename old_pwd progress
-    local i retval noof_disks total_files list_of_devs
-
-    bigdir=$1
-    minidir_root=$2
-    BIG_CLUNKY_SIZE_COUNTER=0
-    retval=0
-    noof_disks=1
-
-    echo -en "\r                                                                            \rDividing data into several groups..."
-    old_pwd=`pwd`
-    cd $bigdir
-    list_of_files=`GetFileSizeList . | sort -nr | cut -f2 | grep -Fv "/dev/"`
-    progress=0
-    total_files=`CountItemsIn "$list_of_files"`
-    if [ "`echo "$filename" | grep -x "/dev/.*"`" ] ; then
-        filesize=1
-    fi
-    mkdir -p $minidir_root/$noof_disks
-    if [ -e "dev" ] ; then
-        echo "Copying dev/* to $minidir_root/$noof_disks" >> $LOGFILE
-        cp --parents -pRdf dev $minidir_root/$noof_disks 2>> $LOGFILE
-    fi
-    TemporarilyCompressAllFiles "$list_of_files" $minidir_root
-    for filename in $list_of_files ; do
-        AddFileToDir $filename $minidir_root $noof_disks
-        i=$?
-        if [ "$i" -gt "$noof_disks" ] ; then
-            noof_disks=$i
-            echo -en "\r\t\t\t\t\t\t($noof_disks disks)"
-        fi
-        if [ "$i" -eq "0" ] ; then
-            LogIt "Cannot add file $filename to minidir $minidir_root"
-            retval=$(($retval+1))
-        fi
-        progress=$(($progress+1))
-        echo -en "\r\t\t\t\t\t\t\t\t$(($progress*100/$total_files))% complete\r"
-    done
-    cd $old_pwd
-    echo -en "\rThe files have been subdivided into $noof_disks directories.                                                            \r"
-    [ "$minidir_root" != "" ] && rm -Rf $minidir_root/compressed
-    if [ "$retval" -gt "0" ] ; then
-        return 0
-    else
-        return $noof_disks
-    fi
 }
 
@@ -2905 +2677 @@
 }
 
-
-ZipMinidirsIntoTarballs() {
-    local minidir_root tardir noof_disks diskno old_pwd i
-    minidir_root=$1
-    tardir=$2
-    noof_disks=$3
-
-    echo -en "Tarring and zipping the group`PluralOrNot $noof_disks`..."
-    mkdir -p $tardir
-    mkdir -p $minidir_root/all
-    old_pwd=`pwd`
-    diskno=1
-    while [ "$diskno" -le "$noof_disks" ] ; do
-        cd $minidir_root/$diskno || LogIt "WARNING - cannot cd to $minidir_root/$diskno"
-        tar -cf - . 2>> $LOGFILE | gzip -9 > $tardir/$diskno.tar.gz || Die "Can't tar/gzip disk#$diskno; please tell Dev Team -exactly- what the errors where."
-        diskno=$(($diskno+1))
-        echo -n "..."
-        cp -pRdf * $minidir_root/all 2>> $LOGFILE
-    done
-    mkdir -p $minidir_root/all/tmp
-    cd $minidir_root/all
-    size_of_all_tools=`du -sk . | cut -f1`
-    if [ _"$MONDO_SHARE" != _"" ]; then
-        for q in filelist.full.gz biggielist.txt ; do
-            [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
-            cp -pRdf $MINDI_TMP/$q tmp/ 2>> $LOGFILE
-        done
-        mkdir -p $minidir_root/all/tmp
-        echo -en "$FILES_IN_FILELIST" > $minidir_root/all/tmp/FILES-IN-FILELIST 2> /dev/null
-        echo -en "$LAST_FILELIST_NUMBER" > $minidir_root/all/tmp/LAST-FILELIST-NUMBER 2> /dev/null
-    fi
-    tar -b 4096 -cf - * 2> /dev/null | gzip -9 > $tardir/all.tar.gz
-    dd if=/dev/zero bs=1k count=64 >> $imagesdir/all.tar.gz 2> /dev/null
-    [ "`du -sm $imagesdir/all.tar.gz | cut -f1`" -ge "30" ] && Die "You have too many tools in your shed"
-    cd $old_pwd
-    [ "$minidir_root" != "" ] && rm -Rf $minidir_root
-    echo -e "$DONE"
-}
 
 
@@ -3404 +3138 @@
 
 PrepareDataDiskImages $MINDI_CACHE
-noof_disks=$?
 ramdisk_size=$(($size_of_all_tools+$EXTRA_SPACE))
 rds=$(($ramdisk_size-$((ramdisk_size%4096))))