Changeset 929 in MondoRescue for trunk

Timestamp:

Nov 14, 2006, 12:39:43 AM (17 years ago)

Author:

Bruno Cornec

Message:

mindi conf file improved

Location:

trunk

Files:

• mindi/distributions/conf/deplist.d/hw.conf (added)
• mindi/distributions/conf/deplist.d/proliant.conf (added)
• mindi/distributions/conf/mindi.conf.dist (moved) (moved from trunk/mindi/distributions/conf/mindi.conf ) (1 diff)
• mindi/distributions/rpm/mindi.spec (modified) (1 diff)
• mindi/install.sh (modified) (1 diff)
• mindi/mindi (modified) (4 diffs)
• mondo/src/lib/mr_mem.c (modified) (2 diffs)

trunk/mindi/distributions/conf/mindi.conf.dist

@@ -80 +80 @@
 mindi_boot_loader="NATIVE"
 
+#
+# Location of the fstab file
+#
+mindi_etc_fstab="/etc/fstab"
 
+#
+# Location of the logfile
+#
+mindi_log_file="/var/log/mindi.log"
+
+#
+# Interactive mode (yes|no)
+#
+mindi_interactive="no"
+
+#
+# Boot message shown during media boot
+#
+mindi_boot_msg="\
+To format and restore all files automatically, type 'nuke' <enter>.\n\
+To restore some/all files interactively, type 'interactive' <enter>.\n\
+To compare the archives with your filesystem, type 'compare' <enter>.\n\
+To boot to a command-line prompt (expert mode), type 'expert' <enter>.\n\
+You may add one or more of the following parameters as well:-\n\n\
+        donteject - mondorestore will not eject the CD; this is useful if, for\n\
+                    instance, your PC's case has a concealed CD-ROM drive\n\
+        noresize  - your mountlist will not be adjusted to use your unallocated\n\
+                    hard disk space\n\
+        textonly  - do not call any Newt library routines; this is unattractive\n\
+                    but valuable if you find your Newt library has bugs in it\n\n\
+e.g. Type 'nuke donteject textonly' if you have an unstable Newt library and \n\
+a PC whose CD-ROM drive tray would be damaged if it unexpectedly ejected.\n\
+"
+

trunk/mindi/distributions/rpm/mindi.spec

