Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (12 years ago)
Author:
Bruno Cornec
Message:
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod? silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian? keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René? Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi-busybox/sysklogd/logger.c

    r821 r1770  
    88 */
    99
    10 #include "busybox.h"
    11 #include <stdio.h>
    12 #include <unistd.h>
    13 #include <sys/types.h>
    14 #include <fcntl.h>
    15 #include <ctype.h>
    16 #include <string.h>
    17 #include <stdlib.h>
     10#include "libbb.h"
    1811
    1912#if !defined CONFIG_SYSLOGD
     
    4942
    5043    if (isdigit(*name))
    51         return (atoi(name));
     44        return atoi(name);
    5245    for (c = codetab; c->c_name; c++) {
    5346        if (!strcasecmp(name, c->c_name)) {
    54             return (c->c_val);
     47            return c->c_val;
    5548        }
    5649    }
    5750
    58     return (-1);
     51    return -1;
    5952}
    6053
     
    7164    int lev, fac = LOG_USER;
    7265
    73     for (save = s; *s && *s != '.'; ++s);
     66    for (save = s; *s && *s != '.'; ++s)
     67        ;
    7468    if (*s) {
    7569        *s = '\0';
    7670        fac = decode(save, facilitynames);
    7771        if (fac < 0)
    78             bb_error_msg_and_die("unknown facility name: %s", save);
     72            bb_error_msg_and_die("unknown %s name: %s", "facility", save);
    7973        *s++ = '.';
    8074    } else {
     
    8377    lev = decode(s, prioritynames);
    8478    if (lev < 0)
    85         bb_error_msg_and_die("unknown priority name: %s", save);
     79        bb_error_msg_and_die("unknown %s name: %s", "priority", save);
    8680    return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
    8781}
    8882
    8983
     84int logger_main(int argc, char **argv);
    9085int logger_main(int argc, char **argv)
    9186{
    92     int pri = LOG_USER | LOG_NOTICE;
    93     int option = 0;
    94     int c, i, opt;
    95     char buf[1024], name[128];
     87    char *str_p, *str_t;
     88    int i = 0;
     89    char name[80];
    9690
    9791    /* Fill out the name string early (may be overwritten later) */
    98     bb_getpwuid(name, geteuid(), sizeof(name));
     92    bb_getpwuid(name, sizeof(name), geteuid());
     93    str_t = name;
    9994
    10095    /* Parse any options */
    101     while ((opt = getopt(argc, argv, "p:st:")) > 0) {
    102         switch (opt) {
    103             case 's':
    104                 option |= LOG_PERROR;
    105                 break;
    106             case 'p':
    107                 pri = pencode(optarg);
    108                 break;
    109             case 't':
    110                 safe_strncpy(name, optarg, sizeof(name));
    111                 break;
    112             default:
    113                 bb_show_usage();
     96    getopt32(argv, "p:st:", &str_p, &str_t);
     97
     98    if (option_mask32 & 0x2) /* -s */
     99        i |= LOG_PERROR;
     100    //if (option_mask32 & 0x4) /* -t */
     101    openlog(str_t, i, 0);
     102    i = LOG_USER | LOG_NOTICE;
     103    if (option_mask32 & 0x1) /* -p */
     104        i = pencode(str_p);
     105
     106    argc -= optind;
     107    argv += optind;
     108    if (!argc) {
     109#define strbuf bb_common_bufsiz1
     110        while (fgets(strbuf, BUFSIZ, stdin)) {
     111            if (strbuf[0]
     112             && NOT_LONE_CHAR(strbuf, '\n')
     113            ) {
     114                /* Neither "" nor "\n" */
     115                syslog(i, "%s", strbuf);
     116            }
    114117        }
    115     }
    116 
    117     openlog(name, option, 0);
    118     if (optind == argc) {
    119         do {
    120             /* read from stdin */
    121             i = 0;
    122             while ((c = getc(stdin)) != EOF && c != '\n' &&
    123                     i < (sizeof(buf)-1)) {
    124                 buf[i++] = c;
    125             }
    126             if (i > 0) {
    127                 buf[i++] = '\0';
    128                 syslog(pri, "%s", buf);
    129             }
    130         } while (c != EOF);
    131118    } else {
    132119        char *message = NULL;
    133         int len = argc - optind; /* for the space between the args
    134                         and  '\0' */
    135         opt = len;
    136         argv += optind;
    137         for (i = 0; i < opt; i++) {
    138             len += strlen(*argv);
     120        int len = 1; /* for NUL */
     121        int pos = 0;
     122        do {
     123            len += strlen(*argv) + 1;
    139124            message = xrealloc(message, len);
    140             if(!i)
    141                 message[0] = 0;
    142             else
    143                 strcat(message, " ");
    144             strcat(message, *argv);
    145             argv++;
    146         }
    147         syslog(pri, "%s", message);
     125            sprintf(message + pos, " %s", *argv),
     126            pos = len;
     127        } while (*++argv);
     128        syslog(i, "%s", message + 1); /* skip leading " " */
    148129    }
    149130
     
    187168 * SUCH DAMAGE.
    188169 */
    189 
    190 
    191 
Note: See TracChangeset for help on using the changeset viewer.