Changeset 964 in MondoRescue

Timestamp:

Nov 23, 2006, 5:00:10 PM (18 years ago)

Author:

Bruno Cornec

Message:

Improved again mindi's messages

File:

• branches/stable/mindi/mindi (modified) (8 diffs)

branches/stable/mindi/mindi

@@ -422 +422 @@
     mkdir -p $mountpoint
     dd if=/dev/zero of=$imagefile bs=1k count=1440 &> /dev/null || LogIt "Cannot dd (CODI)"
-    mke2fs -N 12 -F $imagefile > $MINDI_TMP/mke2fs.$$ 2>> $MINDI_TMP/mke2fs.$$
-    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.$$
-    rm -f $MINDI_TMP/mke2fs.$$
+    mke2fs -N 12 -F $imagefile >> $LOGFILE 2>> $LOGFILE
     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/
@@ -1678 +1676 @@
     mtpt=$MINDI_TMP/$rand1.$rand2.mtpt
     dd if=/dev/zero of=$image bs=1k count=$disksize &> /dev/null
-    mke2fs -N 26 -F $image > /dev/null
+    mke2fs -N 26 -F $image &> /dev/null
     mkdir -p $mtpt
     mount -o loop $image $mtpt
@@ -1815 +1813 @@
     dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
     if [ "$ARCH" = "ia64" ] ; then
-        mkdosfs $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
-    t=vfat
-    else
-        mke2fs -N 26 -m 0 -F $imagefile > $MINDI_TMP/mke2fs.log 2>> $MINDI_TMP/mke2fs.log
-    t=ext2
-    fi
-    [ "$?" -ne "0" ] && cat $MINDI_TMP/mke2fs.log
-    rm -f $MINDI_TMP/mke2fs.log
+        mkdosfs $imagefile >> $LOGFILE 2>> $LOGFILE
+        t=vfat
+    else
+        mke2fs -N 26 -m 0 -F $imagefile >> $LOGFILE 2>> $LOGFILE
+        t=ext2
+    fi
     mount -t $t -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
-# copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
+    # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
     mkdir -p $mountpoint/etc
     if [ "$ARCH" != "ia64" ] ; then
@@ -1973 +1969 @@
     else
         dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
-        mkfs.vfat $imagefile 2>> $LOGFILE
-        syslinux $imagefile 2>> $LOGFILE
+        mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
+        syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
     fi
     mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
@@ -2167 +2163 @@
     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"
     [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
-    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
+    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false"
     cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
     ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
@@ -2539 +2535 @@
     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
@@ -2991 +2984 @@
     else
         if ! PrepareBootDiskImage_LILO $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
-            LogIt "WARNING - failed to create 1.72MB boot image. Please reduce your kernel's size"
-            LogIt "if you want to make a 1.72MB floppy disk."
+            LogIt "WARNING - failed to create 1.72MB boot image."
+            LogIt "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
             LogIt "WARNING - failed to create 2.88MB floppy disk image."
-            LogIt "Please reduce your kernel's size"
-            LogIt "if you want to make a 2.88MB floppy disk."
+            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
             PrepareBootDiskImage_LILO $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
         fi
@@ -3003 +2995 @@
 else
     if ! PrepareBootDiskImage_SYSLINUX $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
-        LogIt "WARNING - failed to create 1.72MB boot image. Please reduce your kernel's size"
-        LogIt "if you want to make a 1.72MB floppy disk."
+        LogIt "WARNING - failed to create 1.72MB boot image."
+        LogIt "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
             LogIt "WARNING - failed to create 2.88MB floppy disk image."
-            LogIt "Please reduce your kernel's size"
-            LogIt "if you want to make a 2.88MB floppy disk."
+            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
             PrepareBootDiskImage_SYSLINUX $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
         fi