Changeset 979 for trunk


Ignore:
Timestamp:
Nov 26, 2006, 12:35:32 PM (13 years ago)
Author:
bruno
Message:

merge -r954:978 $SVN_M/branches/stable

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/analyze-my-lvm

    r914 r979  
    3737Die() {
    3838    echo "$1" >> /dev/stderr
    39     exit 1
     39    exit -1
    4040}
    4141
     
    217217
    218218# -------------------------------- main -----------------------------------
    219 which lvmdiskscan 2>/dev/null 2>&1 || Die "Cannot find lvmdiskscan. Are you sure you're using LVM?"
     219which lvmdiskscan 2>/dev/null 2>&1 || Die "lvmdiskscan not found. Won't handle LVM."
    220220if [ -e "/proc/lvm/global" ] && [ "`tr -s '\t' ' ' < /proc/lvm/global | grep "0 VGs 0 PVs 0 LVs"`" != "" ] ; then
    221221    exit 0
  • trunk/mindi/mindi

    r956 r979  
    113113mkdir -p $MINDI_TMP
    114114
    115 FDISKLOG=$MINDI_TMP/parted2fdisk.log
    116 
    117115# Purge from potential old run
    118116rm -rf $CACHE_LOC/* 2> /dev/null
     
    192190    if [ ! -e "$filename" ] ; then
    193191        if [ -h "$filename" ] ; then
    194             cp --parents -pRdf $filename $minidir_root/$diskno
     192            cp --parents -pRdf $filename $minidir_root/$diskno 2>> $LOGFILE
    195193            return $noof_disks
    196194        else
     
    203201        mkdir -p $minidir_root/$diskno
    204202        filesize=`du -sk $filename | cut -f1`
    205         cp --parents -Rdf $filename $minidir_root/$diskno
     203        cp --parents -Rdf $filename $minidir_root/$diskno 2>> $LOGFILE
    206204        if [ "$filesize" -le "4" ] ; then
    207205            siz=$filesize
     
    242240        mappath=`find $KEYDIR/keymaps | grep "i[3-8]86" | grep "$locale[^r][^/]" | grep -vx " *#.*"`
    243241        if [ ! -e "$mappath" ] ; then
    244             LogIt "Cannot add $mappath: kbd map file not found\n"
     242            LogIt "Cannot add $mappath: kbd map file not found"
    245243            return
    246244        fi
     
    250248
    251249    mkdir -p $bigdir/etc
    252     cp --parents -pRdf $mappath $bigdir || LogIt "AKMF -- Could not copy $mappath to $bigdir\n"
     250    cp --parents -pRdf $mappath $bigdir 2>> $LOGFILE || LogIt "AKMF -- Could not copy $mappath to $bigdir"
    253251    if [ "`echo $mappath | grep -F ".gz"`" ] ; then
    254252        included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
     
    282280    sliceno=0
    283281    scratchfile=$MINDI_TMP/blah.$$.dat
    284     cp -f $filename $scratchfile || Die "CUACF -- cannot copy $filename to $scratchfile - did you run out of disk space?"
     282    cp -f $filename $scratchfile 2>> $LOGFILE || Die "CUACF -- cannot copy $filename to $scratchfile - did you run out of disk space?"
    285283    [ "`head $scratchfile -n1 | grep -F "bin/sh"`" != "" ] && StripComments $scratchfile "-$filename-"
    286284    [ "`echo "$filename" | grep -F "etc/termcap"`" != "" ] && StripComments $scratchfile "-$filename-"
    287285    if [ "`echo "$filename" | grep -F "lib/modules/" | grep "\.*o\.gz"`" != "" ] ; then
    288286        mv $scratchfile $scratchfile.gz
    289         gunzip -f $scratchfile || LogIt "Cannot gunzip $scratchfile.gz\n"
     287        gunzip -f $scratchfile || LogIt "Cannot gunzip $scratchfile.gz"
    290288        filename=`echo "$filename" | tr '.' '#' | sed s/#o#gz/#o/ | sed s/#ko#gz/#ko/ | tr '#' '.'`
    291289    fi
     
    296294    [ -x "$scratchfile" ] && StripExecutable $scratchfile "-$filename-"
    297295    while [ "$sliceno" -le "$noof_slices" ] ; do
    298         dd if=$scratchfile skip=$(($sliceno*$slicesize)) of=$outdir/slice-$biggienumber.`printf "%03d" $sliceno` bs=1k count=$slicesize 2> /dev/null
     296        dd if=$scratchfile skip=$(($sliceno*$slicesize)) of=$outdir/slice-$biggienumber.`printf "%03d" $sliceno` bs=1k count=$slicesize &> /dev/null
    299297        sliceno=$(($sliceno+1))
    300298    done
     
    311309    if [ $liloc ]; then
    312310        if ! [ `strings $liloc | grep "boot\.b"` ]; then
    313             LogIt "boot.b files built into lilo; I'll create a dummy.\n"
     311            LogIt "boot.b files built into lilo; I'll create a dummy."
    314312            > $copy_to
    315313            return 0
     
    320318        copy_from=`grep install= /etc/lilo.conf | grep "\.b" | cut -d'=' -f2`
    321319        if [ ! -f "$copy_from" ] ; then
    322             LogIt "Nor can I find it from your /etc/lilo.conf file. This is very odd.\n"
     320            LogIt "Nor can I find it from your /etc/lilo.conf file. This is very odd."
    323321            copy_from=`FindSensibleBootBFile`
    324             LogIt "I'm going to use '$copy_from'\n"
    325         fi
    326     fi
    327     cp -f $copy_from $copy_to || LogIt "CBBF -- warning -- cannot find your boot.b file. That's it, I quit... (j/k)\n"
     322            LogIt "I'm going to use '$copy_from'"
     323        fi
     324    fi
     325    cp -f $copy_from $copy_to 2>> $LOGFILE || LogIt "CBBF -- warning -- cannot find your boot.b file. That's it, I quit... (j/k)"
    328326}
    329327
     
    346344                cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
    347345                if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] ; then
    348                     gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming\n"
     346                    gunzip -f $outdir/$incoming || LogIt "Cannot gunzip $outdir/$incoming"
    349347                fi
    350348                [ -x "$outdir" ] && StripExecutable $outdir "-$filename-"
     
    390388    done
    391389    echo -e "$DONE"
    392     LogIt "$comment has been written.\n"
     390    LogIt "$comment has been written."
    393391}
    394392
     
    415413    while [ "$diskno" -le "$noof_disks" ] ; do
    416414        echo -en "#$diskno..."
    417         cp -f $tardir/$diskno.tar.gz $outdir || LogIt "[line 424] Cannot copy $tardir/$diskno.tar.gz to $outdir\n"
     415        cp -f $tardir/$diskno.tar.gz $outdir 2>> $LOGFILE || LogIt "[line 424] Cannot copy $tardir/$diskno.tar.gz to $outdir"
    418416        CreateOneDataDiskImage $tardir/$diskno.tar.gz $outdir/mindi-data-$diskno.img $diskno $noof_disks
    419417        diskno=$(($diskno+1))
     
    435433    mountpoint=$MINDI_TMP/mountpoint.$$
    436434    mkdir -p $mountpoint
    437     dd if=/dev/zero of=$imagefile bs=1k count=1440 &> /dev/null || LogIt "Cannot dd (CODI)\n"
    438     mke2fs -N 12 -F $imagefile > $MINDI_TMP/mke2fs.$$ 2>> $MINDI_TMP/mke2fs.$$
    439     [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.$$
    440     rm -f $MINDI_TMP/mke2fs.$$
     435    dd if=/dev/zero of=$imagefile bs=1k count=1440 &> /dev/null || LogIt "Cannot dd (CODI)"
     436    mke2fs -N 12 -F $imagefile >> $LOGFILE 2>> $LOGFILE
    441437    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."
    442438    mv $tarball $mountpoint/
     
    446442    fi
    447443    [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
    448     umount $mountpoint || LogIt "Cannot umount (CODI)\n"
    449     rmdir $mountpoint || LogIt "Cannot rmdir (CODI)\n"
     444    umount $mountpoint || LogIt "Cannot umount (CODI)"
     445    rmdir $mountpoint || LogIt "Cannot rmdir (CODI)"
    450446}
    451447
     
    484480    local i
    485481    if [ "$1" = "" ] ; then
    486         LogIt "Fatal error\n"
    487     else
    488         LogIt "Fatal error. $1\n"
     482        LogIt "FATAL ERROR"
     483    else
     484        LogIt "FATAL ERROR. $1"
    489485    fi
    490486
    491487    # Creates a tar file containing all required files
    492488    for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log ; do
    493         [ -e "$i" ] && cp -f $i $MINDI_TMP
     489        [ -e "$i" ] && cp -f $i $MINDI_TMP 2>> $LOGFILE
    494490    done
    495491    rm -f $TMPDIR/mindi.err.*.tgz
    496492    tar -cf - $MINDI_TMP | gzip -9 > $TMPDIR/mindi.err.$$.tgz
    497     LogIt "Please e-mail a copy of $TMPDIR/mindi.err.$$.tgz to the mailing list.\n"
    498     LogIt "See http://www.mondorescue.org for more information.\n"
     493    LogIt "Please e-mail a copy of $TMPDIR/mindi.err.$$.tgz to the mailing list."
     494    LogIt "See http://www.mondorescue.org for more information."
    499495    LogIt "WE CANNOT HELP unless you enclose that file.\n"
    500496    MindiExit -1
     
    538534FindAndAddUserKeyboardMappingFile() {
    539535    local r res mapfile mappath included_item included_list keyfile mp locale
    540     LogIt "Analyzing your keyboard's configuration.\n"
     536    LogIt "Analyzing your keyboard's configuration."
    541537    KEYDIR=/lib/kbd
    542538    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
     
    544540    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
    545541    if [ ! -e "$KEYDIR" ] ; then
    546         LogIt "Keyboard mapping directory not found. I shall use default map at boot-time.\n"
     542        LogIt "Keyboard mapping directory not found. I shall use default map at boot-time."
    547543        return 0
    548544    fi
     
    563559        KBDEPTH=0
    564560        mkdir -p $bigdir/etc/console
    565         cp /etc/console/boottime.kmap.gz $bigdir/etc/console
     561        cp /etc/console/boottime.kmap.gz $bigdir/etc/console 2>> $LOGFILE
    566562        echo -e "$DONE"
    567563        return 0
     
    570566        keyfile=`find /etc -name rc.config | head -n1`
    571567        if [ "$keyfile" = "" ] || [ ! -e "$keyfile" ] ; then
    572             LogIt "Unknown config detected. Default keyboard map will be used.\n"
     568            LogIt "Unknown config detected. Default keyboard map will be used."
    573569            return
    574570        else
     
    577573    fi
    578574    if [ ! -e "$KEYDIR/keymaps" ] ; then
    579         LogIt "Keyboard mapping directory not found. Default keyboard map will be used.\n"
     575        LogIt "Keyboard mapping directory not found. Default keyboard map will be used."
    580576        return
    581577    fi
     
    601597    echo "mappath = $mappath" >> $LOGFILE
    602598    if [ ! -e "$mappath" ] || [ -d "$mappath" ] ; then
    603         LogIt "Keyboard mapping file not found. Default keyboard map will be used.\n"
     599        LogIt "Keyboard mapping file not found. Default keyboard map will be used."
    604600        return
    605601    fi
     
    639635        if which lilo.real > /dev/null 2> /dev/null ; then
    640636            LILO_EXE=lilo.real
    641             LogIt "lilo.real found; will be used instead of lilo (*grumble* *mutter*)\n"
     637            LogIt "lilo.real found; will be used instead of lilo (*grumble* *mutter*)"
    642638        else
    643639            LILO_EXE=lilo
     
    693689    fi
    694690    if [ ! -e "$1" ] ; then
    695         LogIt "Warning - cannot search specific path '$1'\n"
     691        LogIt "WARNING - cannot search specific path '$1'"
    696692        return 1
    697693    fi
     
    728724        filelist=`GenerateListForFile "$incoming"`
    729725        r=$?
    730         [ "$r" -ne "0" ] && LogIt "$incoming not found\n"
     726        [ "$r" -ne "0" ] && LogIt "$incoming not found"
    731727        res=$(($res+$r))
    732728#       echo "'$incoming' generates filelist '$filelist'" >> $LOGFILE
     
    835831        mkdir -p $bigdir/bin
    836832        if [ -e "$MINDI_TMP/post-nuke.tgz" ] ; then
    837             LogIt "\nIncorporating post-nuke tarball\n"
     833            LogIt "\nIncorporating post-nuke tarball"
    838834            old_pwd=`pwd`
    839835            cd $bigdir
    840             tar -zxf $MINDI_TMP/post-nuke.tgz || LogIt "Error occurred when untarring post-nuke tarball\n"
     836            tar -zxf $MINDI_TMP/post-nuke.tgz || LogIt "Error occurred when untarring post-nuke tarball"
    841837            cd $old_pwd
    842838        fi
    843         if cp -f $MINDI_TMP/mondo*restore $bigdir/usr/bin ; then
     839        if cp -f $MINDI_TMP/mondo*restore $bigdir/usr/bin 2>> $LOGFILE ; then
    844840            LocateDeps $bigdir/usr/bin/mondo*restore >> $outfile.pre
    845841        else
    846             LogIt "Cannot find mondo*restore in mondo's tempdir, $MINDI_TMP\n"
    847             LogIt "I bet you've got a spare copy of Mondo or Mindi floating around on your system.\n"
     842            LogIt "Cannot find mondo*restore in mondo's tempdir, $MINDI_TMP"
     843            LogIt "I bet you've got a spare copy of Mondo or Mindi floating around on your system."
    848844            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."
    849845            Die "Odd."
    850846        fi
    851         cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW.\n"
     847        cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW."
    852848        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    853             LogIt "Incorporating NFS-related settings\n"
     849            LogIt "Incorporating NFS-related settings"
    854850            for r in NFS-* ISO-PREFIX ; do
    855                 cp -f $MINDI_TMP/$r $bigdir/tmp || Die "Cannot copy $r - did you run out of disk space?"
     851                cp -f $MINDI_TMP/$r $bigdir/tmp 2>> $LOGFILE || Die "Cannot copy $r - did you run out of disk space?"
    856852                echo "Copying $r to ramdisk" >> $LOGFILE
    857853            done
     
    936932    local res currline partition all_partitions ap_orig remaining i j
    937933
    938     grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||LABEL\=\// && !/fdd|cdr|zip|floppy/ {print $1}'
     934    grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||^LABEL\=\/|^UUID=/ && !/fdd|cdr|zip|floppy/ {print $1}'
    939935    [ -e "/etc/raidtab" ] && $AWK '/^ *device/ {print $2}' /etc/raidtab
    940936    return
     
    986982    for fname in $incoming ; do
    987983        if [ ! -e "$fname" ] ; then
    988             echo "Warning - $fname does not exist; cannot be LDD'd." >> $LOGFILE
     984            echo "WARNING - $fname does not exist; cannot be LDD'd." >> $LOGFILE
    989985            if echo $fname | grep lvm &> /dev/null ; then
    990986                echo "This warning only affects you if you are using LVM." >> $LOGFILE
     
    10651061        /usr/bin/logger -s $1
    10661062    fi
    1067     echo -en "$1" >> $LOGFILE
     1063    echo -e "$1" >> $LOGFILE
    10681064}
    10691065
     
    11791175absolute_partition old_partition_fmt current_lvolume
    11801176
    1181     echo "Your raw fstab file looks like this:-" >> $LOGFILE
     1177    echo "Your raw fstab file looks like this:" >> $LOGFILE
     1178    echo "------------------------------------" >> $LOGFILE
    11821179    cat $MY_FSTAB >> $LOGFILE
    1183     echo "Your mountlist will look like this:-"
     1180    echo "Your mountlist will look like this:" | tee -a $LOGFILE
     1181    echo "-----------------------------------" >> $LOGFILE
    11841182
    11851183# scratchdir, mountlist(OUT)
     
    12011199    if [ $LVM != "false" ]; then
    12021200        echo -en "\rAnalyzing LVM...\r"
    1203         all_partitions=`$MINDI_LIB/analyze-my-lvm | grep -F ">>>" | cut -d' ' -f2-32`
     1201        $MINDI_LIB/analyze-my-lvm > $MINDI_TMP/lvm.res
     1202        if [ $? -ne 0 ]; then
     1203            LVM="false"
     1204        fi
     1205        all_partitions=`cat $MINDI_TMP/lvm.res | grep -F ">>>" | cut -d' ' -f2-32`
    12041206    fi
    12051207    all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
     
    12091211    done
    12101212    [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
    1211     printf "        %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL
     1213    printf "        %-15s %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL UUID | tee -a $LOGFILE
    12121214    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"
    12131215    for c_p in $all_partitions ; do
     
    12231225        [ "$c_p" = "none" ] && continue
    12241226        redhat_label=""
     1227        uuid=""
    12251228        absolute_partition=`readlink -f $c_p`
    12261229        partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
     
    12491252                # For LVM FS it will give a /dev/dm-# which should then be converted
    12501253                if [ $LVM = "v2" ] && [ "`echo $actual_dev | grep '/dev/dm'`" ]; then
    1251                     major=`/bin/ls -l $actual_dev | awk '{print $5}'`
    1252                     minor=`/bin/ls -l $actual_dev | awk '{print $6}'`
     1254                    major=`/bin/ls -l $actual_dev | $AWK '{print $5}'`
     1255                    minor=`/bin/ls -l $actual_dev | $AWK '{print $6}'`
    12531256                    for dev in `ls /dev/mapper/*`; do
    1254                         major1=`/bin/ls -l $dev | awk '{print $5}'`
    1255                         minor1=`/bin/ls -l $dev | awk '{print $6}'`
     1257                        major1=`/bin/ls -l $dev | $AWK '{print $5}'`
     1258                        minor1=`/bin/ls -l $dev | $AWK '{print $6}'`
    12561259                        if [ $major1 = $major ] && [ $minor1 = $minor ]; then
    1257                             actual_dev=`/bin/ls -l $dev | awk '{print $10}'`
     1260                            actual_dev=`/bin/ls -l $dev | $AWK '{print $10}'`
    12581261                            break
    12591262                        fi
     
    12711274            # SWAP only
    12721275            if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
    1273                 list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' `
     1276                list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | $AWK '{ print $1 }' `
    12741277                for dev_swap in $list_swaps ; do
    12751278                    dev_exists=`/sbin/vol_id $dev_swap | /bin/grep "$redhat_label"`
     
    12891292                    do
    12901293                        # Location of the swap label for kernel 2.6
    1291                         try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev 2> /dev/null`
     1294                        try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev &> /dev/null`
    12921295                        if [ "x$try_dev_label" = "x$redhat_label" ]; then
    12931296                            actual_dev=$try_dev
     
    12951298                    done
    12961299            fi
     1300        fi
     1301
     1302        # This part tries to retrieve the correct device from a UUID line in /etc/fstab
     1303        # current_partition contains only first column of /etc/fstab
     1304        if [ "`echo "$current_partition" | /bin/grep -i "UUID="`" != "" ]; then
     1305            str_to_find_fmt_with=$current_partition
     1306            uuid=`echo "$current_partition" | /bin/cut -d'=' -f2`
     1307            actual_dev=""
     1308
     1309            # 1st try, findfs - the RHEL way of finding labels and their partitions
     1310            if [ -x "/sbin/findfs" ]; then
     1311                actual_dev=`/sbin/findfs UUID=${uuid} 2> /dev/null`
     1312            fi
     1313   
     1314            # 2nd try : blkid, the good way for all LABEL except swap
     1315            if [ "x$actual_dev" = "x" -a -x "/sbin/blkid" ]; then
     1316                actual_dev=`/sbin/blkid | /bin/grep "$uuid" | grep UUID= | /bin/cut -d':' -f1`
     1317                # For LVM FS it will give a /dev/dm-# which should then be converted
     1318                if [ $LVM = "v2" ] && [ "`echo $actual_dev | grep '/dev/dm'`" ]; then
     1319                    major=`/bin/ls -l $actual_dev | $AWK '{print $5}'`
     1320                    minor=`/bin/ls -l $actual_dev | $AWK '{print $6}'`
     1321                    for dev in `ls /dev/mapper/*`; do
     1322                        major1=`/bin/ls -l $dev | $AWK '{print $5}'`
     1323                        minor1=`/bin/ls -l $dev | $AWK '{print $6}'`
     1324                        if [ $major1 = $major ] && [ $minor1 = $minor ]; then
     1325                            actual_dev=`/bin/ls -l $dev | $AWK '{print $10}'`
     1326                            break
     1327                        fi
     1328                    done
     1329                fi
     1330            fi
     1331   
     1332            # 3th try, with vol_id
     1333            if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
     1334                list_dev=`mount | /bin/grep -E '^/' | $AWK '{ print $1 }' `
     1335                for dev in $list_dev ; do
     1336                    dev_exists=`/sbin/vol_id $dev | /bin/grep "$uuid"`
     1337                    if [ "x$dev_exists" != "x" ]; then
     1338                        actual_dev=$dev
     1339                        break;
     1340                    fi
     1341                done
     1342            fi
    12971343
    12981344            # Check if one of all those tries has known success
     
    13001346                current_partition=$actual_dev
    13011347            else
    1302                 Die "Your system uses a 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"
     1348                Die "Your system uses a 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"
    13031349            fi
    13041350        else
     
    13741420            partition_mountpt="image"
    13751421            old_partition_fmt=$partition_format
    1376 #           partition_format="`$FDISK -l 2>> $LOGFILE | tr -s '\t' ' ' | grep -w "$absolute_partition" | $AWK 'x=$(NF-1}'`"
    13771422            partition_format="`$FDISK -l 2>> $LOGFILE | tr '*' ' ' | tr '+' ' ' | tr -s ' ' '\t' | grep -w "$absolute_partition" | cut -f5`"
    1378             echo "------- $FDISK -l log ------------" >> $LOGFILE
    1379             cat $FDISKLOG >> $LOGFILE
    1380             echo "------- $FDISK log end ------------" >> $LOGFILE
    13811423            partition_size=$(($partition_size+1)); # just in case
    13821424            if [ "$partition_format" = "Linux" ] ; then
     
    13911433        fi
    13921434        if [ ! "$partition_mountpt" ] ; then
     1435            echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
    13931436            for qq in "" `find /dev/ida/c*d* ! -name '*p*'` ; do
    13941437                partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
    1395                 echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
    1396                 cat $FDISKLOG >> $LOGFILE
    1397                 echo "------- $FDISK log end ------------" >> $LOGFILE
    13981438                [ "$partition_format" ] && break
    13991439            done
     1440            echo "------- $FDISK log end ------------" >> $LOGFILE
    14001441            if [ "$partition_format" = "Compaq diagnostics" ] ; then
    14011442                partition_format="compaq"
    14021443            elif [ ! "`grep -F device /etc/raidtab 2> /dev/null | grep -w $current_partition`" ] ; then
    1403                 LogIt "Unable to find mountpoint of $current_partition - ignoring\n"
     1444                LogIt "Unable to find mountpoint of $current_partition - ignoring"
    14041445                continue
    14051446            fi
    14061447        fi
    14071448        partition_format="`echo "$partition_format" | cut -d',' -f1`"; # in case user has ext3,ext2 or something dumb like that
    1408         [ "$partition_format" = "auto" ] && partition_format="`mount | grep -w $current_partition | awk '{print$5;}'`"; # in case user uses 'auto' (dumb!)
    1409         unofficial_outstring=`printf "\t%-15s %-15s %-15s %7s\n" $current_partition $partition_mountpt $partition_format $psz`
     1449        [ "$partition_format" = "auto" ] && partition_format="`mount | grep -w $current_partition | $AWK '{print$5;}'`"; # in case user uses 'auto' (dumb!)
     1450        unofficial_outstring=`printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid`
    14101451        if [ "$current_partition" = "" ] ; then
    14111452            echo "Unknown partition (outstring = $unofficial_outstring)" >> $LOGFILE
     
    14141455                partition_mountpt=raid
    14151456                partition_format=raid
    1416                 printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label"
    1417                 printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" >> $mountlist
     1457                printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid | tee -a $LOGFILE
     1458                printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" $uuid >> $mountlist
    14181459            else
    14191460                echo "Unknown mountpoint (outstring = $unofficial_outstring)" >> $LOGFILE
     
    14301471                partition_format="vfat"
    14311472            fi
    1432             printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label"
    1433             printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" >> $mountlist
     1473            printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid | tee -a $LOGFILE
     1474            printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" $uuid >> $mountlist
    14341475        fi
    14351476    done
     
    14911532            old_pwd=`pwd`
    14921533            cd $minidir_root/$old_diskno
    1493             cp --parents -Rdf $filename $minidir_root/$d/ || Die "Can't move $filename (sensibly) from $old_diskno to $d"
     1534            cp --parents -Rdf $filename $minidir_root/$d/ 2>> $LOGFILE || Die "Can't move $filename (sensibly) from $old_diskno to $d"
    14941535            rm -f $filename
    14951536            cd $old_pwd
     
    15101551    data_dev=$3
    15111552
    1512     echo -en "Would you like to create boot+data floppy disks now (y/n) ?"
     1553    echo -en "Would you like to create boot+data floppy disks now (y/[n]) ?"
    15131554    read i
    15141555    [ "$i" != "y" ] && [ "$i" != "Y" ] && return
     
    15361577    local i old_pwd
    15371578    if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ ! "`DidMondoCallMe`" ] ; then
    1538         echo -en "Shall I make a bootable CD image? (y/n) "
     1579        echo -en "Shall I make a bootable CD image? (y/[n]) "
    15391580        read i
    15401581        [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
    15411582    fi
    15421583    if [ ! "$MINDI_TMP" ] ; then
    1543         LogIt "NB: Mindi's bootable CD always uses isolinux.\n"
    1544         LogIt "For a bootable CD w/LILO, please use Mondo.\n"
     1584        LogIt "NB: Mindi's bootable CD always uses isolinux."
     1585        LogIt "For a bootable CD w/LILO, please use Mondo."
    15451586    fi
    15461587    rm -Rf $MINDI_TMP/iso
    15471588    mkdir -p $MINDI_TMP/iso/{images,archives,isolinux}
    1548     cp -f $1/*.img $1/*.gz $MINDI_TMP/iso/images || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MINDI_TMP/iso/images\n"
     1589    cp -f $1/*.img $1/*.gz $MINDI_TMP/iso/images 2>> $LOGFILE || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MINDI_TMP/iso/images"
    15491590    old_pwd=`pwd`
    15501591    cd $MINDI_TMP/iso
     
    15551596        k=$MINDI_TMP/iso/isolinux
    15561597        if [ -e "$j" ] ; then
    1557             LogIt "Copying $j to $k\n"
     1598            LogIt "Copying $j to $k"
    15581599            cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
    15591600            cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
     
    15631604    MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
    15641605    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?"
    1565     cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img
    1566     cp $MINDI_TMP/mindi.rdz $CACHE_LOC/initrd.img
     1606    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE
     1607    cp $MINDI_TMP/mindi.rdz $CACHE_LOC/initrd.img 2>> $LOGFILE
    15671608    [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
    15681609    cd $MINDI_TMP/iso/isolinux
     
    15741615    if [ "$ARCH" != "ia64" ] ; then
    15751616        cp $ISOLINUX isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
    1576         cp $ISOLINUX ../
     1617        cp $ISOLINUX ../ 2>> $LOGFILE
    15771618    fi
    15781619    cd $MINDI_TMP/iso
     
    15801621        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?"
    15811622    fi
    1582     [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .   
     1623    [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .    2>> $LOGFILE
    15831624    if [ "$ARCH" != "ia64" ] ; then
    15841625        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
     
    15911632        echo "mkisofs returned the following errors:-"
    15921633        cat $MINDI_TMP/mkisofs.log
    1593         LogIt "Failed to create ISO image.\n"
     1634        LogIt "Failed to create ISO image."
    15941635    else
    15951636        echo "Created bootable ISO image at $CACHE_LOC/mindi.iso" >> $LOGFILE
     
    16461687    image=$MINDI_TMP/$rand1.$rand2.img
    16471688    mtpt=$MINDI_TMP/$rand1.$rand2.mtpt
    1648     dd if=/dev/zero of=$image bs=1k count=$disksize
    1649     mke2fs -N 26 -F $image > /dev/null
     1689    dd if=/dev/zero of=$image bs=1k count=$disksize &> /dev/null
     1690    mke2fs -N 26 -F $image &> /dev/null
    16501691    mkdir -p $mtpt
    16511692    mount -o loop $image $mtpt
    16521693    cd $mtpt
    16531694    mkdir -p {dev,tmp,boot}
    1654     cp -f $1 vmlinuz
     1695    cp -f $1 vmlinuz 2>> $LOGFILE
    16551696    if [ "$?" -ne "0" ] ; then
    1656         LogIt "Failed to copy $1 to ramdisk\n"
     1697        LogIt "Failed to copy $1 to ramdisk"
    16571698        cd $old_pwd
    16581699        umount $mtpt
     
    16661707    rdev -r vmlinuz 49152
    16671708
    1668     tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz\n"
     1709    tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz"
    16691710    losetup /dev/loop0 > /dev/null 2> /dev/null
    1670     [ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing 'losetup /dev/loop0 -d'.\nReboot if necessary.\n"
     1711    [ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing 'losetup /dev/loop0 -d'.\nReboot if necessary."
    16711712    CopyBootBFile $mtpt/boot.b
    16721713
     
    17841825    dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
    17851826    if [ "$ARCH" = "ia64" ] ; then
    1786         mkdosfs $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
    1787     t=vfat
    1788     else
    1789         mke2fs -N 26 -m 0 -F $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
    1790     t=ext2
    1791     fi
    1792     [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
    1793     rm -f $MINDI_TMP/mke2fs.log
    1794     mount -t $t -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)\n\n"
    1795 # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
     1827        mkdosfs $imagefile >> $LOGFILE 2>> $LOGFILE
     1828        t=vfat
     1829    else
     1830        mke2fs -N 26 -m 0 -F $imagefile >> $LOGFILE 2>> $LOGFILE
     1831        t=ext2
     1832    fi
     1833    mount -t $t -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
     1834    # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
    17961835    mkdir -p $mountpoint/etc
    17971836    if [ "$ARCH" != "ia64" ] ; then
     
    18031842    cd $mountpoint
    18041843    if [ "$ARCH" != "ia64" ] ; then
    1805         tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz\n"
     1844        tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz"
    18061845    fi
    18071846    cd $old_pwd
    18081847    losetup /dev/loop0 > /dev/null 2> /dev/null
    1809     [ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing   'losetup /dev/loop0 -d'.\nReboot if necessary.\n"
     1848    [ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing   'losetup /dev/loop0 -d'.\nReboot if necessary."
    18101849    CopyBootBFile $mountpoint/boot.b
    18111850
     
    18151854    cp -f $MINDI_TMP/mindi.rdz $mountpoint 2>> $LOGFILE
    18161855    if [ "$?" -ne "0" ] ; then
    1817         LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint\n"
     1856        LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint"
    18181857        cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
    1819         LogIt "Please unload some of your modules and try again.\n"
     1858        LogIt "Please unload some of your modules and try again."
    18201859        rm -f $MINDI_TMP/mtpt.$$
    1821         LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
     1860        LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)"
    18221861        retval=$(($retval+1))
    18231862    fi
     
    18461885        cd $old_pwd
    18471886        umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
    1848         rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
     1887        rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
    18491888    #   losetup /dev/loop0 -d
    18501889        res=0
    18511890        write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
    18521891        res=$(($res+$?))
    1853         cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img
     1892        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img 2>> $LOGFILE
    18541893        res=$(($res+$?))
    18551894        rm -f $imagefile
    18561895        if [ "$res" -ne "0" ]; then
    1857             LogIt "Warning - failed to create 1.44MB boot/root floppies\n"
     1896            LogIt "WARNING - failed to create 1.44MB boot/root floppies"
    18581897            rm -f $imagesdir/mindi-*.1440.img
    18591898        fi
     
    18661905# make it bootable
    18671906    rm -f $mountpoint/zero
    1868     [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint
     1907    [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
    18691908    if [ "$disksize" -gt "2880" ] && [ ! "$KERN_DISK_MADE" ] ; then
    18701909        if [ "$ARCH" != "ia64" ] ; then
     
    18831922    if [ $? -ne "0" ] ; then
    18841923        if [ "`grep -F "/tmp/dev.0" $LOGFILE`" ] ; then
    1885             LogIt "The '/tmp/dev.0' error is NOT Mindi's fault. It is LILO's.\n"
    1886             LogIt "Please reboot your PC as a workaround.\n"
    1887             Die "LILO sneezed and Mindi caught a cold. Please read the README / FAQ.\n"
     1924            LogIt "The '/tmp/dev.0' error is NOT Mindi's fault. It is LILO's."
     1925            LogIt "Please reboot your PC as a workaround."
     1926            Die "LILO sneezed and Mindi caught a cold. Please read the README / FAQ."
    18881927        fi
    18891928        echo "$LILO_EXE -r $mountpoint ...failed."
    18901929        echo -en "Press ENTER to continue."; read line
    1891         LogIt "Cannot run lilo on $mountpoint\nPlease upgrade/downgrade your version of LILO. It has a bug.\n"
     1930        LogIt "Cannot run lilo on $mountpoint\nPlease upgrade/downgrade your version of LILO. It has a bug."
    18921931        retval=$(($retval+1))
    18931932    fi
    1894     cp -f $liloconf $MINDI_TMP/lilo.conf
     1933    cp -f $liloconf $MINDI_TMP/lilo.conf 2>> $LOGFILE
    18951934    if [ "$ARCH" = "ia64" ] ; then
    1896         cp `dirname $kernelpath`/*.efi $mountpoint
     1935        cp `dirname $kernelpath`/*.efi $mountpoint 2>> $LOGFILE
    18971936    fi
    18981937    umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
    18991938    echo -en "..."
    1900     rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
     1939    rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
    19011940    if [ "$retval" -eq "0" ] ; then
    19021941        echo -en "...$DONE\r"
     
    19091948        rm -f $imagefile
    19101949    fi
    1911     [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero\n"
     1950    [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero"
    19121951    return $retval
    19131952}
     
    19421981    else
    19431982        dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
    1944         mkfs.vfat $imagefile
    1945         syslinux $imagefile
    1946     fi
    1947     mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)\n\n"
     1983        mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
     1984        syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
     1985    fi
     1986    mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
    19481987
    19491988    # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
     
    19612000    cp -f $MINDI_TMP/mindi.rdz $mountpoint/initrd.img 2>> $LOGFILE
    19622001    if [ "$?" -ne "0" ] ; then
    1963         LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint\n"
     2002        LogIt "Failed to copy $MINDI_TMP/mindi.rdz to $mountpoint"
    19642003        cat $MINDI_TMP/mtpt.$$ >> $LOGFILE
    1965         LogIt "Please unload some of your modules and try again.\n"
     2004        LogIt "Please unload some of your modules and try again."
    19662005        rm -f $MINDI_TMP/mtpt.$$
    1967         LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
     2006        LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)"
    19682007        retval=$(($retval+1))
    19692008    fi
     
    19862025        cd $old_pwd
    19872026        umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
    1988         rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
     2027        rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
    19892028
    19902029        res=0
    19912030        write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
    19922031        res=$(($res+$?))
    1993         cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img
     2032        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img 2>> $LOGFILE
    19942033        res=$(($res+$?))
    19952034        rm -f $imagefile
    19962035        if [ "$res" -ne "0" ]; then
    1997             LogIt "Warning - failed to create 1.44MB boot/root floppies\n"
     2036            LogIt "WARNING - failed to create 1.44MB boot/root floppies"
    19982037            rm -f $imagesdir/mindi-*.1440.img
    19992038        fi
     
    20082047    rm -f $mountpoint/zero
    20092048    mkdir -p $mountpoint/etc
    2010     [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint
     2049    [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
    20112050    umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
    20122051    echo -en "..."
    2013     rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
     2052    rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
    20142053
    20152054    if [ "$retval" -eq "0" ] ; then
     
    20242063        rm -f $imagefile
    20252064    fi
    2026     [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero\n"
     2065    [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero"
    20272066    return $retval
    20282067}
     
    20482087        cd $MINDI_TMP
    20492088        for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
    2050             cp --parents -pRdf ./$i $bigdir || Die "PDDI can't cp $i->$bigdir"
     2089            cp --parents -pRdf ./$i $bigdir 2>> $LOGFILE || Die "PDDI can't cp $i->$bigdir"
    20512090            if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
    2052                 cp --parents -pRdf $i $bigdir
     2091                cp --parents -pRdf $i $bigdir 2>> $LOGFILE
    20532092            else
    20542093                ChopUpAndCopyFile $i $bigdir $CHOPSIZE $BIGNO
     
    20582097        for i in $EXTRA_MODS ; do
    20592098            j=`find lib/modules/$FAILSAFE_KVER -name $i.*o 2> /dev/null`
    2060             [ ! "$j" ] && echo "Warning - cannot find failsafe module $i.o" >> $LOGFILE
     2099            [ ! "$j" ] && echo "WARNING - cannot find failsafe module $i.o" >> $LOGFILE
    20612100            for k in $j ; do
    20622101                if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
    2063                     cp --parents -pRdf $k $bigdir
     2102                    cp --parents -pRdf $k $bigdir 2>> $LOGFILE
    20642103                else
    20652104                    ChopUpAndCopyFile $k $bigdir $CHOPSIZE $BIGNO
     
    20902129    for i in `mount | cut -d' ' -f3` ; do
    20912130        for j in io.sys msdos.sys ; do
    2092             [ -e "$i/$j" ] && cp -f $i/$j $bigdir
     2131            [ -e "$i/$j" ] && cp -f $i/$j $bigdir 2>> $LOGFILE
    20932132        done
    20942133    done
     
    20972136    i=`cat $MINDI_TMP/BOOTLOADER.DEVICE 2> /dev/null`
    20982137    if [ "$i" ] ; then
    2099         LogIt "Backing up $i's MBR\n"
     2138        LogIt "Backing up $i's MBR"
    21002139        dd if=$i of=$bigdir/BOOTLOADER.MBR bs=446 count=1 >> $LOGFILE 2>> $LOGFILE
    21012140        sleep 1
     
    21032142        j=$i
    21042143        [ -h "$j" ] && j=`readlink -f $j`
    2105         LogIt "Creating /dev/boot_device ($j)\n"
     2144        LogIt "Creating /dev/boot_device ($j)"
    21062145        mkdir -p $bigdir/dev
    21072146        cp -pRdf $j $bigdir/dev/boot_device 2> /dev/null || Die "Unable to create /dev/boot_device on ramdisk"
     
    21122151
    21132152    [ -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'."
    2114     cp -Rdf $MINDI_LIB/aux-tools/* . 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping aux-tools\n"
     2153    cp -Rdf $MINDI_LIB/aux-tools/* . 2>> $LOGFILE || LogIt "WARNING - error occurred while unzipping aux-tools"
    21152154    if [ -e "$MINDI_LIB/x11-tools.tgz" ] ; then
    2116         tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping x11-tools.tgz\n"
     2155        tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "WARNING - error occurred while unzipping x11-tools.tgz"
    21172156    fi
    21182157    if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
     
    21202159        [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
    21212160    fi
    2122     [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state .
     2161    [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state . 2>> $LOGFILE
    21232162    cd $old_pwd
    21242163    echo -e "$DONE"
     
    21352174    mkdir -p $minidir_root/$noof_disks/tmp
    21362175    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"
    2137     [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/.
    2138     [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     2176    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
     2177    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false"
    21392178    cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
    21402179    ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
     
    22142253        return 1
    22152254    fi
    2216     lines_total=`wc -l $orig_file | gawk '{print $1;}'`
     2255    lines_total=`wc -l $orig_file | $AWK '{print $1;}'`
    22172256    lines_remaining=$(($lines_total-$lino))
    22182257    head -n$(($lino-1)) $orig_file > $new_file
     
    22462285    fi
    22472286    # patch from Bill <bill@iwizard.biz> - 2003/08/25
    2248     res=`$FDISK -s $device`
    2249     echo "------- $FDISK -l $device log ------------" >> $LOGFILE
    2250     cat $FDISKLOG >> $LOGFILE
    2251     echo "------- $FDISK log end ------------" >> $LOGFILE
     2287    res=`$FDISK -s $device 2>> $LOGFILE`
    22522288    # end patch
    22532289    [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | grep -F "$device " | cut -d' ' -f2`
     
    22842320
    22852321    tempfile=$MINDI_TMP/$$.strip.txt
    2286     cp -f $1 $tempfile
     2322    cp -f $1 $tempfile 2>> $LOGFILE
    22872323    $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' $tempfile > $1
    22882324    rm -f $tempfile
     
    23162352    tmpfile=$MINDI_TMP/stripped.$$.dat
    23172353    [ -d "$1" ] || [ -h "$1" ] && return
    2318     cp -f $1 $tmpfile
     2354    cp -f $1 $tmpfile 2>> $LOGFILE
    23192355    strip $tmpfile 2> /dev/null
    23202356    if [ "$?" -eq "0" ] ; then
    2321         cp -f $tmpfile $1
     2357        cp -f $tmpfile $1 2>> $LOGFILE
    23222358        echo "Stripped binary $2" >> $LOGFILE
    23232359    fi
     
    23762412            # Used by ia64
    23772413            if [ "`gzip -cd $fname | strings 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
    2378                 LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it...\n"
     2414                LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it..."
    23792415                duff_kernels="$fname $duff_kernels"
    23802416            else
     
    23842420        else
    23852421            if [ "`strings $fname 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
    2386                 LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it...\n"
     2422                LogIt "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it..."
    23872423                duff_kernels="$fname $duff_kernels"
    23882424            else
     
    23962432    fi
    23972433    if [ ! "$possible_kernels" ] ; then
    2398         LogIt "No kernel matches exactly. Are there any duff kernels?\n"
     2434        LogIt "No kernel matches exactly. Are there any duff kernels?"
    23992435        possible_kernels="$duff_kernels"
    24002436        if [ ! "$possible_kernels" ] ; then
    2401             LogIt "Sorry, no duff kernels either\n"
     2437            LogIt "Sorry, no duff kernels either"
    24022438        else
    2403             LogIt "I bet you're running Debian or Gentoo, aren't you?\n"
    2404             LogIt "Your kernel doesn't have a sane builddate. Oh well...\n"
     2439            LogIt "I bet you're running Debian or Gentoo, aren't you?"
     2440            LogIt "Your kernel doesn't have a sane builddate. Oh well..."
    24052441        fi
    24062442    fi
     
    24082444    noof_kernels=`CountItemsIn "$possible_kernels"`
    24092445    if [ "$noof_kernels" -eq "0" ] ; then
    2410         LogIt "Could not find your kernel.\n"
     2446        LogIt "Could not find your kernel."
    24112447        if [ -e "/boot/vmlinuz" ] ; then
    2412             LogIt "Using /boot/vmlinuz as a last resort.\n"
     2448            LogIt "Using /boot/vmlinuz as a last resort."
    24132449            output=/boot/vmlinuz
    24142450        else
     
    24232459            if echo $i | grep "`uname -r`" ; then
    24242460                LogIt "OK, I used my initiative and found that "
    2425                 LogIt "$i is probably your kernel.\n "
     2461                LogIt "$i is probably your kernel. "
    24262462                output="$i"
    24272463                return
     
    24322468            echo "Schlomo, this one's for you." >> $LOGFILE
    24332469        else
    2434             LogIt "Two or more possible kernels found. You may specify any one of them and the \n"
    2435             LogIt "boot disks will still work, probably. If one does not work, try another.\n"
    2436             LogIt "$possible_kernels\n"
     2470            LogIt "Two or more possible kernels found. You may specify any one of them and the "
     2471            LogIt "boot disks will still work, probably. If one does not work, try another."
     2472            LogIt "$possible_kernels"
    24372473            echo ""
    24382474        fi
     
    24642500    if [ -e "dev" ] ; then
    24652501        echo "Copying dev/* to $minidir_root/$noof_disks" >> $LOGFILE
    2466         cp --parents -pRdf dev $minidir_root/$noof_disks
     2502        cp --parents -pRdf dev $minidir_root/$noof_disks 2>> $LOGFILE
    24672503    fi
    24682504    TemporarilyCompressAllFiles "$list_of_files" $minidir_root
     
    24752511        fi
    24762512        if [ "$i" -eq "0" ] ; then
    2477             LogIt "Cannot add file $filename to minidir $minidir_root\n"
     2513            LogIt "Cannot add file $filename to minidir $minidir_root"
    24782514            retval=$(($retval+1))
    24792515        fi
     
    25092545    echo -en "..."
    25102546    mke2fs -b 1024 -m 1 -i 2048 -F $tempfile >> $LOGFILE 2>> $LOGFILE
    2511 
    2512     [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
    2513     rm -f $MINDI_TMP/mke2fs.log
    25142547    echo -en "..."
    25152548    mkdir -p $mountpoint
     
    25182551    old_pwd=`pwd`
    25192552    cd $mountpoint
    2520     cp -Rdf $tgz_dir_fname/* . &>> $LOGFILE
     2553    cp -Rdf $tgz_dir_fname/* . 2>&1 >> $LOGFILE
    25212554    tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
    25222555    cd dev || Die "Can't cd to dev"
     
    25282561        s=`which $w 2> /dev/null`
    25292562        if [ -e "$s" ] ; then
    2530             cp --parents -af $s .
     2563            cp --parents -af $s . 2>> $LOGFILE
    25312564        fi
    25322565    done
     
    25812614        list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
    25822615    fi
    2583     [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS.\n"
     2616    [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS."
    25842617    for i in $list_of_groovy_mods ; do
    25852618        floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
     
    25892622        [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
    25902623        echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
    2591         cp -df $i $mountpoint/ 2>/dev/null || LogIt "Unable to copy $i to $mountpoint\n"
     2624        cp -df $i $mountpoint/ 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
    25922625        [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
    25932626    done
     
    26512684    diskno=1
    26522685    while [ "$diskno" -le "$noof_disks" ] ; do
    2653         cd $minidir_root/$diskno || LogIt "Warning - cannot cd to $minidir_root/$diskno\n"
     2686        cd $minidir_root/$diskno || LogIt "WARNING - cannot cd to $minidir_root/$diskno"
    26542687        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."
    26552688        diskno=$(($diskno+1))
    26562689        echo -n "..."
    2657         cp -pRdf * $minidir_root/all
     2690        cp -pRdf * $minidir_root/all 2>> $LOGFILE
    26582691    done
    26592692    mkdir -p $minidir_root/all/tmp
     
    26632696        for q in filelist.full.gz biggielist.txt ; do
    26642697            [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
    2665             cp -pRdf $MINDI_TMP/$q tmp/
     2698            cp -pRdf $MINDI_TMP/$q tmp/ 2>> $LOGFILE
    26662699        done
    26672700        mkdir -p $minidir_root/all/tmp
     
    26992732
    27002733if [ -e "/etc/conf.modules" ] && [ ! -e "/etc/modules.conf" ] ; then
    2701     LogIt "Warning - Ancient distro detected.\n" 1
     2734    LogIt "WARNING - Ancient distro detected." 1
    27022735    ln -sf /etc/conf.modules /etc/modules.conf
    27032736fi
     
    27942827        MINDI_TMP=$MONDO_TMP
    27952828        mkdir -p $MINDI_TMP
    2796         FDISKLOG=$MINDI_TMP/parted2fdisk.log
    27972829        CACHE_LOC=$3
    27982830        if [ _"$CACHE_LOC" != _"" ]; then
     
    28062838###
    28072839        kernelname=`echo $kernelpath | cut -d'-' -f2-`
    2808         LogIt "kernelname = $kernelname\n"
    2809         LogIt "kernelpath = $kernelpath\n"
     2840        LogIt "kernelname = $kernelname"
     2841        LogIt "kernelpath = $kernelpath"
    28102842        if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
    28112843        then
    2812            LogIt "Module path for ${kernelpath} not found...\n"
    2813            LogIt "using running kernel\'s modules.\n"
     2844           LogIt "Module path for ${kernelpath} not found..."
     2845           LogIt "using running kernel\'s modules."
    28142846           kernelname=`uname -r`
    28152847        else
    2816            LogIt "Using modules for kernel: ${kernelname}\n"
     2848           LogIt "Using modules for kernel: ${kernelname}"
    28172849        fi
    28182850###
     
    28442876        [ "$USE_COMP" = "" ] && USE_COMP=yes
    28452877        [ "$NOT_BOOT" = "" ] && NOT_BOOT=no
    2846         [ "$TAPEDEV" ] && LogIt "This is a tape-based backup. Fine.\n"
     2878        [ "$TAPEDEV" ] && LogIt "This is a tape-based backup. Fine."
    28472879        [ "$kernelpath" = "" ] && kernelpath=`TryToFindKernelPath`
    28482880        kernelname=`echo $kernelpath | cut -d'-' -f2-`
    28492881        if [ ! -d "/lib/modules/$kernelname" ] && [ "$kernelpath" != "FAILSAFE" ]
    28502882        then
    2851            LogIt "Module path for ${kernelpath} not found...\n"
    2852            LogIt "using running kernel\'s modules.\n"
     2883           LogIt "Module path for ${kernelpath} not found..."
     2884           LogIt "using running kernel\'s modules."
    28532885           kernelname=`uname -r`
    28542886        else
    2855            LogIt "Using modules for kernel: ${kernelname}\n"
     2887           LogIt "Using modules for kernel: ${kernelname}"
    28562888        fi
    28572889        [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
     
    28772909fi
    28782910
    2879 
    28802911[ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file"
    28812912if [ ! "`DidMondoCallMe`" ] ; then
    2882     LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION\n"
    2883     LogIt "Latest Mindi is available from http://www.mondorescue.org\n"
    2884     LogIt "BusyBox sources are available from http://www.busybox.net\n"
     2913    LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION"
     2914    LogIt "Latest Mindi is available from http://www.mondorescue.org"
     2915    LogIt "BusyBox sources are available from http://www.busybox.net"
    28852916    LogIt "------------------------------------------------------------------------------"
    28862917else
     
    29002931echo "NOT_BOOT = '$NOT_BOOT'" >> $LOGFILE
    29012932if [ "$NOT_BOOT" != "" ] && [ "$NOT_BOOT" != "0" ] && [ "$NOT_BOOT" != "no" ] ; then
    2902     LogIt "Just creating mondo-restore.cfg and a small all.tar.gz for Mondo. Nothing else.\n"
     2933    LogIt "Just creating mondo-restore.cfg and a small all.tar.gz for Mondo. Nothing else."
    29032934    MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
    29042935    MakeMountlist $MINDI_TMP/mountlist.txt
     
    29082939    tar -cv tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"
    29092940    sleep 2
    2910     LogIt "Done. Exiting.\n"
     2941    LogIt "Done. Exiting."
    29112942    MindiExit 0
    29122943fi
     
    29142945if [ "$kernelpath" = "" ] ; then
    29152946    [ "`DidMondoCallMe`" ] && Die "Please use -k <path> to specify kernel."
    2916     if [ $USE_OWN_KERNEL != "yes" ]; then
    2917         echo -en "Do you want to use your own kernel to build the boot disk (y/n) ?"
    2918         read ch
    2919         if [ "$ch" != "n" ] && [ "$ch" != "N" ] ; then
    2920             USE_OWN_KERNEL="yes"
    2921         fi
     2947    echo -en "Do you want to use your own kernel to build the boot disk ([y]/n) ?"
     2948    read ch
     2949    if [ "$ch" != "n" ] && [ "$ch" != "N" ] ; then
     2950        USE_OWN_KERNEL="yes"
    29222951    fi
    29232952    if [ "$USE_OWN_KERNEL" = "yes" ]; then
     
    29332962fi
    29342963if [ ! "`DidMondoCallMe`" ] ; then
    2935     echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot CD/floppies (y/n) ?"
     2964    echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot CD/floppies (y/[n]) ?"
    29362965    read ch
    2937     if [ "$ch" != "n" ] && [ "$ch" != "N" ] ; then
     2966    if [ "$ch" != "y" ] && [ "$ch" != "Y" ] ; then
     2967        USE_LILO=no
     2968    else
    29382969        USE_LILO=yes
    2939     else
    2940         USE_LILO=no
    29412970    fi
    29422971fi
    29432972if [ "$YOUR_KERNEL_SUCKS" != "" ] || [ "$kernelpath" = "" ] || [ "$kernelpath" = "SUCKS" ] || [ "$kernelpath" = "FAILSAFE" ] ; then
    29442973    kernelpath=$MINDI_LIB/vmlinuz
    2945     LogIt "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks.\n"
    2946     LogIt "However, you are still running your kernel. If Mindi fails to create your\n"
    2947     LogIt "disks then it may still be a result of a problem with your kernel.\n"
     2974    LogIt "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks."
     2975    LogIt "However, you are still running your kernel. If Mindi fails to create your"
     2976    LogIt "disks then it may still be a result of a problem with your kernel."
    29482977    pwd=`pwd`
    29492978    cd $MINDI_TMP
     
    29532982fi
    29542983echo -e "Mindi's temp dir = $MINDI_TMP \nMindi's output dir=$CACHE_LOC" >> $LOGFILE
    2955 [ "$(($RANDOM%64))" -eq "0" ] && LogIt "Dude, I've looked inside your computer and it's really dusty...\n"
    2956 
    2957 [ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it. Go to http://www.mondorescue.org and download it, then install it."
     2984[ "$(($RANDOM%64))" -eq "0" ] && LogIt "Dude, I've looked inside your computer and it's really dusty..."
     2985
     2986[ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it.\nGo to http://www.mondorescue.org and download it, then install it."
    29582987
    29592988rm -f $CACHE_LOC/{*img,*gz,*iso}
     
    29883017    else
    29893018        if ! PrepareBootDiskImage_LILO $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
    2990             LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
    2991             LogIt "if you want to make a 1.72MB floppy disk.\n"
     3019            LogIt "WARNING - failed to create 1.72MB boot image."
     3020            LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
    29923021        fi
    29933022        if ! PrepareBootDiskImage_LILO $CACHE_LOC 2880 $kernelpath $ramdisk_size ;  then
    2994             LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
    2995             LogIt "Please reduce your kernel's size\n"
    2996             LogIt "if you want to make a 2.88MB floppy disk.\n"
     3023            LogIt "WARNING - failed to create 2.88MB floppy disk image."
     3024            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
    29973025            PrepareBootDiskImage_LILO $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
    29983026        fi
     
    30003028else
    30013029    if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
    3002         LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
    3003         LogIt "if you want to make a 1.72MB floppy disk.\n"
     3030        LogIt "WARNING - failed to create 1.72MB boot image."
     3031        LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
    30043032        if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 2880 $kernelpath $ramdisk_size ; then
    3005             LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
    3006             LogIt "Please reduce your kernel's size\n"
    3007             LogIt "if you want to make a 2.88MB floppy disk.\n"
     3033            LogIt "WARNING - failed to create 2.88MB floppy disk image."
     3034            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
    30083035            PrepareBootDiskImage_SYSLINUX $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
    30093036        fi
     
    30243051    fi
    30253052    OfferToMakeBootableISO $CACHE_LOC
    3026     LogIt "Finished.\n"
     3053    LogIt "Finished."
    30273054elif [ "$TAPEDEV" ] ; then
    30283055    rm -f $CACHE_LOC/{*img,*gz,*iso}
    30293056    OfferToMakeBootableISO $CACHE_LOC
    30303057    if [ -e "$CACHE_LOC/all.tar.gz" ] ; then
    3031         cp -f $CACHE_LOC/all.tar.gz $MINDI_TMP/
     3058        cp -f $CACHE_LOC/all.tar.gz $MINDI_TMP/ 2>> $LOGFILE
    30323059    else
    30333060        Die "Cannot find all.tar.gz, to be written to tape"
     
    30373064fi
    30383065# cleanup
    3039 LogIt "$FRIENDLY_OUTSTRING\n"
     3066LogIt "$FRIENDLY_OUTSTRING"
    30403067for mtpt in $FLOPPY_WAS_MOUNTED ; do
    30413068    mount $mtpt
  • trunk/mondo-doc/mindi.8

    r764 r979  
    138138List of files to be included on boot/root disks.
    139139.TP
    140 .I /root/images/mindi/N.tar.gz
     140.I /var/cache/mindi/N.tar.gz
    141141Number N of multiple tar balls together containing root file system for rescue
    142142media.
    143143.TP
    144 .I /root/images/mindi/all.tar.gz
     144.I /var/cache/mindi/all.tar.gz
    145145Single tar ball of root file system for rescue media.
    146146.TP
    147 .I /root/images/mindi/initrd.img
     147.I /var/cache/mindi/initrd.img
    148148initrd image for bootable ISO image.
    149149.TP
    150 .I /root/images/mindi/mindi-boot.F.img
     150.I /var/cache/mindi/mindi-boot.F.img
    151151.B mindi
    152152boot floppy of size F [KB].
    153153.TP
    154 .I /root/images/mindi/mindi-root.F.img
     154.I /var/cache/mindi/mindi-root.F.img
    155155.B mindi
    156156root floppy of size F [KB].
    157157.TP
    158 .I /root/images/mindi/mindi-data.N.img
     158.I /var/cache/mindi/mindi-data.N.img
    159159.B mindi
    160160data floppy number N for boot/root floppies.
    161161.TP
    162 .I /root/images/mindi/mindi.iso
     162.I /var/cache/mindi/mindi.iso
    163163.B mindi
    164164bootable ISO image.
     165.SH CONFIGURATION FILE
     166You may create a mindi configuration file under
     167.B /etc/mindi
     168called
     169.B mindi.conf
     170which overwrites default values by setting up the following variables:
     171.TP
     172.I TMPDIR
     173.B (default /tmp): directory to create temporary files
     174.br
     175.TP
     176.I EXTRA_SPACE
     177.B (default 24576): increase if you run out of ramdisk space
     178.br
     179.TP
     180.I IA64_BOOT_SIZE
     181.B (default 8192): size of the ia64 boot disk
     182.br
     183.TP
     184.I CACHE_LOC
     185.B (default /var/cache/mindi): directory where boot/root files
     186and iso are generated
     187.br
     188WARNING: This directory is erased before usage
     189.br
    165190.SH "SEE ALSO"
    166191mondoarchive(8), mondorestore(8).
    167192.TP
    168193See mailing list at http://www.mondorescue.org for technical support.
    169 .SH BUGS
    170 The target location for the image files created by
    171 .B mindi
    172 is hard-coded to
    173 .IR "/root/images/mindi".
    174 As a workaround, it is suggested to make
    175 .I /root/images
    176 a symbolic link to the desired location for the image files.
    177194.SH AUTHORS
    178195Bruno Cornec (lead-development)
  • trunk/mondo-doc/mondorescue-howto.sgml

    r932 r979  
    117811781440+0 enregistrements écrits.
    11791179mke2fs 1.38 (30-Jun-2005)
    1180 cp: écriture de `vmlinuz': Aucun espace disponible sur le périphérique
    11811180Failed to copy /boot/vmlinuz-2.6.12-15mdk-i686-up-4GB to ramdisk
    11821181
  • trunk/mondo/src/common/libmondo-devices.c

    r914 r979  
    14621462    bkpinfo->use_lzo =
    14631463        (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
    1464 
    1465 /*
    1466   if (find_home_of_exe("star") && (!find_home_of_exe("afio") || find_home_of_exe("selinuxenabled")))
    1467     {
    1468       bkpinfo->use_star = FALSE;   
    1469       bkpinfo->use_lzo = FALSE;
    1470       log_to_screen("Using star, not afio");
    1471       if (!find_home_of_exe("afio"))
    1472     { log_to_screen("...because afio not found"); }
    1473       if (find_home_of_exe("selinuxenabled"))
    1474     { log_to_screen("...because SELINUX found"); }
    1475     }
    1476 */
    1477 
    14781464    mvaddstr_and_log_it(2, 0, " ");
    14791465
  • trunk/mondo/src/common/libmondo-stream.c

    r956 r979  
    346346    int res = 0;
    347347    int retval = 0;
    348     char *fname = (char *)&res;         /* Should NOT be NULL */
     348    char *fname = (char *)&res;                 /* Should NOT be NULL */
    349349
    350350// xattr
Note: See TracChangeset for help on using the changeset viewer.