@@ -55 +55 @@
 %config(noreplace) %{_sysconfdir}/mindi/deplist.d/* 
 %config(noreplace) %{_sysconfdir}/mindi/mindi.conf
+%config(noreplace) %{_sysconfdir}/mindi/mindi.conf.dist
 %doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
 %{_mandir}/man8/*

trunk/mindi/install.sh

@@ -47 +47 @@
 install -m 644 deplist.txt $conf
 install -m 644 distributions/conf/deplist.d/* $conf/deplist.d
-install -m 644 distributions/conf/mindi.conf $conf
+install -m 444 distributions/conf/mindi.conf.dist $conf
+cat > $conf/mindi.conf << EOF
+#
+# Configuration file for mindi
+#
+# By default values are taken from $conf/mindi.conf.dist
+# You can override them here
+#
+# e.g.
+#
+#mindi_tmp_dir="/var/tmp"
+#
+EOF
+chmod 644 $conf/mindi.conf
 
 cp -af rootfs aux-tools $locallib/mindi

trunk/mindi/mindi

@@ -40 +40 @@
 fi
 
+MINDI_CONFIG_DIST="$MINDI_CONF/mindi.conf.dist"
+if [ ! -f $MINDI_CONFIG_CONF ]; then
+    echo "Unable to find $MINDI_CONFIG_CONF. Please reinstall mindi"
+    MindiExit -1
+fi
+. $MINDI_CONFIG_DIST
+
 MINDI_CONFIG="$MINDI_CONF/mindi.conf"
 if [ ! -f $MINDI_CONFIG ]; then
     echo "No $MINDI_CONFIG file found using sensible values"
 else
+    echo "Using $MINDI_CONFIG as additional config file"
     . $MINDI_CONFIG
 fi  
@@ -50 +58 @@
 # Manages defaults coming from conf files
 #
-if [ "$mindi_extra_space" == "" ]; then
-    EXTRA_SPACE=24576
-else
-    EXTRA_SPACE=$mindi_extra_space
-fi
-if [ "$mindi_ia64_boot_size" == "" ]; then
-    IA64_BOOT_SIZE=8192
-else
-    IA64_BOOT_SIZE=$mindi_ia64_boot_size
-fi
-if [ "$mindi_deplist_dir" == "" ]; then
-    DEPLIST_DIR="$MINDI_CONF/deplist.d"
-else
-    DEPLIST_DIR="$mindi_deplist_dir"
-fi
+EXTRA_SPACE=$mindi_extra_space
+IA64_BOOT_SIZE=$mindi_ia64_boot_size
+DEPLIST_DIR="$mindi_deplist_dir"
 # TBC
-if [ "$mindi_write_boot_floppy" == "" ]; then
-    WRITE_BOOT_FLOPPIES="yes"
-else
-    WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
-fi
+WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
 # TBC
-if [ "$mindi_write_cd" == "" ]; then
-    WRITE_MINDI_CD="yes"
-else
-    WRITE_MINDI_CD="$mindi_write_cd"
-fi
+WRITE_MINDI_CD="$mindi_write_cd"
 # TBC
-if [ "$mindi_images_dir" == "" ]; then
-    CACHEDIR="/var/cache/mindi"
-else
-    CACHEDIR="$mindi_images_dir"
-fi
-if [ "$mindi_dual_floppies" == "" ]; then
-    FORCE_DUAL_FLOPPIES="/var/cache/mindi"
-else
-    FORCE_DUAL_FLOPPIES="$mindi_dual_floppies"
-fi
-if [ "$mindi_tmp_dir" == "" ]; then
-    TMP_ROOT="/tmp"
-else
-    TMP_ROOT="$mindi_tmp_dir"
-fi
-if [ "$mindi_fd_device" == "" ]; then
-    FDDEVICE="/dev/fd0"
-else
-    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
-# Useless ??
-PROMPT_WRITE_BOOT_FLOPPIES="yes"
+CACHEDIR="$mindi_images_dir"
+FORCE_DUAL_FLOPPIES="$mindi_dual_floppies"
+TMP_ROOT="$mindi_tmp_dir"
+FDDEVICE="$mindi_fd_device"
+ADDITIONAL_BOOT_PARAMS="$mindi_boot_params"
+MY_FSTAB="$mindi_etc_fstab"
+LOGFILE="$mindi_log_file"
+INTERACTIVE="$mindi_interactive"
+
+if [ $INTERACTIVE == "yes" ]; then
     # do you want to be prompted to write
     # floppy images out to floppy disks?
     # if 'no', images will not be written to floppies
-
-PROMPT_MAKE_CD_IMAGE="yes"
+    PROMPT_WRITE_BOOT_FLOPPIES="yes"
+
     # Ask if you want to make a CD Image to be written?
     # if this is set to 'no', then the image will be created automatically
-
-USE_OWN_KERNEL="no"
+    PROMPT_MAKE_CD_IMAGE="yes"
+
     # If set to "no", you will be prompted for whether or not
     # you want to use your own kernel, or the supplied default.
     # If "yes" mindi will automatically use your own kernel.
-
-MY_FSTAB=/etc/fstab
+    USE_OWN_KERNEL="no"
+else
+    PROMPT_WRITE_BOOT_FLOPPIES="no"
+    PROMPT_MAKE_CD_IMAGE="no"
+    USE_OWN_KERNEL="yes"
+fi
+
 FLOPPY_MODS="ide-floppy floppy"
 TAPE_MODS="ht st osst ide-tape ide_tape"
 SCSI_MODS="3w-xxxx 53c7,8xx a100u2w a320raid aacraid advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
-
-# ide-probe-mod
 IDE_MODS="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core libata edd paride ata_piix libata via82cxxx generic"
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
@@ -133 +104 @@
 NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
 EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd"
-LOGFILE=/var/log/mindi.log
-
-BOOT_MEDIA_MESSAGE="\
-To format and restore all files automatically, type 'nuke' <enter>.\n\
-To restore some/all files interactively, type 'interactive' <enter>.\n\
-To compare the archives with your filesystem, type 'compare' <enter>.\n\
-To boot to a command-line prompt (expert mode), type 'expert' <enter>.\n\
-You may add one or more of the following parameters as well:-\n\n\
-        donteject - mondorestore will not eject the CD; this is useful if, for\n\
-                    instance, your PC's case has a concealed CD-ROM drive\n\
-        noresize  - your mountlist will not be adjusted to use your unallocated\n\
-                    hard disk space\n\
-        textonly  - do not call any Newt library routines; this is unattractive\n\
-                    but valuable if you find your Newt library has bugs in it\n\n\
-e.g. Type 'nuke donteject textonly' if you have an unstable Newt library and \n\
-a PC whose CD-ROM drive tray would be damaged if it unexpectedly ejected.\n\
-"
+
+BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
 
 # ----------------------------------------------------------------------------
-
-
-
 
 
@@ -2970 +2923 @@
   TMPMODPROBE_FLAG="Y"
 else
-  TMPMODPROBE_FLAG="N"
-  [ -e "/etc/modprobe.conf" ] && [ ! -e "/etc/modules.conf" ] && ln -sf /etc/modprobe.conf /etc/modules.conf
-  [ ! -e "/etc/modules.conf" ] && Die "/etc/modules.conf not found; you may have to create a softlink from /etc/conf.modules to /etc/modules.conf; of course, all good distros use modules.conf anyway..."
+    TMPMODPROBE_FLAG="N"
+    [ -e "/etc/modprobe.conf" ] && [ ! -e "/etc/modules.conf" ] && ln -sf /etc/modprobe.conf /etc/modules.conf
+    [ ! -e "/etc/modules.conf" ] && Die "/etc/modules.conf not found; you may have to create a softlink from /etc/conf.modules to /etc/modules.conf; of course, all good distros use modules.conf anyway..."
 fi
 FixPathIfBroken

trunk/mondo/src/lib/mr_mem.c

@@ -38 +38 @@
         mr_log_exit(-1,"Unable to alloc memory in mr_malloc\nExiting...");
     }
+    return(ret);
 }
 
@@ -56 +57 @@
 
     int res = 0;
-    va_list args;
 
     res = vasprintf(strp, fmt, ap);