Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (13 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/networking/udhcp/script.c

    r821 r1770  
     1/* vi: set sw=4 ts=4: */
    12/* script.c
    23 *
     
    89 */
    910
    10 #include <string.h>
    11 #include <unistd.h>
    12 #include <stdio.h>
    13 #include <stdlib.h>
    14 #include <sys/socket.h>
    15 #include <netinet/in.h>
    16 #include <arpa/inet.h>
    17 #include <sys/types.h>
    18 #include <sys/wait.h>
    19 
    2011#include "common.h"
     12#include "dhcpc.h"
    2113#include "options.h"
    22 #include "dhcpd.h"
    23 #include "dhcpc.h"
     14
    2415
    2516/* get a rough idea of how long an option will be (rounding up...) */
    26 static const int max_option_length[] = {
     17static const uint8_t max_option_length[] = {
    2718    [OPTION_IP] =       sizeof("255.255.255.255 "),
    2819    [OPTION_IP_PAIR] =  sizeof("255.255.255.255 ") * 2,
    2920    [OPTION_STRING] =   1,
     21#if ENABLE_FEATURE_RFC3397
     22    [OPTION_STR1035] =  1,
     23#endif
    3024    [OPTION_BOOLEAN] =  sizeof("yes "),
    3125    [OPTION_U8] =       sizeof("255 "),
     
    4438
    4539
    46 static int sprintip(char *dest, char *pre, uint8_t *ip)
     40static int sprintip(char *dest, const char *pre, const uint8_t *ip)
    4741{
    4842    return sprintf(dest, "%s%d.%d.%d.%d", pre, ip[0], ip[1], ip[2], ip[3]);
     
    6256
    6357
    64 /* Fill dest with the text of option 'option'. */
    65 static void fill_options(char *dest, uint8_t *option, struct dhcp_option *type_p)
    66 {
    67     int type, optlen;
     58/* Allocate and fill with the text of option 'option'. */
     59static char *alloc_fill_opts(uint8_t *option, const struct dhcp_option *type_p)
     60{
     61    int len, type, optlen;
    6862    uint16_t val_u16;
    6963    int16_t val_s16;
    7064    uint32_t val_u32;
    7165    int32_t val_s32;
    72     int len = option[OPT_LEN - 2];
    73 
    74     dest += sprintf(dest, "%s=", type_p->name);
    75 
     66    char *dest, *ret;
     67
     68    len = option[OPT_LEN - 2];
    7669    type = type_p->flags & TYPE_MASK;
    7770    optlen = option_lengths[type];
    78     for(;;) {
     71
     72    dest = ret = xmalloc(upper_length(len, type) + strlen(type_p->name) + 2);
     73    dest += sprintf(ret, "%s=", type_p->name);
     74
     75    for (;;) {
    7976        switch (type) {
    8077        case OPTION_IP_PAIR:
    8178            dest += sprintip(dest, "", option);
    82             *(dest++) = '/';
     79            *dest++ = '/';
    8380            option += 4;
    8481            optlen = 4;
     
    111108            memcpy(dest, option, len);
    112109            dest[len] = '\0';
    113             return;  /* Short circuit this case */
     110            return ret;  /* Short circuit this case */
     111#if ENABLE_FEATURE_RFC3397
     112        case OPTION_STR1035:
     113            /* unpack option into dest; use ret for prefix (i.e., "optname=") */
     114            dest = dname_dec(option, len, ret);
     115            free(ret);
     116            return dest;
     117#endif
    114118        }
    115119        option += optlen;
     
    118122        dest += sprintf(dest, " ");
    119123    }
     124    return ret;
    120125}
    121126
     
    127132    int i, j;
    128133    char **envp;
     134    char *var;
    129135    uint8_t *temp;
    130136    struct in_addr subnet;
    131137    char over = 0;
    132138
    133     if (packet == NULL)
    134         num_options = 0;
    135     else {
    136         for (i = 0; dhcp_options[i].code; i++)
     139    if (packet) {
     140        for (i = 0; dhcp_options[i].code; i++) {
    137141            if (get_option(packet, dhcp_options[i].code)) {
    138142                num_options++;
     
    140144                    num_options++; /* for mton */
    141145            }
    142         if (packet->siaddr) num_options++;
    143         if ((temp = get_option(packet, DHCP_OPTION_OVER)))
     146        }
     147        if (packet->siaddr)
     148            num_options++;
     149        temp = get_option(packet, DHCP_OPTION_OVER);
     150        if (temp)
    144151            over = *temp;
    145         if (!(over & FILE_FIELD) && packet->file[0]) num_options++;
    146         if (!(over & SNAME_FIELD) && packet->sname[0]) num_options++;
     152        if (!(over & FILE_FIELD) && packet->file[0])
     153            num_options++;
     154        if (!(over & SNAME_FIELD) && packet->sname[0])
     155            num_options++;
    147156    }
    148157
    149158    envp = xzalloc(sizeof(char *) * (num_options + 5));
    150159    j = 0;
    151     envp[j++] = bb_xasprintf("interface=%s", client_config.interface);
    152     envp[j++] = bb_xasprintf("PATH=%s",
    153         getenv("PATH") ? : "/bin:/usr/bin:/sbin:/usr/sbin");
    154     envp[j++] = bb_xasprintf("HOME=%s", getenv("HOME") ? : "/");
    155 
    156     if (packet == NULL) return envp;
     160    envp[j++] = xasprintf("interface=%s", client_config.interface);
     161    var = getenv("PATH");
     162    if (var)
     163        envp[j++] = xasprintf("PATH=%s", var);
     164    var = getenv("HOME");
     165    if (var)
     166        envp[j++] = xasprintf("HOME=%s", var);
     167
     168    if (packet == NULL)
     169        return envp;
    157170
    158171    envp[j] = xmalloc(sizeof("ip=255.255.255.255"));
    159172    sprintip(envp[j++], "ip=", (uint8_t *) &packet->yiaddr);
    160173
    161 
    162174    for (i = 0; dhcp_options[i].code; i++) {
    163         if (!(temp = get_option(packet, dhcp_options[i].code)))
     175        temp = get_option(packet, dhcp_options[i].code);
     176        if (!temp)
    164177            continue;
    165         envp[j] = xmalloc(upper_length(temp[OPT_LEN - 2],
    166             dhcp_options[i].flags & TYPE_MASK) + strlen(dhcp_options[i].name) + 2);
    167         fill_options(envp[j++], temp, &dhcp_options[i]);
     178        envp[j++] = alloc_fill_opts(temp, &dhcp_options[i]);
    168179
    169180        /* Fill in a subnet bits option for things like /24 */
    170181        if (dhcp_options[i].code == DHCP_SUBNET) {
    171182            memcpy(&subnet, temp, 4);
    172             envp[j++] = bb_xasprintf("mask=%d", mton(&subnet));
     183            envp[j++] = xasprintf("mask=%d", mton(&subnet));
    173184        }
    174185    }
     
    180191        /* watch out for invalid packets */
    181192        packet->file[sizeof(packet->file) - 1] = '\0';
    182         envp[j++] = bb_xasprintf("boot_file=%s", packet->file);
     193        envp[j++] = xasprintf("boot_file=%s", packet->file);
    183194    }
    184195    if (!(over & SNAME_FIELD) && packet->sname[0]) {
    185196        /* watch out for invalid packets */
    186197        packet->sname[sizeof(packet->sname) - 1] = '\0';
    187         envp[j++] = bb_xasprintf("sname=%s", packet->sname);
     198        envp[j++] = xasprintf("sname=%s", packet->sname);
    188199    }
    189200    return envp;
     
    200211        return;
    201212
    202     DEBUG(LOG_INFO, "vforking and execle'ing %s", client_config.script);
     213    DEBUG("vfork'ing and execle'ing %s", client_config.script);
    203214
    204215    envp = fill_envp(packet);
     216
    205217    /* call script */
     218// can we use wait4pid(spawn(...)) here?
    206219    pid = vfork();
    207     if (pid) {
    208         waitpid(pid, NULL, 0);
    209         for (curr = envp; *curr; curr++) free(*curr);
    210         free(envp);
    211         return;
    212     } else if (pid == 0) {
     220    if (pid < 0) return;
     221    if (pid == 0) {
    213222        /* close fd's? */
    214 
    215223        /* exec script */
    216224        execle(client_config.script, client_config.script,
    217225               name, NULL, envp);
    218         LOG(LOG_ERR, "script %s failed: %m", client_config.script);
    219         exit(1);
    220     }
    221 }
     226        bb_perror_msg_and_die("script %s failed", client_config.script);
     227    }
     228    waitpid(pid, NULL, 0);
     229    for (curr = envp; *curr; curr++)
     230        free(*curr);
     231    free(envp);
     232}
Note: See TracChangeset for help on using the changeset viewer.