Changeset 489 in MondoRescue for trunk/mindi

Timestamp:

Apr 19, 2006, 11:02:43 AM (18 years ago)

Author:

bcornec

Message:

svn merge -r 463:482 $SVN_M/branches/stable
svn merge -r 485:488 $SVN_M/branches/stable

Location:

trunk/mindi

Files:

• distributions/conf/deplist.d/devices.conf (copied) (copied from branches/stable/mindi/distributions/conf/deplist.d/devices.conf )
• distributions/conf/mindi.conf (modified) (3 diffs)
• distributions/rpm/changelog (copied) (copied from branches/stable/mindi/distributions/rpm/changelog )
• install.sh (modified) (3 diffs)
• mindi (modified) (11 diffs)

trunk/mindi/distributions/conf/mindi.conf

@@ -6 +6 @@
 # Changing some values may render mindi instable
 # or cause failures. Use with care.
-
-#
-# Default log level
-#
-mindi_log_level=4
 
 #
@@ -40 +35 @@
 # Write mindi CD (yes|no) ?
 #
-mindi_write_mindi_cd="no"
-
-# 
-# Kernel to use (NATIVE|FAILSAFE|PATH TO THE KERNEL)
-#
-mindi_kernel="NATIVE"
-#mondorescue_kernel="/boot/vmlinuz.special"
-
-#
-# Additinal modules to support 
-# (white space separated list of modules)
-#
-mindi_additional_modules=""
-
-#
-# Boot loader to use
-# (GRUB|ELILO|LILO|RAW|NATIVE)
-#
-mindi_boot_loader="NATIVE"
+mindi_write_cd="no"
 
 #
@@ -74 +51 @@
 #
 mindi_fd_device="/dev/fd0"
+
+#
+# Additional Boot Parameters
+#
+mindi_boot_params="acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
+
+# TBC
+#  
+# Kernel to use (NATIVE|FAILSAFE|PATH TO THE KERNEL)
+#
+mindi_kernel="NATIVE"
+#mindi_kernel="/boot/vmlinuz.special"
+
+#
+# Additinal modules to support 
+# (white space separated list of modules)
+#
+mindi_additional_modules=""
+
+#
+# Boot loader to use
+# (GRUB|ELILO|LILO|RAW|NATIVE)
+#
+mindi_boot_loader="NATIVE"
+
+

trunk/mindi/install.sh

@@ -61 +61 @@
 fi
 chmod 755 $local/sbin/mindi
-install -m 755 analyze-my-lvm parted2fdisk.pl $local/sbin
+install -m 755 parted2fdisk.pl $local/sbin
+install -m 755 analyze-my-lvm $locallib/mindi
 
 install -m 644 mindi.8 $MANDIR
@@ -106 +107 @@
 if [ "$RPMBUILDMINDI" != "true" ]; then
     chown -R root:root $locallib/mindi $conf $DOCDIR
-    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl 
+    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $locallib/mindi/analyze-my-lvm $local/sbin/parted2fdisk.pl 
     if [ "$ARCH" = "ia64" ] ; then
         chown root:root $local/sbin/parted2fdisk
@@ -112 +113 @@
 fi
 
-# Special case for SuSE family wher doc is put elsewhere in the RPM
-if [ _"$dfam" != _"suse" ] then;
+# Special case for SuSE family where doc is put elsewhere in the RPM
+if [ _"$dfam" = _"suse" ]; then
     rm -rf $DOCDIR
 fi

trunk/mindi/mindi

@@ -15 +15 @@
 ### Which arch are we on (useful for ia64 port)
 export ARCH=`/bin/arch`
-
-ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
 
 RUN_AFTER_INITIAL_BOOT_PHASE="echo \"Who lives in a pineapple under the sea?\" > /tmp/spongebob.squarepants.txt"
@@ -62 +60 @@
     IA64_BOOT_SIZE=$mindi_ia64_boot_size
 fi
-
 if [ "$mindi_deplist_dir" == "" ]; then
     DEPLIST_DIR="$MINDI_CONF/deplist.d"
@@ -68 +65 @@
     DEPLIST_DIR="$mindi_deplist_dir"
 fi
+# TBC
 if [ "$mindi_write_boot_floppy" == "" ]; then
     WRITE_BOOT_FLOPPIES="yes"
@@ -73 +71 @@
     WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
 fi
