Changeset 449 in MondoRescue

Timestamp:

Mar 20, 2006, 11:41:31 PM (18 years ago)

Author:

bcornec

Message:

mindi.conf created and use in mindi + install.sh + rpm

Location:

branches/stable

Files:

• mindi/distributions/conf (added)
• mindi/distributions/conf/mindi.conf (copied) (copied from branches/stable/mondo/distributions/conf/mondorescue.conf ) (3 diffs)
• mindi/distributions/rpm/mindi.spec (modified) (1 diff)
• mindi/install.sh (modified) (2 diffs)
• mindi/mindi (modified) (5 diffs)
• mondo/distributions/conf/mondo.conf (moved) (moved from branches/stable/mondo/distributions/conf/mondorescue.conf )

branches/stable/mindi/distributions/conf/mindi.conf

@@ -1 @@
-# Mondorescue configuration file
+# Mindi configuration file
 #
 # $Id$
 #
 # We tried to give sensible defaults in this file.
-# Changing some values may render mondorescue instable
+# Changing some values may render mindi instable
 # or cause failures. Use with care.
-
-
-#
-# ISO image CLI command to use 
-# do not specify the -o, -c or the -b options, nor the directory to backup
-# as they will be generated by mondoarchive
-#
-iso_creation_cmd="/usr/bin/mkisofs"
-#iso_creation_cmd="/usr/bin/growisofs"
-
-#
-# ISO image common creation options (for mkisofs and growisofs)
-# do not specify the -o, -c or the -b options, nor the directory to backup
-#
-iso_creation_options="-J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
-#iso_creation_options="-use-the-force-luke -v  -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
-
-#
-# ISO Burning CLI command to use
-#
-iso_burning_cmd="/usr/bin/cdrecord"
-
-#
-#  ISO Burning CLI command options
-iso_burning_options="-eject dev=%s speed=%d fs=24m"
-
-#
-# ISO Burning Speed
-#
-iso_burning_speed=1
-
-#
-# Default size of media
-#
-# Use 4380 for DVDs, 650 or 700 for CDs
-#
-media_size=4380
-
-#
-# Default device of media
-#
-# Use /dev/hdc, /dev/sr0, /dev/st0, ATAPI:0,0,0, ...
-#
-media_device="/dev/hdc"
-
-#
-# Is the CD tray manual ? (yes|no)
-#
-manual_tray=no
 
 #
 # Default log level
 #
-log_level=4
+mindi_log_level=4
 
 #
-# prefix for ISO names
+# Extra space for Ram disk
 #
-prefix=mondorescue
+mindi_extra_space=24576
 
 #
 # Size of the boot image for ia64
 #
-ia64_boot_size=8192
+mindi_ia64_boot_size=8192
 
 #
-# External tape blocksize
+# deplist directory
 #
-external_tape_blocksize=131072
-
-#
-# Internal tape blocksize
-#
-internal_tape_blocksize=8192
-
-#
-# Size of the slices for biggiefiles
-#
-slice_size=4096
-
-#
-# deplist file used
-#
-deplist_file="/etc/mondorescue/deplist.txt"
+mindi_deplist_dir="/etc/mindi/deplist.d"
 
 #
 # Write boot floppies (yes|no) ?
 #
-write_boot_floppy=no
+mindi_write_boot_floppy="no"
+
+#
+# Force dual floppies ?
+#
+mindi_dual_floppies="no"
 
 #
 # Write mindi CD (yes|no) ?
 #
-write_mindi_cd=no
+mindi_write_mindi_cd="no"
 
 # 
 # Kernel to use (NATIVE|FAILSAFE|PATH TO THE KERNEL)
 #
-mondorescue_kernel="NATIVE"
+mindi_kernel="NATIVE"
 #mondorescue_kernel="/boot/vmlinuz.special"
 
@@ -111 +52 @@
 # (white space separated list of modules)
 #
-additional_modules=""
+mindi_additional_modules=""
 
 #
@@ -117 +58 @@
 # (GRUB|ELILO|LILO|RAW|NATIVE)
 #
-boot_loader=NATIVE
+mindi_boot_loader="NATIVE"
 
 #
-# Differential backup or full (yes|no)
+# Images creation dir
 #
