Changeset 979

Timestamp:

11/26/06 12:35:32 (4 years ago)

Author:

bruno

Message:

merge -r954:978 $SVN_M/branches/stable

Files:

• trunk/mindi/analyze-my-lvm (modified) (2 diffs)
• trunk/mindi/mindi (modified) (104 diffs)
• trunk/mondo-doc/mindi.8 (modified) (1 diff)
• trunk/mondo-doc/mondorescue-howto.sgml (modified) (1 diff)
• trunk/mondo/src/common/libmondo-devices.c (modified) (1 diff)
• trunk/mondo/src/common/libmondo-stream.c (modified) (1 diff)

trunk/mindi/analyze-my-lvm

@@ -37 +37 @@
-Die() {
-    echo "$1" >> /dev/stderr
-
+-
-}
-
@@ -217 +217 @@
-
-# -------------------------------- main -----------------------------------
-Cannot find lvmdiskscan. Are you sure you're using LVM?
+lvmdiskscan not found. Won't handle LVM.
-if [ -e "/proc/lvm/global" ] && [ "`tr -s '\t' ' ' < /proc/lvm/global | grep "0 VGs 0 PVs 0 LVs"`" != "" ] ; then
-    exit 0

trunk/mindi/mindi

@@ -113 +113 @@
-mkdir -p $MINDI_TMP
-
-FDISKLOG=$MINDI_TMP/parted2fdisk.log
-
-# Purge from potential old run
-rm -rf $CACHE_LOC/* 2> /dev/null
@@ -192 +190 @@
-    if [ ! -e "$filename" ] ; then
-        if [ -h "$filename" ] ; then
-
+ 2>> $LOGFILE
-            return $noof_disks
-        else
@@ -203 +201 @@
-        mkdir -p $minidir_root/$diskno
-        filesize=`du -sk $filename | cut -f1`
-
+ 2>> $LOGFILE
-        if [ "$filesize" -le "4" ] ; then
-            siz=$filesize
@@ -242 +240 @@
-        mappath=`find $KEYDIR/keymaps | grep "i[3-8]86" | grep "$locale[^r][^/]" | grep -vx " *#.*"`
-        if [ ! -e "$mappath" ] ; then
-\n
+
-            return
-        fi
@@ -250 +248 @@
-
-    mkdir -p $bigdir/etc
-|| LogIt "AKMF -- Could not copy $mappath to $bigdir\n
+2>> $LOGFILE || LogIt "AKMF -- Could not copy $mappath to $bigdir
-    if [ "`echo $mappath | grep -F ".gz"`" ] ; then
-        included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
@@ -282 +280 @@
-    sliceno=0
-    scratchfile=$MINDI_TMP/blah.$$.dat
-
+2>> $LOGFILE 
-    [ "`head $scratchfile -n1 | grep -F "bin/sh"`" != "" ] && StripComments $scratchfile "-$filename-"
-    [ "`echo "$filename" | grep -F "etc/termcap"`" != "" ] && StripComments $scratchfile "-$filename-"
-    if [ "`echo "$filename" | grep -F "lib/modules/" | grep "\.*o\.gz"`" != "" ] ; then
-        mv $scratchfile $scratchfile.gz
-\n
+
-        filename=`echo "$filename" | tr '.' '#' | sed s/#o#gz/#o/ | sed s/#ko#gz/#ko/ | tr '#' '.'`
-    fi
@@ -296 +294 @@
-    [ -x "$scratchfile" ] && StripExecutable $scratchfile "-$filename-"
-    while [ "$sliceno" -le "$noof_slices" ] ; do
-2
+&
-        sliceno=$(($sliceno+1))
-    done
@@ -311 +309 @@
-    if [ $liloc ]; then
-        if ! [ `strings $liloc | grep "boot\.b"` ]; then
-\n
+
-            > $copy_to
-            return 0
@@ -320 +318 @@
-        copy_from=`grep install= /etc/lilo.conf | grep "\.b" | cut -d'=' -f2`
-        if [ ! -f "$copy_from" ] ; then
-\n
+
-            copy_from=`FindSensibleBootBFile`
-\n
-
-
-|| LogIt "CBBF -- warning -- cannot find your boot.b file. That's it, I quit... (j/k)\n
+
+
+
+2>> $LOGFILE || LogIt "CBBF -- warning -- cannot find your boot.b file. That's it, I quit... (j/k)
-}
-
@@ -346 +344 @@
-                cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
-                if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] ; then
-\n
+
-                fi
-                [ -x "$outdir" ] && StripExecutable $outdir "-$filename-"
@@ -390 +388 @@
-    done
-    echo -e "$DONE"
-\n
+
-}
-
@@ -415 +413 @@
-    while [ "$diskno" -le "$noof_disks" ] ; do
-        echo -en "#$diskno..."
-|| LogIt "[line 424] Cannot copy $tardir/$diskno.tar.gz to $outdir\n
+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))
@@ -435 +433 @@
-    mountpoint=$MINDI_TMP/mountpoint.$$
-    mkdir -p $mountpoint
-
-
-
-
+
+
-    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/
@@ -446 +442 @@
-    fi
-    [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
-\n
-\n
+
+
-}
-
@@ -484 +480 @@
-    local i
-    if [ "$1" = "" ] ; then
-atal error\n
-
-atal error. $1\n
+ATAL ERROR
+
+ATAL ERROR. $1
-    fi
-
-    # Creates a tar file containing all required files
-    for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log ; do
-
+ 2>> $LOGFILE
-    done
-    rm -f $TMPDIR/mindi.err.*.tgz
-    tar -cf - $MINDI_TMP | gzip -9 > $TMPDIR/mindi.err.$$.tgz
-\n
-\n
+
+
-    LogIt "WE CANNOT HELP unless you enclose that file.\n"
-    MindiExit -1
@@ -538 +534 @@
-FindAndAddUserKeyboardMappingFile() {
-    local r res mapfile mappath included_item included_list keyfile mp locale
-\n
+
-    KEYDIR=/lib/kbd
-    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
@@ -544 +540 @@
-    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
-    if [ ! -e "$KEYDIR" ] ; then
-\n
+
-        return 0
-    fi
@@ -563 +559 @@
-        KBDEPTH=0
-        mkdir -p $bigdir/etc/console
-
+ 2>> $LOGFILE
-        echo -e "$DONE"
-        return 0
@@ -570 +566 @@
-        keyfile=`find /etc -name rc.config | head -n1`
-        if [ "$keyfile" = "" ] || [ ! -e "$keyfile" ] ; then
-\n
+
-            return
-        else
@@ -577 +573 @@
-    fi
-    if [ ! -e "$KEYDIR/keymaps" ] ; then
-\n
+
-        return
-    fi
@@ -601 +597 @@
-    echo "mappath = $mappath" >> $LOGFILE
-    if [ ! -e "$mappath" ] || [ -d "$mappath" ] ; then
-\n
+
-        return
-    fi
@@ -639 +635 @@
-        if which lilo.real > /dev/null 2> /dev/null ; then
-            LILO_EXE=lilo.real
-\n
+
-        else
-            LILO_EXE=lilo
@@ -693 +689 @@
-    fi
-    if [ ! -e "$1" ] ; then
-arning - cannot search specific path '$1'\n
+ARNING - cannot search specific path '$1'
-        return 1
-    fi
@@ -728 +724 @@
-        filelist=`GenerateListForFile "$incoming"`
-        r=$?
-\n
+
-        res=$(($res+$r))
-#       echo "'$incoming' generates filelist '$filelist'" >> $LOGFILE
@@ -835 +831 @@
-        mkdir -p $bigdir/bin
-        if [ -e "$MINDI_TMP/post-nuke.tgz" ] ; then
-\n
+
-            old_pwd=`pwd`
-            cd $bigdir
-\n
+
-            cd $old_pwd
-        fi
-
+2>> $LOGFILE 
-            LocateDeps $bigdir/usr/bin/mondo*restore >> $outfile.pre
-        else
-\n
-\n
+
+
-            LogIt "If Mindi was called by Mondo then send me a bug report.\n It not, type 'ps ax' to see which Mondo-related process is still running;\n then kill it. :-)\n Finally, run Mindi again."
-            Die "Odd."
-        fi
-\n
+
-        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
-\n
+
-            for r in NFS-* ISO-PREFIX ; do
-
+2>> $LOGFILE 
-                echo "Copying $r to ramdisk" >> $LOGFILE
-            done
@@ -936 +932 @@
-    local res currline partition all_partitions ap_orig remaining i j
-
-LABEL\=\/
+^LABEL\=\/|^UUID=
-    [ -e "/etc/raidtab" ] && $AWK '/^ *device/ {print $2}' /etc/raidtab
-    return
@@ -986 +982 @@
-    for fname in $incoming ; do
-        if [ ! -e "$fname" ] ; then
-arning
+ARNING
-            if echo $fname | grep lvm &> /dev/null ; then
-                echo "This warning only affects you if you are using LVM." >> $LOGFILE
@@ -1065 +1061 @@
-        /usr/bin/logger -s $1
-    fi
-n
+
-}
-
@@ -1179 +1175 @@
-absolute_partition old_partition_fmt current_lvolume
-
-
+
+
-    cat $MY_FSTAB >> $LOGFILE
-
+
+
-
-# scratchdir, mountlist(OUT)
@@ -1201 +1199 @@
-    if [ $LVM != "false" ]; then
-        echo -en "\rAnalyzing LVM...\r"
-
+
+
+
+
+
-    fi
-    all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
@@ -1209 +1211 @@
-    done
-    [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
-\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL
+ %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL UUID | tee -a $LOGFILE
-    useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1"
-    for c_p in $all_partitions ; do
@@ -1223 +1225 @@
-        [ "$c_p" = "none" ] && continue
-        redhat_label=""
+        uuid=""
-        absolute_partition=`readlink -f $c_p`
-        partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
@@ -1249 +1252 @@
-                # For LVM FS it will give a /dev/dm-# which should then be converted
-                if [ $LVM = "v2" ] && [ "`echo $actual_dev | grep '/dev/dm'`" ]; then
-awk
-awk
+$AWK
+$AWK
-                    for dev in `ls /dev/mapper/*`; do
-awk
-awk
+$AWK
+$AWK
-                        if [ $major1 = $major ] && [ $minor1 = $minor ]; then
-awk
+$AWK
-                            break
-                        fi
@@ -1271 +1274 @@
-            # SWAP only
-            if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
-/bin/awk
+$AWK
-                for dev_swap in $list_swaps ; do
-                    dev_exists=`/sbin/vol_id $dev_swap | /bin/grep "$redhat_label"`
@@ -1289 +1292 @@
-                    do
-                        # Location of the swap label for kernel 2.6
-2
+&
-                        if [ "x$try_dev_label" = "x$redhat_label" ]; then
-                            actual_dev=$try_dev
@@ -1295 +1298 @@
-                    done
-            fi
+        fi
+
+        # This part tries to retrieve the correct device from a UUID line in /etc/fstab
+        # current_partition contains only first column of /etc/fstab
+        if [ "`echo "$current_partition" | /bin/grep -i "UUID="`" != "" ]; then
+            str_to_find_fmt_with=$current_partition
+            uuid=`echo "$current_partition" | /bin/cut -d'=' -f2`
+            actual_dev=""
+
+            # 1st try, findfs - the RHEL way of finding labels and their partitions
+            if [ -x "/sbin/findfs" ]; then
+                actual_dev=`/sbin/findfs UUID=${uuid} 2> /dev/null`
+            fi
+    
+            # 2nd try : blkid, the good way for all LABEL except swap
+            if [ "x$actual_dev" = "x" -a -x "/sbin/blkid" ]; then
+                actual_dev=`/sbin/blkid | /bin/grep "$uuid" | grep UUID= | /bin/cut -d':' -f1`
+                # For LVM FS it will give a /dev/dm-# which should then be converted
+                if [ $LVM = "v2" ] && [ "`echo $actual_dev | grep '/dev/dm'`" ]; then
+                    major=`/bin/ls -l $actual_dev | $AWK '{print $5}'`
+                    minor=`/bin/ls -l $actual_dev | $AWK '{print $6}'`
+                    for dev in `ls /dev/mapper/*`; do
+                        major1=`/bin/ls -l $dev | $AWK '{print $5}'`
+                        minor1=`/bin/ls -l $dev | $AWK '{print $6}'`
+                        if [ $major1 = $major ] && [ $minor1 = $minor ]; then
+                            actual_dev=`/bin/ls -l $dev | $AWK '{print $10}'`
+                            break
+                        fi
+                    done
+                fi
+            fi
+    
+            # 3th try, with vol_id 
+            if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
+                list_dev=`mount | /bin/grep -E '^/' | $AWK '{ print $1 }' `
+                for dev in $list_dev ; do
+                    dev_exists=`/sbin/vol_id $dev | /bin/grep "$uuid"`
+                    if [ "x$dev_exists" != "x" ]; then
+                        actual_dev=$dev
+                        break;
+                    fi
+                done
+            fi
-
-            # Check if one of all those tries has known success
@@ -1300 +1346 @@
-                current_partition=$actual_dev
-            else
-labelled partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install findfs|blkid|vol_id\n
+UUID partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install findfs|blkid|vol_id
-            fi
-        else
@@ -1374 +1420 @@
-            partition_mountpt="image"
-            old_partition_fmt=$partition_format
-#           partition_format="`$FDISK -l 2>> $LOGFILE | tr -s '\t' ' ' | grep -w "$absolute_partition" | $AWK 'x=$(NF-1}'`"
-            partition_format="`$FDISK -l 2>> $LOGFILE | tr '*' ' ' | tr '+' ' ' | tr -s ' ' '\t' | grep -w "$absolute_partition" | cut -f5`"
-            echo "------- $FDISK -l log ------------" >> $LOGFILE
-            cat $FDISKLOG >> $LOGFILE
-            echo "------- $FDISK log end ------------" >> $LOGFILE
-            partition_size=$(($partition_size+1)); # just in case
-            if [ "$partition_format" = "Linux" ] ; then
@@ -1391 +1433 @@
-        fi
-        if [ ! "$partition_mountpt" ] ; then
+            echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
-            for qq in "" `find /dev/ida/c*d* ! -name '*p*'` ; do
-                partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
-                echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
-                cat $FDISKLOG >> $LOGFILE
-                echo "------- $FDISK log end ------------" >> $LOGFILE
-                [ "$partition_format" ] && break
-            done
+            echo "------- $FDISK log end ------------" >> $LOGFILE
-            if [ "$partition_format" = "Compaq diagnostics" ] ; then
-                partition_format="compaq"
-            elif [ ! "`grep -F device /etc/raidtab 2> /dev/null | grep -w $current_partition`" ] ; then
-\n
+
-                continue
-            fi
-        fi
-        partition_format="`echo "$partition_format" | cut -d',' -f1`"; # in case user has ext3,ext2 or something dumb like that
-awk
-\n" $current_partition $partition_mountpt $partition_format $psz
+$AWK
+ %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid
-        if [ "$current_partition" = "" ] ; then
-            echo "Unknown partition (outstring = $unofficial_outstring)" >> $LOGFILE
@@ -1414 +1455 @@
-                partition_mountpt=raid
-                partition_format=raid
-\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label"
-\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label"
+ %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid | tee -a $LOGFILE
+ %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" $uuid
-            else
-                echo "Unknown mountpoint (outstring = $unofficial_outstring)" >> $LOGFILE
@@ -1430 +1471 @@
-                partition_format="vfat"
-            fi
-\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label"
-\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label"
+ %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid | tee -a $LOGFILE
+ %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" $uuid
-        fi
-    done
@@ -1491 +1532 @@
-            old_pwd=`pwd`
-            cd $minidir_root/$old_diskno
-
+2>> $LOGFILE 
-            rm -f $filename
-            cd $old_pwd
@@ -1510 +1551 @@
-    data_dev=$3
-
-n
+[n]
-    read i
-    [ "$i" != "y" ] && [ "$i" != "Y" ] && return
@@ -1536 +1577 @@
-    local i old_pwd
-    if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ ! "`DidMondoCallMe`" ] ; then
-n
+[n]
-        read i
-        [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
-    fi
-    if [ ! "$MINDI_TMP" ] ; then
-\n
-\n
+
+
-    fi
-    rm -Rf $MINDI_TMP/iso
-    mkdir -p $MINDI_TMP/iso/{images,archives,isolinux}
-|| LogIt "OfferToMakeBootableISO: Cannot copy $i to $MINDI_TMP/iso/images\n
+2>> $LOGFILE || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MINDI_TMP/iso/images
-    old_pwd=`pwd`
-    cd $MINDI_TMP/iso
@@ -1555 +1596 @@
-        k=$MINDI_TMP/iso/isolinux
-        if [ -e "$j" ] ; then
-\n
+
-            cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
-            cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
@@ -1563 +1604 @@
-    MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
-    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/isolinux/vmlinuz). Did you run out of disk space?"
-
-
+ 2>> $LOGFILE
+ 2>> $LOGFILE
-    [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
-    cd $MINDI_TMP/iso/isolinux
@@ -1574 +1615 @@
-    if [ "$ARCH" != "ia64" ] ; then
-        cp $ISOLINUX isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
-
+ 2>> $LOGFILE
-    fi
-    cd $MINDI_TMP/iso
@@ -1580 +1621 @@
-        cp -f $MINDI_TMP/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2> /dev/null || Die "Cannot copy core files to ramdisk for boot disk. Did you run out of disk space?"
-    fi
-
+ 2>> $LOGFILE
-    if [ "$ARCH" != "ia64" ] ; then
-        mkisofs -U -J -r -o $CACHE_LOC/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
@@ -1591 +1632 @@
-        echo "mkisofs returned the following errors:-"
-        cat $MINDI_TMP/mkisofs.log
-\n
+
-    else
-        echo "Created bootable ISO image at $CACHE_LOC/mindi.iso" >> $LOGFILE
@@ -1646 +1687 @@
-    image=$MINDI_TMP/$rand1.$rand2.img
-    mtpt=$MINDI_TMP/$rand1.$rand2.mtpt
-
-
+ &> /dev/null
+&
-    mkdir -p $mtpt
-    mount -o loop $image $mtpt
-    cd $mtpt
-    mkdir -p {dev,tmp,boot}
-
+ 2>> $LOGFILE
-    if [ "$?" -ne "0" ] ; then
-\n
+
-        cd $old_pwd
-        umount $mtpt
@@ -1666 +1707 @@
-    rdev -r vmlinuz 49152
-
-\n
+
-    losetup /dev/loop0 > /dev/null 2> /dev/null
-\n
+
-    CopyBootBFile $mtpt/boot.b
-
@@ -1784 +1825 @@
-    dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
-    if [ "$ARCH" = "ia64" ] ; then
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    mkdir -p $mountpoint/etc
-    if [ "$ARCH" != "ia64" ] ; then
@@ -1803 +1842 @@
-    cd $mountpoint
-    if [ "$ARCH" != "ia64" ] ; then
-\n
+
-    fi
-    cd $old_pwd
-    losetup /dev/loop0 > /dev/null 2> /dev/null
-\n
+
-    CopyBootBFile $mountpoint/boot.b
-
@@ -1815 +1854 @@
-    cp -f $MINDI_TMP/mindi.rdz $mountpoint 2>> $LOGFILE
-    if [ "$?" -ne "0" ] ; then
-\n
+
-        cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
-\n
+
-        rm -f $MINDI_TMP/mtpt.$$
-\n
+
-        retval=$(($retval+1))
-    fi
@@ -1846 +1885 @@
-        cd $old_pwd
-        umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
-\n
+
-    #   losetup /dev/loop0 -d
-        res=0
-        write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
-        res=$(($res+$?))
-
+ 2>> $LOGFILE
-        res=$(($res+$?))
-        rm -f $imagefile
-        if [ "$res" -ne "0" ]; then
-arning - failed to create 1.44MB boot/root floppies\n
+ARNING - failed to create 1.44MB boot/root floppies
-            rm -f $imagesdir/mindi-*.1440.img
-        fi
@@ -1866 +1905 @@
-# make it bootable
-    rm -f $mountpoint/zero
-
+ 2>> $LOGFILE
-    if [ "$disksize" -gt "2880" ] && [ ! "$KERN_DISK_MADE" ] ; then
-        if [ "$ARCH" != "ia64" ] ; then
@@ -1883 +1922 @@
-    if [ $? -ne "0" ] ; then
-        if [ "`grep -F "/tmp/dev.0" $LOGFILE`" ] ; then
-\n
-\n
-\n
+
+
+
-        fi
-        echo "$LILO_EXE -r $mountpoint ...failed."
-        echo -en "Press ENTER to continue."; read line
-\n
+
-        retval=$(($retval+1))
-    fi
-
+ 2>> $LOGFILE
-    if [ "$ARCH" = "ia64" ] ; then
-
+ 2>> $LOGFILE
-    fi
-    umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
-    echo -en "..."
-\n
+
-    if [ "$retval" -eq "0" ] ; then
-        echo -en "...$DONE\r"
@@ -1909 +1948 @@
-        rm -f $imagefile
-    fi
-\n
+
-    return $retval
-}
@@ -1942 +1981 @@
-    else
-        dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
-
-
-
-\n\n
+ >> $LOGFILE 2>> $LOGFILE
+ >> $LOGFILE 2>> $LOGFILE
+
+
-
-    # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
@@ -1961 +2000 @@
-    cp -f $MINDI_TMP/mindi.rdz $mountpoint/initrd.img 2>> $LOGFILE
-    if [ "$?" -ne "0" ] ; then
-\n
+
-        cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
-\n
+
-        rm -f $MINDI_TMP/mtpt.$$
-\n
+
-        retval=$(($retval+1))
-    fi
@@ -1986 +2025 @@
-        cd $old_pwd
-        umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
-\n
+
-
-        res=0
-        write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
-        res=$(($res+$?))
-
+ 2>> $LOGFILE
-        res=$(($res+$?))
-        rm -f $imagefile
-        if [ "$res" -ne "0" ]; then
-arning - failed to create 1.44MB boot/root floppies\n
+ARNING - failed to create 1.44MB boot/root floppies
-            rm -f $imagesdir/mindi-*.1440.img
-        fi
@@ -2008 +2047 @@
-    rm -f $mountpoint/zero
-    mkdir -p $mountpoint/etc
-
+ 2>> $LOGFILE
-    umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
-    echo -en "..."
-\n
+
-
-    if [ "$retval" -eq "0" ] ; then
@@ -2024 +2063 @@
-        rm -f $imagefile
-    fi
-\n
+
-    return $retval
-}
@@ -2048 +2087 @@
-        cd $MINDI_TMP
-        for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
-
+2>> $LOGFILE 
-            if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
-
+ 2>> $LOGFILE
-            else
-                ChopUpAndCopyFile $i $bigdir $CHOPSIZE $BIGNO
@@ -2058 +2097 @@
-        for i in $EXTRA_MODS ; do
-            j=`find lib/modules/$FAILSAFE_KVER -name $i.*o 2> /dev/null`
-arning
+ARNING
-            for k in $j ; do
-                if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
-
+ 2>> $LOGFILE
-                else
-                    ChopUpAndCopyFile $k $bigdir $CHOPSIZE $BIGNO
@@ -2090 +2129 @@
-    for i in `mount | cut -d' ' -f3` ; do
-        for j in io.sys msdos.sys ; do
-
+ 2>> $LOGFILE
-        done
-    done
@@ -2097 +2136 @@
-    i=`cat $MINDI_TMP/BOOTLOADER.DEVICE 2> /dev/null`
-    if [ "$i" ] ; then
-\n
+
-        dd if=$i of=$bigdir/BOOTLOADER.MBR bs=446 count=1 >> $LOGFILE 2>> $LOGFILE
-        sleep 1
@@ -2103 +2142 @@
-        j=$i
-        [ -h "$j" ] && j=`readlink -f $j`
-\n
+
-        mkdir -p $bigdir/dev
-        cp -pRdf $j $bigdir/dev/boot_device 2> /dev/null || Die "Unable to create /dev/boot_device on ramdisk"
@@ -2112 +2151 @@
-
-    [ -e "$MINDI_LIB/aux-tools" ] || Die "aux-tools not found in Mindi's home dir. Do you have multiple copies of Mindi lying around? Please delete them. No, don't e-mail me and ask how. ;) Use 'rm'."
-arning - error occurred while unzipping aux-tools\n
+ARNING - error occurred while unzipping aux-tools
-    if [ -e "$MINDI_LIB/x11-tools.tgz" ] ; then
-arning - error occurred while unzipping x11-tools.tgz\n
+ARNING - error occurred while unzipping x11-tools.tgz
-    fi
-    if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
@@ -2120 +2159 @@
-        [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
-    fi
-
+ 2>> $LOGFILE
-    cd $old_pwd
-    echo -e "$DONE"
@@ -2135 +2174 @@
-    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"
-
-
+ 2>> $LOGFILE
+ || LVM="false"
-    cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
-    ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
@@ -2214 +2253 @@
-        return 1
-    fi
-gawk
+$AWK
-    lines_remaining=$(($lines_total-$lino))
-    head -n$(($lino-1)) $orig_file > $new_file
@@ -2246 +2285 @@
-    fi
-    # patch from Bill <bill@iwizard.biz> - 2003/08/25
-
-
-
-
+
-    # end patch
-    [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2`
@@ -2284 +2320 @@
-
-    tempfile=$MINDI_TMP/$$.strip.txt
-
+ 2>> $LOGFILE
-    $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' $tempfile > $1
-    rm -f $tempfile
@@ -2316 +2352 @@
-    tmpfile=$MINDI_TMP/stripped.$$.dat
-    [ -d "$1" ] || [ -h "$1" ] && return
-
+ 2>> $LOGFILE
-    strip $tmpfile 2> /dev/null
-    if [ "$?" -eq "0" ] ; then
-
+ 2>> $LOGFILE
-        echo "Stripped binary $2" >> $LOGFILE
-    fi
@@ -2376 +2412 @@
-            # Used by ia64
-            if [ "`gzip -cd $fname | strings 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
-\n
+
-                duff_kernels="$fname $duff_kernels"
-            else
@@ -2384 +2420 @@
-        else
-            if [ "`strings $fname 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
-\n
+
-                duff_kernels="$fname $duff_kernels"
-            else
@@ -2396 +2432 @@
-    fi
-    if [ ! "$possible_kernels" ] ; then
-\n
+
-        possible_kernels="$duff_kernels"
-        if [ ! "$possible_kernels" ] ; then
-\n
+
-        else
-\n
-\n
+
+
-        fi
-    fi
@@ -2408 +2444 @@
-    noof_kernels=`CountItemsIn "$possible_kernels"`
-    if [ "$noof_kernels" -eq "0" ] ; then
-\n
+
-        if [ -e "/boot/vmlinuz" ] ; then
-\n
+
-            output=/boot/vmlinuz
-        else
@@ -2423 +2459 @@
-            if echo $i | grep "`uname -r`" ; then
-                LogIt "OK, I used my initiative and found that "
-\n
+
-                output="$i"
-                return
@@ -2432 +2468 @@
-            echo "Schlomo, this one's for you." >> $LOGFILE
-        else
-\n
-\n
-\n
+
+
+
-            echo ""
-        fi
@@ -2464 +2500 @@
-    if [ -e "dev" ] ; then
-        echo "Copying dev/* to $minidir_root/$noof_disks" >> $LOGFILE
-
+ 2>> $LOGFILE
-    fi
-    TemporarilyCompressAllFiles "$list_of_files" $minidir_root
@@ -2475 +2511 @@
-        fi
-        if [ "$i" -eq "0" ] ; then
-\n
+
-            retval=$(($retval+1))
-        fi
@@ -2509 +2545 @@
-    echo -en "..."
-    mke2fs -b 1024 -m 1 -i 2048 -F $tempfile >> $LOGFILE 2>> $LOGFILE
-
-    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
-    rm -f $MINDI_TMP/mke2fs.log
-    echo -en "..."
-    mkdir -p $mountpoint
@@ -2518 +2551 @@
-    old_pwd=`pwd`
-    cd $mountpoint
-&
+2>&1 
-    tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
-    cd dev || Die "Can't cd to dev"
@@ -2528 +2561 @@
-        s=`which $w 2> /dev/null`
-        if [ -e "$s" ] ; then
-
+ 2>> $LOGFILE
-        fi
-    done
@@ -2581 +2614 @@
-        list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
-    fi
-\n
+
-    for i in $list_of_groovy_mods ; do
-        floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
@@ -2589 +2622 @@
-        [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
-        echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-\n
+
-        [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
-    done
@@ -2651 +2684 @@
-    diskno=1
-    while [ "$diskno" -le "$noof_disks" ] ; do
-arning - cannot cd to $minidir_root/$diskno\n
+ARNING - 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 "..."
-
+ 2>> $LOGFILE
-    done
-    mkdir -p $minidir_root/all/tmp
@@ -2663 +2696 @@
-        for q in filelist.full.gz biggielist.txt ; do
-            [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
-
+ 2>> $LOGFILE
-        done
-        mkdir -p $minidir_root/all/tmp
@@ -2699 +2732 @@
-
-if [ -e "/etc/conf.modules" ] && [ ! -e "/etc/modules.conf" ] ; then
-arning - Ancient distro detected.\n
+ARNING - Ancient distro detected.
-    ln -sf /etc/conf.modules /etc/modules.conf
-fi
@@ -2794 +2827 @@
-        MINDI_TMP=$MONDO_TMP
-        mkdir -p $MINDI_TMP
-        FDISKLOG=$MINDI_TMP/parted2fdisk.log
-        CACHE_LOC=$3
-        if [ _"$CACHE_LOC" != _"" ]; then
@@ -2806 +2838 @@
-###
-        kernelname=`echo $kernelpath | cut -d'-' -f2-`
-\n
-\n
+
+
-        if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
-        then
-\n
-\n
+
+
-           kernelname=`uname -r`
-        else
-\n
+
-        fi
-###
@@ -2844 +2876 @@
-        [ "$USE_COMP" = "" ] && USE_COMP=yes
-        [ "$NOT_BOOT" = "" ] && NOT_BOOT=no
-\n
+
-        [ "$kernelpath" = "" ] && kernelpath=`TryToFindKernelPath`
-        kernelname=`echo $kernelpath | cut -d'-' -f2-`
-        if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
-        then
-\n
-\n
+
+
-           kernelname=`uname -r`
-        else
-\n
+
-        fi
-        [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
@@ -2877 +2909 @@
-fi
-
-
-[ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file"
-if [ ! "`DidMondoCallMe`" ] ; then
-\n
-\n
-\n
+
+
+
-    LogIt "------------------------------------------------------------------------------"
-else
@@ -2900 +2931 @@
-echo "NOT_BOOT = '$NOT_BOOT'" >> $LOGFILE
-if [ "$NOT_BOOT" != "" ] && [ "$NOT_BOOT" != "0" ] && [ "$NOT_BOOT" != "no" ] ; then
-\n
+
-    MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
-    MakeMountlist $MINDI_TMP/mountlist.txt
@@ -2908 +2939 @@
-    tar -cv tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"
-    sleep 2
-\n
+
-    MindiExit 0
-fi
@@ -2914 +2945 @@
-if [ "$kernelpath" = "" ] ; then
-    [ "`DidMondoCallMe`" ] && Die "Please use -k <path> to specify kernel."
-
-
-
-
-
-
+
+
+
+
-    fi
-    if [ "$USE_OWN_KERNEL" = "yes" ]; then
@@ -2933 +2962 @@
-fi
-if [ ! "`DidMondoCallMe`" ] ; then
-n
+[n]
-    read ch
-
+
+
+
-        USE_LILO=yes
-    else
-        USE_LILO=no
-    fi
-fi
-if [ "$YOUR_KERNEL_SUCKS" != "" ] || [ "$kernelpath" = "" ] || [ "$kernelpath" = "SUCKS" ] || [ "$kernelpath" = "FAILSAFE" ] ; then
-    kernelpath=$MINDI_LIB/vmlinuz
-\n
-\n
-\n
+
+
+
-    pwd=`pwd`
-    cd $MINDI_TMP
@@ -2953 +2982 @@
-fi
-echo -e "Mindi's temp dir = $MINDI_TMP \nMindi's output dir=$CACHE_LOC" >> $LOGFILE
-\n
-
- 
+
+
+\n
-
-rm -f $CACHE_LOC/{*img,*gz,*iso}
@@ -2988 +3017 @@
-    else
-        if ! PrepareBootDiskImage_LILO $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
-arning - failed to create 1.72MB boot image. Please reduce your kernel's size\n
-if you want to make a 1.72MB floppy disk.\n
+ARNING - failed to create 1.72MB boot image.
+Please reduce your kernel's size if you want to make a 1.72MB floppy disk.
-        fi
-        if ! PrepareBootDiskImage_LILO $CACHE_LOC 2880 $kernelpath $ramdisk_size ;  then
-
-
-
+
+
-            PrepareBootDiskImage_LILO $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
-        fi
@@ -3000 +3028 @@
-else
-    if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
-arning - failed to create 1.72MB boot image. Please reduce your kernel's size\n
-if you want to make a 1.72MB floppy disk.\n
+ARNING - failed to create 1.72MB boot image.
+Please reduce your kernel's size if you want to make a 1.72MB floppy disk.
-        if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 2880 $kernelpath $ramdisk_size ; then
-
-
-
+
+
-            PrepareBootDiskImage_SYSLINUX $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
-        fi
@@ -3024 +3051 @@
-    fi
-    OfferToMakeBootableISO $CACHE_LOC
-\n
+
-elif [ "$TAPEDEV" ] ; then
-    rm -f $CACHE_LOC/{*img,*gz,*iso}
-    OfferToMakeBootableISO $CACHE_LOC
-    if [ -e "$CACHE_LOC/all.tar.gz" ] ; then
-
+ 2>> $LOGFILE
-    else
-        Die "Cannot find all.tar.gz, to be written to tape"
@@ -3037 +3064 @@
-fi
-# cleanup
-\n
+
-for mtpt in $FLOPPY_WAS_MOUNTED ; do
-    mount $mtpt

trunk/mondo-doc/mindi.8

@@ -138 +138 @@
-List of files to be included on boot/root disks.
-.TP
-root/images
+var/cache
-Number N of multiple tar balls together containing root file system for rescue
-media.
-.TP
-root/images
+var/cache
-Single tar ball of root file system for rescue media.
-.TP
-root/images
+var/cache
-initrd image for bootable ISO image.
-.TP
-root/images
+var/cache
-.B mindi
-boot floppy of size F [KB].
-.TP
-root/images
+var/cache
-.B mindi
-root floppy of size F [KB].
-.TP
-root/images
+var/cache
-.B mindi
-data floppy number N for boot/root floppies.
-.TP
-root/images
+var/cache
-.B mindi
-bootable ISO image.
+.SH CONFIGURATION FILE
+You may create a mindi configuration file under 
+.B /etc/mindi 
+called 
+.B mindi.conf 
+which overwrites default values by setting up the following variables:
+.TP 
+.I TMPDIR
+.B (default /tmp): directory to create temporary files
+.br
+.TP
+.I EXTRA_SPACE
+.B (default 24576): increase if you run out of ramdisk space
+.br
+.TP
+.I IA64_BOOT_SIZE
+.B (default 8192): size of the ia64 boot disk
+.br
+.TP
+.I CACHE_LOC
+.B (default /var/cache/mindi): directory where boot/root files 
+and iso are generated
+.br
+WARNING: This directory is erased before usage
+.br
-.SH "SEE ALSO"
-mondoarchive(8), mondorestore(8).
-.TP
-See mailing list at http://www.mondorescue.org for technical support.
-.SH BUGS
-The target location for the image files created by
-.B mindi
-is hard-coded to
-.IR "/root/images/mindi".
-As a workaround, it is suggested to make
-.I /root/images
-a symbolic link to the desired location for the image files.
-.SH AUTHORS
-Bruno Cornec (lead-development) 

trunk/mondo-doc/mondorescue-howto.sgml

@@ -1178 +1178 @@
-1440+0 enregistrements écrits.
-mke2fs 1.38 (30-Jun-2005)
-cp: écriture de `vmlinuz': Aucun espace disponible sur le périphérique
-Failed to copy /boot/vmlinuz-2.6.12-15mdk-i686-up-4GB to ramdisk
-

trunk/mondo/src/common/libmondo-devices.c

@@ -1462 +1462 @@
-    bkpinfo->use_lzo =
-        (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
-
-/*
-  if (find_home_of_exe("star") && (!find_home_of_exe("afio") || find_home_of_exe("selinuxenabled")))
-    {
-      bkpinfo->use_star = FALSE;    
-      bkpinfo->use_lzo = FALSE;
-      log_to_screen("Using star, not afio");
-      if (!find_home_of_exe("afio"))
-    { log_to_screen("...because afio not found"); }
-      if (find_home_of_exe("selinuxenabled"))
-    { log_to_screen("...because SELINUX found"); }
-    }
-*/
-
-    mvaddstr_and_log_it(2, 0, " ");
-

trunk/mondo/src/common/libmondo-stream.c

@@ -346 +346 @@
-    int res = 0;
-    int retval = 0;
-
+       
-
-// xattr