Changeset 1904 in MondoRescue


Ignore:
Timestamp:
Apr 10, 2008, 1:20:42 AM (16 years ago)
Author:
Bruno Cornec
Message:

merge -r 1889:1902 ​svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue/branches/2.2.6

Location:
branches/stable
Files:
2 deleted
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/stable/mindi/deplist.txt

    r1842 r1904  
    1515fstab raidtab modules.conf conf.modules mondorestore modules.conf.local
    1616/etc/mdadm/mdadm.conf /etc/mdadm.conf
     17/sbin/ldconfig
    1718afio star ntfsclone parted ms-sys file getfattr setfattr getfacl setfacl
    1819buffer
    … …  
    4445
    4546# For Debug  mode
    46 # gdb
     47# gdb valgrind /usr/lib/valgrind
    4748
    4849#----------------- For all you LVM users out there, much love -----------------

  • branches/stable/mindi/mindi

    r1903 r1904  
    147147
    148148
    149 AddFileToDir() {
    150     local filename minidir_root noof_disks diskno res filesize would_occupy zipsize complevel cutoff compressed_fname siz
    151     filename=$1
    152     minidir_root=$2
    153     noof_disks=$3
    154 
    155     diskno=$noof_disks
    156     mkdir -p $minidir_root/$diskno
    157     [ "$LAST_COMPRESSED_SIZE" = "" ] && LAST_COMPRESSED_SIZE=0
    158     if [ ! -e "$filename" ] ; then
    159         if [ -h "$filename" ] ; then
    160             cp --parents -pRdf $filename $minidir_root/$diskno 2>> $LOGFILE
    161             return $noof_disks
    162         else
    163             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?"
    164         fi
    165     fi
    166 
    167     # move to the disk that has room on it (or end up using the last, if all full)
    168     while [ "$diskno" -lt $MAX_DISKS ] ; do
    169         mkdir -p $minidir_root/$diskno
    170         filesize=`du -sk $filename | cut -f1`
    171         cp --parents -Rdf $filename $minidir_root/$diskno 2>> $LOGFILE
    172         if [ "$filesize" -le "4" ] ; then
    173             siz=$filesize
    174         elif [ ! -f "$filename" ] ; then
    175             siz=0
    176         else
    177             siz=`grep -m 1 "$filename.gz$" $minidir_root/compressed/compressed.txt | cut -f1`
    178             [ "$siz" = "" ] && Die "FIXME - can't find $filename's size."
    179             siz=$(($siz-2));# to allow for sectors & the fact that they round up
    180         fi
    181         [ ! "$siz" ] && siz=4
    182         [ "$siz" -lt "0" ] && siz=0
    183         LAST_COMPRESSED_SIZE=$(($LAST_COMPRESSED_SIZE+$siz))
    184         [ "$LAST_COMPRESSED_SIZE" -le "$MAX_COMPRESSED_SIZE" ] &&return $diskno
    185         echo "disk=$diskno siz=$LAST_COMPRESSED_SIZE" >> $LOGFILE
    186         LAST_COMPRESSED_SIZE=0
    187         rm -f $minidir_root/$diskno/$filename
    188         diskno=$(($diskno+1))
    189     done
    190     return 0 ; # failed
    191 }
    192 
    193 
    194149AddKeyboardMappingFile() {
    195150    local mappath r included_list included_item i res ii sss
    … …  
    380335    done
    381336    echo $r
    382 }
    383 
    384 
    385 CreateDataDiskImagesFromTarballs() {
    386     local tardir outdir diskno noof_disks kp
    387     tardir=$1
    388     outdir=$2
    389     noof_disks=$3
    390 
    391     mkdir -p $outdir
    392     diskno=1
    393     echo -en "Creating data disk "
    394     while [ "$diskno" -le "$noof_disks" ] ; do
    395         echo -en "#$diskno..."
    396         cp -f $tardir/$diskno.tar.gz $outdir 2>> $LOGFILE || LogIt "[line 424] Cannot copy $tardir/$diskno.tar.gz to $outdir"
    397         CreateOneDataDiskImage $tardir/$diskno.tar.gz $outdir/mindi-data-$diskno.img $diskno $noof_disks
    398         diskno=$(($diskno+1))
    399     done
    400     mv -f $tardir/all.tar.gz $outdir
    401     du -sk $outdir/*gz >> $LOGFILE
    402     echo -e "$DONE"
    403 }
    404 
    405 
    406 
    407 CreateOneDataDiskImage() {
    408     local tarball imagefile dev diskno noof_disks mountpoint
    409     tarball=$1
    410     imagefile=$2
    411     diskno=$3
    412     noof_disks=$4
    413 
    414     mountpoint=$MINDI_TMP/mountpoint.$$
    415     mkdir -p $mountpoint
    416     dd if=/dev/zero of=$imagefile bs=1k count=1440 &> /dev/null || LogIt "Cannot dd (CODI)"
    417     echo "Creating ext2 filesystem on $imagefile" >> $LOGFILE
    418     mke2fs -N 12 -F $imagefile >> $LOGFILE 2>> $LOGFILE || Die "Unable to create an ext2 file system on $imagefile"
    419     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."
    420     mv $tarball $mountpoint/
    421     if [ "$?" -ne "0" ] ; then
    422         umount $mountpoint
    423         rmdir $mountpoint
    424         Die "Tarball $tarball is too big for disk! (CODI)\nAdjust mindi_max_compressed_size in your $MINDI_CONFIG"
    425     fi
    426     [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
    427     umount $mountpoint || LogIt "Cannot umount (CODI)"
    428     rmdir $mountpoint || LogIt "Cannot rmdir (CODI)"
    429337}
    430338
    … …  
    15631471
    15641472
    1565 MoveHyperlinkSensibly() {
    1566     local filename minidir_root resides_on_diskno noof_disks old_diskno d old_pwd
    1567     filename=$1
    1568     minidir_root=$2
    1569     resides_on_diskno=$3
    1570     noof_disks=$4
    1571 
    1572     [ -h "$minidir_root/$resides_on_diskno/$filename" ] || Die "$filename isn't a softlink (or doesn't exist): how can I move it sensibly?"
    1573 
    1574     old_diskno=$resides_on_diskno
    1575     d=1
    1576     while [ "$d" -le "$noof_disks" ] ; do
    1577         if [ "$d" -ne "$old_diskno" ] ; then
    1578             old_pwd=`pwd`
    1579             cd $minidir_root/$old_diskno
    1580             cp --parents -Rdf $filename $minidir_root/$d/ 2>> $LOGFILE || Die "Can't move $filename (sensibly) from $old_diskno to $d"
    1581             rm -f $filename
    1582             cd $old_pwd
    1583         fi
    1584 # when the softlink is resolvable, our work here is done
    1585         [ -e "$minidir_root/$d/$filename" ] && return 0
    1586         old_diskno=$d
    1587         d=$(($d+1))
    1588     done
    1589     return 1
    1590 }
    1591 
    1592 
    15931473OfferToMakeBootableISO() {
    15941474    local i old_pwd
    … …  
    17841664    fi
    17851665    echo -en "."
    1786 }
    1787 
    1788 
    1789 PluralOrNot() {
    1790     [ "$1" -gt "1" ] && echo -en "s"
    17911666}
    17921667
    … …  
    21272002
    21282003PrepareDataDiskImages() {
    2129     local needlist bigdir minidir_root tardir diskdir imagesdir res i j k old_pwd lines lfiles
     2004    local needlist bigdir diskdir imagesdir res i j k old_pwd lines lfiles
    21302005
    21312006    imagesdir=$1
    2132     rm -f $imagesdir/mindi-*.img $imagesdir/[0-9]*.tar.gz $imagesdir/mindi.iso
     2007    rm -f $imagesdir/mindi.iso
    21332008    needlist=$MINDI_TMP/what-we-need.txt
    21342009    bigdir=$MINDI_TMP/bigdir
    2135     minidir_root=$MINDI_TMP/minidir
    2136     mkdir -p $minidir_root
    21372010    mkdir -p $bigdir/usr/bin
    2138     tardir=$MINDI_TMP/tardir
    21392011
    21402012    if [ -e "$DEPLIST_FILE" ]; then
    … …  
    21762048    fi
    21772049    if [ "$res" -ne "0" ] ; then
    2178         Die "You have $res file`PluralOrNot $res` present in dependency list\nbut absent from filesystem."
     2050        Die "You have $res files present in dependency list\nbut absent from filesystem."
    21792051    fi
    21802052    FindAndAddUserKeyboardMappingFile
    … …  
    22272099    echo -e "$DONE"
    22282100    TOTAL_BIGDIR_SIZE=`du -sk $bigdir | cut -f1`
    2229     SplitDirectoryIntoMinidirs $bigdir $minidir_root
    2230     noof_disks=$?
    2231     [ "$noof_disks" -eq "0" ] && Die "Too much stuff!"
    22322101    MakeMountlist $MINDI_TMP/mountlist.txt
    2233     mkdir -p $minidir_root/$noof_disks/tmp
    2234     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"
     2102    mkdir -p $bigdir/tmp
     2103    cp -f $MINDI_TMP/mountlist.txt $bigdir/tmp/mountlist.txt 2> /dev/null || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
    22352104    if [ _"$MONDO_SHARE" != _"" ]; then
    2236         cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
    2237     fi
    2238     [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false"
    2239     cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
    2240     ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
    2241     CreateDataDiskImagesFromTarballs $tardir $imagesdir $noof_disks
     2105        cp -f $bigdir/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
     2106    fi
     2107    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $bigdir/tmp/i-want-my-lvm || LVM="false"
     2108    cat $bigdir/tmp/mountlist.txt >> $LOGFILE
     2109    echo -en "$FILES_IN_FILELIST" > $bigdir/FILES-IN-FILELIST 2> /dev/null
     2110    echo -en "$LAST_FILELIST_NUMBER" > $bigdir/LAST-FILELIST-NUMBER 2> /dev/null
     2111    if [ _"$MONDO_SHARE" != _"" ]; then
     2112        for q in filelist.full.gz biggielist.txt ; do
     2113            [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
     2114            cp -pRdf $MINDI_TMP/$q $bigdir/tmp 2>> $LOGFILE
     2115        done
     2116    fi
     2117
     2118    echo -en "Tarring and zipping the data content..."
     2119    size_of_all_tools=`du -sk $bigdir | cut -f1`
     2120    (cd $bigdir ; tar -b 4096 -cf - . 2> /dev/null | gzip -9 > $imagesdir/all.tar.gz)
     2121    du -sk $imagesdir/*gz >> $LOGFILE
     2122    echo -e "$DONE"
     2123
    22422124    FRIENDLY_OUTSTRING="Boot and data disk images were created."
    2243     # One 1.72MB boot disk, one 2.88MB boot disk and $noof_disks data disk images
    2244     rmdir $tardir $bigdir
     2125    rm -rf $bigdir
    22452126    rm -f $needlist
    2246     return $noof_disks
    22472127}
    22482128
    … …  
    22962176
    22972177
    2298 RejigHyperlinks() {
    2299     local minidir_root noof_disks fname path diskno old_pwd awk_loc gawk_loc dir i
    2300     minidir_root=$1
    2301     noof_disks=$2
    2302 
    2303     old_pwd=`pwd`
    2304     diskno=1
    2305     while [ "$diskno" -le "$noof_disks" ] ; do
    2306         mkdir -p $minidir_root/$diskno
    2307         cd $minidir_root/$diskno
    2308         for fname in `find -type d -o -print` ; do
    2309             [ -h "$minidir_root/$diskno/$fname" ] && MoveHyperlinkSensibly $fname $minidir_root $diskno $noof_disks
    2310         done
    2311         diskno=$(($diskno+1))
    2312     done
    2313 
    2314     cd $old_pwd
    2315     return
    2316 }
    2317 
    2318 
    23192178ReplaceIndividualLine() {
    23202179    local orig_file new_file lino newstring lines_total lines_remaining
    … …  
    24032262
    24042263
    2405 SplitDirectoryIntoMinidirs() {
    2406     local bigdir minidir_root i noof_disks old_pwd res
    2407 
    2408     bigdir=$1
    2409     minidir_root=$2
    2410     [ "$minidir_root" != "" ] && rm -Rf $minidir_root/*
    2411 
    2412     TryToFitDataIntoSeveralDirs $bigdir $minidir_root
    2413     noof_disks=$?
    2414     if [ "$noof_disks" -eq "0" ] ; then
    2415         echo "Failed to fit data into several dirs."
    2416         return 0
    2417     fi
    2418     RejigHyperlinks $minidir_root $noof_disks
    2419     [ "$bigdir" != "" ] && rm -Rf $bigdir/*
    2420     return $noof_disks
    2421 }
    2422 
    24232264
    24242265StripExecutable()
    … …  
    24352276    fi
    24362277    rm -f $tmpfile
    2437 }
    2438 
    2439 
    2440 TemporarilyCompressAllFiles() {
    2441     local i orig_fname out_fname out_list
    2442 
    2443     i=0
    2444     out_list=$2/compressed/compressed.txt
    2445     mkdir -p $2/compressed
    2446     > $out_list
    2447     for orig_fname in $1 ; do
    2448         out_fname=$2/compressed/$orig_fname.gz
    2449         mkdir -p $out_fname 2> /dev/null
    2450         rmdir $out_fname 2> /dev/null
    2451         gzip -c6 $orig_fname > $out_fname 2> /dev/null
    2452         i=$(((($i+1))%15))
    2453         [ "$i" -eq "0" ] && echo -en "."
    2454         du -sk $out_fname >> $out_list
    2455     done
    24562278}
    24572279
    … …  
    25512373    fi
    25522374    echo "$output" | tr -s ' ' '\n' | sort -u | tr '\n' ' '
    2553 }
    2554 
    2555 
    2556 TryToFitDataIntoSeveralDirs() {
    2557     local bigdir minidir_root noof_disks diskno list_of_files filename old_pwd progress
    2558     local i retval noof_disks total_files list_of_devs
    2559 
    2560     bigdir=$1
    2561     minidir_root=$2
    2562     BIG_CLUNKY_SIZE_COUNTER=0
    2563     retval=0
    2564     noof_disks=1
    2565 
    2566     echo -en "\r                                                                            \rDividing data into several groups..."
    2567     old_pwd=`pwd`
    2568     cd $bigdir
    2569     list_of_files=`GetFileSizeList . | sort -nr | cut -f2 | grep -Fv "/dev/"`
    2570     progress=0
    2571     total_files=`CountItemsIn "$list_of_files"`
    2572     if [ "`echo "$filename" | grep -x "/dev/.*"`" ] ; then
    2573         filesize=1
    2574     fi
    2575     mkdir -p $minidir_root/$noof_disks
    2576     if [ -e "dev" ] ; then
    2577         echo "Copying dev/* to $minidir_root/$noof_disks" >> $LOGFILE
    2578         cp --parents -pRdf dev $minidir_root/$noof_disks 2>> $LOGFILE
    2579     fi
    2580     TemporarilyCompressAllFiles "$list_of_files" $minidir_root
    2581     for filename in $list_of_files ; do
    2582         AddFileToDir $filename $minidir_root $noof_disks
    2583         i=$?
    2584         if [ "$i" -gt "$noof_disks" ] ; then
    2585             noof_disks=$i
    2586             echo -en "\r\t\t\t\t\t\t($noof_disks disks)"
    2587         fi
    2588         if [ "$i" -eq "0" ] ; then
    2589             LogIt "Cannot add file $filename to minidir $minidir_root"
    2590             retval=$(($retval+1))
    2591         fi
    2592         progress=$(($progress+1))
    2593         echo -en "\r\t\t\t\t\t\t\t\t$(($progress*100/$total_files))% complete\r"
    2594     done
    2595     cd $old_pwd
    2596     echo -en "\rThe files have been subdivided into $noof_disks directories.                                                            \r"
    2597     [ "$minidir_root" != "" ] && rm -Rf $minidir_root/compressed
    2598     if [ "$retval" -gt "0" ] ; then
    2599         return 0
    2600     else
    2601         return $noof_disks
    2602     fi
    26032375}
    26042376
    … …  
    28632635
    28642636
    2865 ZipMinidirsIntoTarballs() {
    2866     local minidir_root tardir noof_disks diskno old_pwd i
    2867     minidir_root=$1
    2868     tardir=$2
    2869     noof_disks=$3
    2870 
    2871     echo -en "Tarring and zipping the group`PluralOrNot $noof_disks`..."
    2872     mkdir -p $tardir
    2873     mkdir -p $minidir_root/all
    2874     old_pwd=`pwd`
    2875     diskno=1
    2876     while [ "$diskno" -le "$noof_disks" ] ; do
    2877         cd $minidir_root/$diskno || LogIt "WARNING - cannot cd to $minidir_root/$diskno"
    2878         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."
    2879         diskno=$(($diskno+1))
    2880         echo -n "..."
    2881         cp -pRdf * $minidir_root/all 2>> $LOGFILE
    2882     done
    2883     mkdir -p $minidir_root/all/tmp
    2884     cd $minidir_root/all
    2885     size_of_all_tools=`du -sk . | cut -f1`
    2886     if [ _"$MONDO_SHARE" != _"" ]; then
    2887         for q in filelist.full.gz biggielist.txt ; do
    2888             [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
    2889             cp -pRdf $MINDI_TMP/$q tmp/ 2>> $LOGFILE
    2890         done
    2891         mkdir -p $minidir_root/all/tmp
    2892     fi
    2893     tar -b 4096 -cf - * 2> /dev/null | gzip -9 > $tardir/all.tar.gz
    2894     dd if=/dev/zero bs=1k count=64 >> $imagesdir/all.tar.gz 2> /dev/null
    2895     [ "`du -sm $imagesdir/all.tar.gz | cut -f1`" -ge "30" ] && Die "You have too many tools in your shed"
    2896     cd $old_pwd
    2897     [ "$minidir_root" != "" ] && rm -Rf $minidir_root
    2898     echo -e "$DONE"
    2899 }
    2900 
    29012637
    29022638##############################################################################
    … …  
    33803116
    33813117PrepareDataDiskImages $MINDI_CACHE
    3382 noof_disks=$?
    33833118ramdisk_size=$(($size_of_all_tools+$EXTRA_SPACE))
    33843119rds=$(($ramdisk_size-$((ramdisk_size%4096))))
    … …  
    34073142    LogIt "Finished."
    34083143elif [ "$PROMPT_MAKE_TAPE_IMAGE" = "yes" ] ; then
    3409     rm -f $MINDI_CACHE/{*img,*gz,*iso}
     3144    rm -f $MINDI_CACHE/{*img,*iso}
     3145    if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
     3146        OfferToMakeBootableUSB $MINDI_CACHE
     3147    fi
    34103148    OfferToMakeBootableISO $MINDI_CACHE
    34113149    if [ -e "$MINDI_CACHE/all.tar.gz" ] ; then

  • branches/stable/mindi/rootfs/sbin/install-additional-tools

    r1842 r1904  
    2020mountdir=$GROOVY
    2121# Should be the same as in mindi => conf param
    22 MAX_DISKS=99
    2322mkdir -p $mountdir
    24 diskno=1
    2523res=0
    2624if [ -e "/tmp/TAPEDEV-HAS-DATA-DISKS" ] ; then
    2725    LogIt "I am assuming the data disks' contents are already in $mountdir."
    2826else
    29     while [ "$diskno" -lt "$MAX_DISKS" ] ; do
    30         LogIt "PLEASE WAIT. Untarring disk #$diskno" 2
    31         untar $diskno $mountdir
    32         res=$(($res+$?))
    33         [ -e "/LAST-DISK" ] && diskno=999
    34         diskno=$(($diskno+1))
    35         [ -e "/tmp/CDROM-LIVES-HERE" ] && [ ! -f "/mnt/cdrom/images/$diskno.tar.gz" ] && break
    36     done
     27    LogIt "PLEASE WAIT. Untarring data content" 2
     28
     29    mountpoint=/dev/null
     30    [ -e "/tmp/CDROM-LIVES-HERE" ] && mountpoint=/mnt/cdrom/images
     31    tarball=$mountpoint/all.tar.gz
     32    if [ -e "/tmp/CDROM-LIVES-HERE" ] ; then
     33        [ -e "$tarball" ] || LogIt "Can't find CD's $tarball" 1
     34    fi
     35
     36    old_pwd=`pwd`
     37    cd $mountdir
     38    counter=0
     39    for fname in `tar -zxvf $tarball` ; do
     40     counter=$(($counter+1))
     41        [ "$(($counter % 4))" -eq "0" ] && echo -en "\r\t\t\t\t\t\t\t\\"
     42        [ "$(($counter % 4))" -eq "1" ] && echo -en "\r\t\t\t\t\t\t\t|"
     43        [ "$(($counter % 4))" -eq "2" ] && echo -en "\r\t\t\t\t\t\t\t/"
     44        [ "$(($counter % 4))" -eq "3" ] && echo -en "\r\t\t\t\t\t\t\t-"
     45    done
     46    cd $old_pwd
     47    echo -e -n "\r"
     48    [ ! -e "/tmp/CDROM-LIVES-HERE" ] && umount $mountpoint
     49    sleep 1
    3750fi
    38 rm -f /LAST-DISK
    3951
    4052LogIt "Recombining large files..." 1

  • branches/stable/mondo/src/common/libmondo-archive.c

    r1903 r1904  
    29072907
    29082908    (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
    2909     mr_fclose(fout);
     2909    if (fout) {
     2910        mr_fclose(fout);
     2911    }
    29102912    length = totallength / optimal_set_size / 1024;
    29112913    mr_msg(1, "Opening in %s; slicing it and writing to CD/tape",

  • branches/stable/mondo/src/common/libmondo-mountlist.c

    r1663 r1904  
    847847               mountlist->el[items].mountpoint,
    848848               mountlist->el[items].format,
    849                siz, mountlist->el[items].label, mountlist->el[items].uuid);
     849               siz, mountlist->el[items].label);
    850850#elif __FreeBSD__
    851851        sscanf(incoming,
    … …  
    855855               mountlist->el[items].format, siz);
    856856        strcpy(mountlist->el[items].label, "");
    857         strcpy(mountlist->el[items].uuid, "");
    858857#endif
    859858
    … …  
    910909                     mountlist->el[items].format,
    911910                     mountlist->el[items].size,
    912                     mountlist->el[items].label,
    913                     mountlist->el[items].uuid);
     911                    mountlist->el[items].label);
    914912            items++;
    915913        }
    … …  
    953951                mountlist->el[i].device, mountlist->el[i].mountpoint,
    954952                mountlist->el[i].format, mountlist->el[i].size,
    955                 mountlist->el[i].label, mountlist->el[i].uuid);
     953                mountlist->el[i].label);
    956954    }
    957955    paranoid_fclose(fout);

  • branches/stable/mondo/src/common/libmondo-stream.c

    r1903 r1904  
    850850
    851851    /*@ long    ***************************************************** */
    852     long bytes_to_write = 0;
     852    long bytes_to_write = 0L;
    853853
    854854    /*@ long long *************************************************** */

  • branches/stable/mondo/src/common/mondostructures.h

    r1817 r1904  
    3535
    3636  /**
    37    * For ext2 and ext3, this is the filesystem label (if there is one). If not, this should be "".
     37   * For ext2 and ext3, this is the filesystem label or uuid (if there is one). If not, this should be "".
    3838   */
    3939    char label[256];
    4040
    41     /**
    42      * This is the filesystem UUID (if there is one). If not, this should be "".
    43      */
    44     char uuid[64];
    4541};
    4642

  • branches/stable/mondo/src/mondorestore/mondorestore.c

    r1903 r1904  
    28832883    make_hole_for_dir(MONDO_CACHE);
    28842884
    2885 /* Backup original mountlist.txt */
     2885    /* Backup original mountlist.txt */
    28862886    mr_asprintf(&tmp, "%s.orig", g_mountlist_fname);
    28872887    if (!does_file_exist(g_mountlist_fname)) {
    … …  
    28972897    mr_free(tmp);
    28982898
    2899 /* Init directories */
     2899    /* Init directories */
    29002900    make_hole_for_dir("/var/log");
    29012901    make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
Note: See TracChangeset for help on using the changeset viewer.