Changeset 1061 in MondoRescue


Ignore:
Timestamp:
Jan 18, 2007, 1:47:59 PM (18 years ago)
Author:
Bruno Cornec
Message:
  • mpt + ohci modules added for mindi
  • PATH fixed for init in restore (/usr/games added for petris + fixes)
  • Useless conf files removed from rootfs/etc or cleaned up
  • Still trying to have a working va_list by busybox alignment
Location:
branches/stable
Files:
5 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/mindi/distributions/conf/mindi.conf.dist

    r1060 r1061  
    8181# Modules supported by mindi and required at boot time
    8282#
    83 mindi_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"
     83mindi_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 mptsas mptspi mptfc mptscsi mptctl 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"
    8484mindi_ide_mods="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_piix libata via82cxxx generic nvidia ahci sata_nv"
    85 mindi_usb_mods="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd usbhid"
     85mindi_usb_mods="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid"
    8686mindi_pcmcia_mods="pcmcia_core ds yenta_socket"
    8787mindi_cdrom_mods="cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate"

  • branches/stable/mindi/rootfs/etc/group

    r30 r1061  
    66tty::5:
    77disk::6:root,adm
    8 lp::7:lp
    98mem::8:
    109kmem::9:
    1110wheel::10:root
    1211floppy::11:root
    13 mail::12:mail
    14 news::13:news
    15 uucp::14:uucp
    16 man::15:man
    17 users::100:games
    1812nogroup::65534:

  • branches/stable/mindi/rootfs/etc/hosts

    r30 r1061  
    1 
    21127.0.0.1   localhost
    3 127.0.0.1   darkstar.frop.org darkstar
    4 212.216.176.33 mail.tin.it

  • branches/stable/mindi/rootfs/etc/ld.so.conf

    r853 r1061  
    22/usr/lib
    33/usr/local/lib
    4 /usr/ns/lib
    5 /usr/vnc/lib
    6 /usr/tcltk/lib
    74/usr/X11R6/lib
    8 /usr/srv/lib
    9 /usr/wks/lib
    10 /usr/gcc/lib
    11 /usr/perl/lib
    12 /usr/emu/lib
    13 /usr/jvm/lib
    145/lib64
    156/usr/lib64

  • branches/stable/mindi/rootfs/etc/passwd

    r30 r1061  
    1 halt:x:7:0:halt:/sbin:/sbin/halt
    2 operator:x:11:0:operator:/root:/bin/bash
    31root::0:0::/root:/bin/bash
    4 shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
    5 sync:x:5:0:sync:/sbin:/bin/sync
    62bin:x:1:1:bin:/bin:
    7 ftp:x:404:1::/home/ftp:/bin/bash
    83daemon:x:2:2:daemon:/sbin:
    94adm:x:3:4:adm:/var/adm:
    10 lp:x:4:7:lp:/var/spool/lpd:
    11 mail:x:8:12:mail:/var/spool/mail:
    12 postmaster:x:14:12:postmaster:/var/spool/mail:/bin/bash
    13 news:x:9:13:news:/usr/lib/news:
    14 uucp:x:10:14:uucp:/var/spool/uucppublic:
    15 man:x:13:15:man:/usr/man:
    16 guest:x:405:100:guest:/dev/null:/dev/null
    175nobody:x:65534:100:nobody:/dev/null:
    18 alfa::1001:0:alfa:/alfa:

  • branches/stable/mindi/rootfs/etc/shells

    r30 r1061  
    11/bin/sh
    2 

  • branches/stable/mindi/rootfs/etc/termcap

    r30 r1061  
    1111# Some entries in termcap 2.0.7 are too long and your programs
    1212# may complain "tgetent: warning: termcap entry too long". Here is
    13 a smaller termcap. But it may not cover as many terminals as the one
     13# a smaller termcap. But it may not cover as many terminals as the one
    1414# in termcap 2.0.7. You can install it as /etc/termcap.
    1515#

  • branches/stable/mindi/rootfs/sbin/init

    r1044 r1061  
    272272    if [ "`HowMuchFreeSpaceOnRamdisk`" -le "3" ] ; then
    273273        LogIt "Ramdisk is a bit smaller than I would like." 1
    274         LogIt "Please re-run Mondo/Mindi but edit /usr/local/mindi first" 1
     274        LogIt "Please re-run Mondo/Mindi but edit mindi first" 1
    275275        LogIt "and set EXTRA_SPACE to something high, e.g. 8000" 1
    276276        Die "Aborting. Please reboot."
    … …  
    424424trap CaughtSoftReset SIGTERM
    425425LOGFILE=/tmp/mondo-restore.log
    426 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/local/mondo:/usr/local/mindi:.
     426PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/games
    427427GROOVY=/tmp/groovy-stuff
    428428USER=root

  • branches/stable/mondo/src/common/libmondo-tools.c

    r1044 r1061  
    343343
    344344/**
    345  * Locate mondoarchive's home directory. Searches in /usr/local/mondo, /usr/share/mondo,
     345 * Locate mondoarchive's home directory. Searches in /usr/share/mondo,
    346346 * /usr/local/share/mondo, /opt, or if all else fails, search /usr.
    347347 *

  • branches/stable/mondo/src/include/mr_mem.h

    r1054 r1061  
    99#define MR_MEM_H
    1010
     11#ifndef _GNU_SOURCE
     12#define _GNU_SOURCE
     13#endif
     14#include <stdarg.h>
     15
    1116/* functions (public methods) */
    1217
    1318extern void mr_free(char *allocated);
    1419extern void mr_allocstr(char *alloc, const char *orig);
    15 extern void mr_asprintf(char **alloc, const char *fmt, ...);
    16 /*
    17 extern void mr_vasprintf(char **alloc, const char *fmt, va_list ap);
    18 */
     20extern void mr_asprintf(char **alloc, const char *fmt, va_list args);
    1921extern void mr_getline(char **lineptr, size_t *n, FILE *stream);
    2022extern void *mr_malloc(size_t size);

  • branches/stable/mondo/src/include/mr_msg.h

    r1054 r1061  
    99#define MR_MSG_H
    1010
     11#ifndef _GNU_SOURCE
     12#define _GNU_SOURCE
     13#endif
     14#include <stdarg.h>
     15
    1116/* functions (public methods) */
    1217
    13 #include <stdarg.h>
    14 
    15 extern void mr_msg(int debug, const char *fmt, ...);
     18extern void mr_msg(int debug, const char *fmt, va_list args);
    1619
    1720#endif                          /* MR_MSG_H */

  • branches/stable/mondo/src/lib/mr_err.c

    r1054 r1061  
    3636
    3737void mr_log_exit(int errorcode, const char *message) {
    38     mr_msg(0,message);
     38    mr_msg(0, message);
    3939    mr_exit(errorcode, message);
    4040}

  • branches/stable/mondo/src/lib/mr_mem.c

    r1054 r1061  
    1212#include <stdio.h>
    1313#include <stdlib.h>
    14 #include <stdarg.h>
    1514
    1615#include "mr_err.h"
    … …  
    5352
    5453/* encapsulation function for asprintf */
    55 void mr_asprintf(char **strp, const char *fmt, ...) {
     54void mr_asprintf(char **strp, const char *fmt, va_list args) {
    5655
    57     va_list args;
    5856    int res = 0;
    5957
    60     va_start(args, fmt);
    6158    res = vasprintf(strp, fmt, args);
    6259    if (res == -1) {
    6360        mr_log_exit(-1,"Unable to alloc memory in mr_asprintf\nExiting...");
    6461    }
    65     va_end(args);
    6662}
    6763

  • branches/stable/mondo/src/lib/mr_msg.c

    r1054 r1061  
    3030    if ((fout = fopen(mr_logfile, "w")) == NULL) {
    3131        fprintf(stderr,"Unable to write to %s\n",mr_logfile);
    32         fprintf(stderr,"Logging desactivated\n",mr_logfile);
     32        fprintf(stderr,"Logging desactivated\n");
    3333        mr_msg_close();
    3434    }
    … …  
    4141/*
    4242 * Function that log a message. Not called directly
    43  * but through macros in mr_msg.h
     43 * but through other functions
    4444 */
    45 void _mr_msg(int debug, const char *file, const char *function, int line, const char *fmt, ...) {
     45void _mr_msg(int debug, const char *file, const char *function, int line, const char *fmt, va_list args) {
    4646
    4747    int i = 0;
    4848    int res = 0;
    4949    FILE *fout = NULL;
    50     va_list args;
    5150
    5251    if (mr_logfile == NULL) {
    … …  
    6665            fprintf(fout, "%s->%s#%d: ", file, function, line);
    6766        }
    68         va_start(args, fmt);
    6967        if (vfprintf(fout, fmt, args) < 0) {
    7068            fprintf(stderr,"Unable to print to %s\n",mr_logfile);
     69            return;
    7170        }
    72         va_end(args);
    7371
    7472        fprintf(fout, "\n");
    … …  
    7977}
    8078
    81 void mr_msg(int level, const char *format, ...) {
     79void mr_msg(int level, const char *fmt, va_list args) {
    8280
    83     va_list args;
    84     va_start(args, format);
    85     _mr_msg(level, __FILE__, __FUNCTION__, __LINE__, format, args);
    86     va_end(args);
     81    _mr_msg(level, __FILE__, __FUNCTION__, __LINE__, fmt, args);
    8782}
Note: See TracChangeset for help on using the changeset viewer.