-differential=no
-
-#
-# Default compression tool
-#
-compression_tool="/usr/bin/bzip2"
-
-#
-# Default compression level
-#
-compression_level=3
-
-#
-# Paths to exclude from backup
-# (white space separated list of paths)
-#
-exclude_files=""
-
-#
-# Activate semi-graphical mode by default (yes|no)
-#
-text_mode=no
-
-#
-# Activate automatic restore (Use with caution) (yes|no)
-#
-automatic_restore=no
-
-#
-# Scratch directory
-#
-scratch_dir=""
-#scratch_dir="/tmp/mondo/scratch"
+mindi_images_dir="/var/cache/mindi"
 
 #
 # Temporary directory
 #
-tmp_dir=""
-#tmp_dir="/tmp/mondo/tmp"
+mindi_tmp_dir="/tmp"
 
 #
-# Images creation dir
+# Floppy Disk Device
 #
-images_dir="/root/images/mindi"
+mindi_fd_device="/dev/fd0"

branches/stable/mindi/distributions/rpm/mindi.spec

@@ -60 +60 @@
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
+%config(noreplace) %{_sysconfdir}/mindi/deplist.txt %{_sysconfdir}/mindi/mindi.conf
 %doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
 %{_mandir}/man8/*
 %{_libdir}/mindi
+%attr(755,root,root) %{_sysconfdir}/mindi/mindi.conf
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/mindi/aux-tools/sbin/*

branches/stable/mindi/install.sh

@@ -46 +46 @@
 install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $locallib/mindi
 install -m 644 deplist.txt $conf
+install -m 644 distributions/conf/mindi.conf $conf
 
 cp -af rootfs aux-tools $locallib/mindi
@@ -51 +52 @@
 chmod 755 $locallib/mindi/rootfs/sbin/*
 chmod 755 $locallib/mindi/aux-tools/sbin/*
+chmod 755 $conf/mindi.conf
 
 if [ "$RPMBUILDMINDI" = "true" ]; then

branches/stable/mindi/mindi

@@ -36 +36 @@
 MINDI_SBIN=${MINDI_PREFIX}/sbin
 
-
 if [ "$ARCH" = "x86_64" ] ; then
     MINDI_LIB=${MINDI_PREFIX}/lib64/mindi
@@ -43 +42 @@
 fi
 
-EXTRA_SPACE=24576         ; # increase if you run out of ramdisk space
-IA64_BOOT_SIZE=8192       ; # size of the ia64 boot disk
-TMP_ROOT=/tmp
-WRITE_BOOT_FLOPPIES="yes" ; # do you want to be propted to write floppy images
+MINDI_CONFIG="$MINDI_CONF/mindi.conf"
+if [ ! -f $MINDI_CONFIG ]; then
+    echo "No $MINDI_CONFIG file found using sensible values"
+else
+    . $MINDI_CONFIG
+fi  
+
+#
+# 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="/etc/mindi/deplist.d"
+else
+    DEPLIST_DIR="$mindi_deplist_dir"
+fi
+if [ "$mindi_write_boot_floppy" == "" ]; then
+    WRITE_BOOT_FLOPPIES="yes"
+else
+    WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
+fi
+if [ "$mindi_write_mindi_cd" == "" ]; then
+    WRITE_BOOT_FLOPPIES="yes"
+else
+    WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
+fi
+if [ "$mindi_images_dir" == "" ]; then
+    CACHE_LOC="/var/cache/mindi"
+else
+    CACHE_LOC="$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
+
+# Other parameters
+# Useless ??
 PROMPT_WRITE_BOOT_FLOPPIES="yes"
     # do you want to be prompted to write
@@ -60 +114 @@
     # you want to use your own kernel, or the supplied default.
     # If "yes" mindi will automatically use your own kernel.
-MINDI_CONFIG="$MINDI_CONF/mindi.conf"
-if [ -f $MINDI_CONFIG ]; then
-    . $MINDI_CONFIG
-fi
+
 MY_FSTAB=/etc/fstab
 FLOPPY_MODS="ide-floppy floppy"
@@ -77 +128 @@
 EXTRA_MODS="$CDROM_MODS vfat fat loop linear raid0 raid1 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
-FDDEVICE=/dev/fd0             ; # 1.44MB floppy #0
-CACHE_LOC=/var/cache/mondo-archive
-FORCE_DUAL_FLOPPIES=no
 
 BOOT_MEDIA_MESSAGE="\
@@ -490 +538 @@
     my_partitions=`mount | fgrep $$ | cut -f1 -d' '`
     [ "$my_partitions" != "" ] && umount $my_partitions
-    [ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
+    # BCO : Too Dangerous !!!
+    #[ "$TMP_ROOT" != "/tmp" ] && rm -Rf $TMP_ROOT
     cd /tmp
     mkdir -p mindi.err