-if [ "$mindi_write_mindi_cd" == "" ]; then
-    WRITE_BOOT_FLOPPIES="yes"
+# TBC
+if [ "$mindi_write_cd" == "" ]; then
+    WRITE_MINDI_CD="yes"
 else
-    WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
+    WRITE_MINDI_CD="$mindi_write_cd"
 fi
+# TBC
 if [ "$mindi_images_dir" == "" ]; then
     CACHE_LOC="/var/cache/mindi"
@@ -98 +98 @@
     FDDEVICE="$mindi_fd_device"
 fi
+if [ "mindi_boot_params" == "" ]; then
+    ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
+else
+    ADDITIONAL_BOOT_PARAMS="$mindi_boot_params"
+fi
+
 
 # Other parameters
@@ -1361 +1367 @@
     if [ -d "/proc/lvm" ] || [ -d "/dev/mapper" ]; then
     echo -en "\rAnalyzing LVM...\r"
-    all_partitions=`$MINDI_SBIN/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
+    all_partitions=`$MINDI_LIB/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
     fi
     all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
@@ -1784 +1790 @@
     return $res
 
-# --- the kernel-only method NO LONGER WORKS. Not since Apr 2002.
-# It should work, according to the Boot Disk HOWTO, but it doesn't.
-# It works for my failsafe kernel & for RH7.2 but not RH7.3, 8.0, etc.
-# -Hugo, Apr 19th 2004
-#   dd if=$1 of=$2 bs=1k &> /dev/null || Die "Cannot dd blank file"
-#   dd if=/dev/zero bs=1k count=$3 >> $2 2> /dev/null || Die "Cannot dd blank file"
-#   mv -f $2 $2.old
-#   dd if=$2.old bs=1k count=$3 of=$2 &> /dev/null || Die "Cannot dd blank file"
-#   rm -f $2.old
-#   if [ "$3" = "1440" ] ; then
-#       rdev $2 "/dev/fd0H"$3
-#   else
-#       rdev $2 "/dev/fd0u"$3
-#   fi
-#   rdev -R $2 0
-#   rdev -r $2 49152
 }
 
@@ -2257 +2247 @@
     noof_disks=$?
     [ "$noof_disks" -eq "0" ] && Die "Too much stuff!"
-#    if [ "$noof_disks" -ge "8" ] ; then
-#        LogIt "You are putting a ludicrously large amount of data on these disks."
-#        LogIt "I shall therefore double EXTRA_SPACE, just in case your ramdisk is too small."
-#        EXTRA_SPACE=$(($EXTRA_SPACE*2))
-#    fi
     MakeMountlist $TMP_ROOT/mountlist.txt
     mkdir -p $minidir_root/$noof_disks/tmp
@@ -2267 +2252 @@
     cp -f $TMP_ROOT/mountlist.txt $CACHE_LOC
     [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDO_TMP/.
-    [ -d "/proc/lvm" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
-    [ -d "/dev/mapper" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
+    [ -d "/proc/lvm" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
+    [ -d "/dev/mapper" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
     ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
@@ -2585 +2570 @@
        root="/"
     fi
-    for fname in `find $root -maxdepth 2 -type f | fgrep lin | fgrep -v /proc/` ; do
+    for fname in `find $root -maxdepth 2 -type f | fgrep lin | egrep -v '^/proc/|^/net/'` ; do
     [ ! -e "$fname" ] && continue
         [ "$fname" = "/boot/vmlinuz.shipped" ] && [ -f "/boot/vmlinuz" ] && continue; # ignore SuSE's extra kernel
@@ -3234 +3219 @@
     else
         if ! PrepareBootDiskImage_LILO $imagesdir 1722 $kernelpath $ramdisk_size ; then
-        LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
-        LogIt "if you want to make a 1.72MB floppy disk.\n"
-        fi
-        PrepareBootDiskImage_LILO $imagesdir 2880 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
+            LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
+            LogIt "if you want to make a 1.72MB floppy disk.\n"
+        fi
+        if ! PrepareBootDiskImage_LILO $imagesdir 2880 $kernelpath $ramdisk_size ;  then
+            LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
+            LogIt "Please reduce your kernel's size\n"
+            LogIt "if you want to make a 2.88MB floppy disk.\n"
+            PrepareBootDiskImage_LILO $imagesdir 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
+        fi
     fi
 else