Changeset 929 for trunk


Ignore:
Timestamp:
Nov 14, 2006, 12:39:43 AM (13 years ago)
Author:
bruno
Message:

mindi conf file improved

Location:
trunk
Files:
2 added
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/mindi/distributions/conf/mindi.conf.dist

    r895 r929  
    8080mindi_boot_loader="NATIVE"
    8181
     82#
     83# Location of the fstab file
     84#
     85mindi_etc_fstab="/etc/fstab"
    8286
     87#
     88# Location of the logfile
     89#
     90mindi_log_file="/var/log/mindi.log"
     91
     92#
     93# Interactive mode (yes|no)
     94#
     95mindi_interactive="no"
     96
     97#
     98# Boot message shown during media boot
     99#
     100mindi_boot_msg="\
     101To format and restore all files automatically, type 'nuke' <enter>.\n\
     102To restore some/all files interactively, type 'interactive' <enter>.\n\
     103To compare the archives with your filesystem, type 'compare' <enter>.\n\
     104To boot to a command-line prompt (expert mode), type 'expert' <enter>.\n\
     105You may add one or more of the following parameters as well:-\n\n\
     106        donteject - mondorestore will not eject the CD; this is useful if, for\n\
     107                    instance, your PC's case has a concealed CD-ROM drive\n\
     108        noresize  - your mountlist will not be adjusted to use your unallocated\n\
     109                    hard disk space\n\
     110        textonly  - do not call any Newt library routines; this is unattractive\n\
     111                    but valuable if you find your Newt library has bugs in it\n\n\
     112e.g. Type 'nuke donteject textonly' if you have an unstable Newt library and \n\
     113a PC whose CD-ROM drive tray would be damaged if it unexpectedly ejected.\n\
     114"
     115
  • trunk/mindi/distributions/rpm/mindi.spec

    r923 r929  
    5555%config(noreplace) %{_sysconfdir}/mindi/deplist.d/*
    5656%config(noreplace) %{_sysconfdir}/mindi/mindi.conf
     57%config(noreplace) %{_sysconfdir}/mindi/mindi.conf.dist
    5758%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
    5859%{_mandir}/man8/*
  • trunk/mindi/install.sh

    r923 r929  
    4747install -m 644 deplist.txt $conf
    4848install -m 644 distributions/conf/deplist.d/* $conf/deplist.d
    49 install -m 644 distributions/conf/mindi.conf $conf
     49install -m 444 distributions/conf/mindi.conf.dist $conf
     50cat > $conf/mindi.conf << EOF
     51#
     52# Configuration file for mindi
     53#
     54# By default values are taken from $conf/mindi.conf.dist
     55# You can override them here
     56#
     57# e.g.
     58#
     59#mindi_tmp_dir="/var/tmp"
     60#
     61EOF
     62chmod 644 $conf/mindi.conf
    5063
    5164cp -af rootfs aux-tools $locallib/mindi
  • trunk/mindi/mindi

    r903 r929  
    4040fi
    4141
     42MINDI_CONFIG_DIST="$MINDI_CONF/mindi.conf.dist"
     43if [ ! -f $MINDI_CONFIG_CONF ]; then
     44    echo "Unable to find $MINDI_CONFIG_CONF. Please reinstall mindi"
     45    MindiExit -1
     46fi
     47. $MINDI_CONFIG_DIST
     48
    4249MINDI_CONFIG="$MINDI_CONF/mindi.conf"
    4350if [ ! -f $MINDI_CONFIG ]; then
    4451    echo "No $MINDI_CONFIG file found using sensible values"
    4552else
     53    echo "Using $MINDI_CONFIG as additional config file"
    4654    . $MINDI_CONFIG
    4755fi 
     
    5058# Manages defaults coming from conf files
    5159#
    52 if [ "$mindi_extra_space" == "" ]; then
    53     EXTRA_SPACE=24576
    54 else
    55     EXTRA_SPACE=$mindi_extra_space
    56 fi
    57 if [ "$mindi_ia64_boot_size" == "" ]; then
    58     IA64_BOOT_SIZE=8192
    59 else
    60     IA64_BOOT_SIZE=$mindi_ia64_boot_size
    61 fi
    62 if [ "$mindi_deplist_dir" == "" ]; then
    63     DEPLIST_DIR="$MINDI_CONF/deplist.d"
    64 else
    65     DEPLIST_DIR="$mindi_deplist_dir"
    66 fi
     60EXTRA_SPACE=$mindi_extra_space
     61IA64_BOOT_SIZE=$mindi_ia64_boot_size
     62DEPLIST_DIR="$mindi_deplist_dir"
    6763# TBC
    68 if [ "$mindi_write_boot_floppy" == "" ]; then
    69     WRITE_BOOT_FLOPPIES="yes"
    70 else
    71     WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
    72 fi
     64WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
    7365# TBC
    74 if [ "$mindi_write_cd" == "" ]; then
    75     WRITE_MINDI_CD="yes"
    76 else
    77     WRITE_MINDI_CD="$mindi_write_cd"
    78 fi
     66WRITE_MINDI_CD="$mindi_write_cd"
    7967# TBC
    80 if [ "$mindi_images_dir" == "" ]; then
    81     CACHEDIR="/var/cache/mindi"
    82 else
    83     CACHEDIR="$mindi_images_dir"
    84 fi
    85 if [ "$mindi_dual_floppies" == "" ]; then
    86     FORCE_DUAL_FLOPPIES="/var/cache/mindi"
    87 else
    88     FORCE_DUAL_FLOPPIES="$mindi_dual_floppies"
    89 fi
    90 if [ "$mindi_tmp_dir" == "" ]; then
    91     TMP_ROOT="/tmp"
    92 else
    93     TMP_ROOT="$mindi_tmp_dir"
    94 fi
    95 if [ "$mindi_fd_device" == "" ]; then
    96     FDDEVICE="/dev/fd0"
    97 else
    98     FDDEVICE="$mindi_fd_device"
    99 fi
    100 if [ "mindi_boot_params" == "" ]; then
    101     ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
    102 else
    103     ADDITIONAL_BOOT_PARAMS="$mindi_boot_params"
    104 fi
    105 
    106 
    107 # Other parameters
    108 # Useless ??
    109 PROMPT_WRITE_BOOT_FLOPPIES="yes"
     68CACHEDIR="$mindi_images_dir"
     69FORCE_DUAL_FLOPPIES="$mindi_dual_floppies"
     70TMP_ROOT="$mindi_tmp_dir"
     71FDDEVICE="$mindi_fd_device"
     72ADDITIONAL_BOOT_PARAMS="$mindi_boot_params"
     73MY_FSTAB="$mindi_etc_fstab"
     74LOGFILE="$mindi_log_file"
     75INTERACTIVE="$mindi_interactive"
     76
     77if [ $INTERACTIVE == "yes" ]; then
    11078    # do you want to be prompted to write
    11179    # floppy images out to floppy disks?
    11280    # if 'no', images will not be written to floppies
    113 
    114 PROMPT_MAKE_CD_IMAGE="yes"
     81    PROMPT_WRITE_BOOT_FLOPPIES="yes"
     82
    11583    # Ask if you want to make a CD Image to be written?
    11684    # if this is set to 'no', then the image will be created automatically
    117 
    118 USE_OWN_KERNEL="no"
     85    PROMPT_MAKE_CD_IMAGE="yes"
     86
    11987    # If set to "no", you will be prompted for whether or not
    12088    # you want to use your own kernel, or the supplied default.
    12189    # If "yes" mindi will automatically use your own kernel.
    122 
    123 MY_FSTAB=/etc/fstab
     90    USE_OWN_KERNEL="no"
     91else
     92    PROMPT_WRITE_BOOT_FLOPPIES="no"
     93    PROMPT_MAKE_CD_IMAGE="no"
     94    USE_OWN_KERNEL="yes"
     95fi
     96
    12497FLOPPY_MODS="ide-floppy floppy"
    12598TAPE_MODS="ht st osst ide-tape ide_tape"
    12699SCSI_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"
    127 
    128 # ide-probe-mod
    129100IDE_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"
    130101PCMCIA_MODS="pcmcia_core ds yenta_socket"
     
    133104NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
    134105EXTRA_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"
    135 LOGFILE=/var/log/mindi.log
    136 
    137 BOOT_MEDIA_MESSAGE="\
    138 To format and restore all files automatically, type 'nuke' <enter>.\n\
    139 To restore some/all files interactively, type 'interactive' <enter>.\n\
    140 To compare the archives with your filesystem, type 'compare' <enter>.\n\
    141 To boot to a command-line prompt (expert mode), type 'expert' <enter>.\n\
    142 You may add one or more of the following parameters as well:-\n\n\
    143         donteject - mondorestore will not eject the CD; this is useful if, for\n\
    144                     instance, your PC's case has a concealed CD-ROM drive\n\
    145         noresize  - your mountlist will not be adjusted to use your unallocated\n\
    146                     hard disk space\n\
    147         textonly  - do not call any Newt library routines; this is unattractive\n\
    148                     but valuable if you find your Newt library has bugs in it\n\n\
    149 e.g. Type 'nuke donteject textonly' if you have an unstable Newt library and \n\
    150 a PC whose CD-ROM drive tray would be damaged if it unexpectedly ejected.\n\
    151 "
     106
     107BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
    152108
    153109# ----------------------------------------------------------------------------
    154 
    155 
    156 
    157110
    158111
     
    29702923  TMPMODPROBE_FLAG="Y"
    29712924else
    2972   TMPMODPROBE_FLAG="N"
    2973   [ -e "/etc/modprobe.conf" ] && [ ! -e "/etc/modules.conf" ] && ln -sf /etc/modprobe.conf /etc/modules.conf
    2974   [ ! -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..."
     2925    TMPMODPROBE_FLAG="N"
     2926    [ -e "/etc/modprobe.conf" ] && [ ! -e "/etc/modules.conf" ] && ln -sf /etc/modprobe.conf /etc/modules.conf
     2927    [ ! -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..."
    29752928fi
    29762929FixPathIfBroken
  • trunk/mondo/src/lib/mr_mem.c

    r900 r929  
    3838        mr_log_exit(-1,"Unable to alloc memory in mr_malloc\nExiting...");
    3939    }
     40    return(ret);
    4041}
    4142
     
    5657
    5758    int res = 0;
    58     va_list args;
    5959
    6060    res = vasprintf(strp, fmt, ap);
Note: See TracChangeset for help on using the changeset viewer.