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/libiproute/utils.c

    r821 r1770  
     1/* vi: set sw=4 ts=4: */
    12/*
    23 * utils.c
     
    1213
    1314#include "libbb.h"
    14 
    15 #include <string.h>
    16 #include <unistd.h>
    17 
    1815#include "utils.h"
    1916#include "inet_common.h"
     
    3229    return 0;
    3330}
    34 
     31//XXX: FIXME: use some libbb function instead
    3532int get_unsigned(unsigned *val, char *arg, int base)
    3633{
     
    4744}
    4845
    49 int get_u32(__u32 * val, char *arg, int base)
     46int get_u32(uint32_t * val, char *arg, int base)
    5047{
    5148    unsigned long res;
     
    6158}
    6259
    63 int get_u16(__u16 * val, char *arg, int base)
     60int get_u16(uint16_t * val, char *arg, int base)
    6461{
    6562    unsigned long res;
     
    7572}
    7673
    77 int get_u8(__u8 * val, char *arg, int base)
     74int get_u8(uint8_t * val, char *arg, int base)
    7875{
    7976    unsigned long res;
     
    8986}
    9087
    91 int get_s16(__s16 * val, char *arg, int base)
     88int get_s16(int16_t * val, char *arg, int base)
    9289{
    9390    long res;
     
    103100}
    104101
    105 int get_s8(__s8 * val, char *arg, int base)
     102int get_s8(int8_t * val, char *arg, int base)
    106103{
    107104    long res;
     
    125122    memset(addr, 0, sizeof(*addr));
    126123
    127     if (strcmp(name, bb_INET_default) == 0 ||
     124    if (strcmp(name, bb_str_default) == 0 ||
    128125        strcmp(name, "all") == 0 || strcmp(name, "any") == 0) {
    129126        addr->family = family;
     
    169166    memset(dst, 0, sizeof(*dst));
    170167
    171     if (strcmp(arg, bb_INET_default) == 0 || strcmp(arg, "any") == 0) {
     168    if (strcmp(arg, bb_str_default) == 0 || strcmp(arg, "any") == 0) {
    172169        dst->family = family;
    173170        dst->bytelen = 0;
     
    178175    slash = strchr(arg, '/');
    179176    if (slash)
    180         *slash = 0;
     177        *slash = '\0';
    181178    err = get_addr_1(dst, arg, family);
    182179    if (err == 0) {
     
    197194        }
    198195    }
    199   done:
     196 done:
    200197    if (slash)
    201198        *slash = '/';
     
    206203{
    207204    if (family == AF_PACKET) {
    208         bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context.", arg);
     205        bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg);
    209206    }
    210207    if (get_addr_1(dst, arg, family)) {
    211         bb_error_msg_and_die("an inet address is expected rather than \"%s\".", arg);
     208        bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg);
    212209    }
    213210    return 0;
     
    217214{
    218215    if (family == AF_PACKET) {
    219         bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context.", arg);
     216        bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg);
    220217    }
    221218    if (get_prefix_1(dst, arg, family)) {
    222         bb_error_msg_and_die("an inet address is expected rather than \"%s\".", arg);
    223     }
    224     return 0;
    225 }
    226 
    227 __u32 get_addr32(char *name)
     219        bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg);
     220    }
     221    return 0;
     222}
     223
     224uint32_t get_addr32(char *name)
    228225{
    229226    inet_prefix addr;
     
    237234void incomplete_command(void)
    238235{
    239     bb_error_msg("Command line is not complete. Try option \"help\"");
    240     exit(-1);
    241 }
    242 
    243 void invarg(const char * const arg, const char * const opt)
    244 {
    245     bb_error_msg(bb_msg_invalid_arg, arg, opt);
    246     exit(-1);
    247 }
    248 
    249 void duparg(char *key, char *arg)
    250 {
    251     bb_error_msg("duplicate \"%s\": \"%s\" is the second value.", key, arg);
    252     exit(-1);
    253 }
    254 
    255 void duparg2(char *key, char *arg)
    256 {
    257     bb_error_msg("either \"%s\" is duplicate, or \"%s\" is a garbage.", key, arg);
    258     exit(-1);
    259 }
    260 
    261 int matches(char *cmd, char *pattern)
    262 {
    263     int len = strlen(cmd);
    264 
    265     if (len > strlen(pattern)) {
    266         return -1;
    267     }
    268     return memcmp(pattern, cmd, len);
     236    bb_error_msg_and_die("command line is not complete, try option \"help\"");
     237}
     238
     239void invarg(const char *arg, const char *opt)
     240{
     241    bb_error_msg_and_die(bb_msg_invalid_arg, arg, opt);
     242}
     243
     244void duparg(const char *key, const char *arg)
     245{
     246    bb_error_msg_and_die("duplicate \"%s\": \"%s\" is the second value", key, arg);
     247}
     248
     249void duparg2(const char *key, const char *arg)
     250{
     251    bb_error_msg_and_die("either \"%s\" is duplicate, or \"%s\" is garbage", key, arg);
    269252}
    270253
    271254int inet_addr_match(inet_prefix * a, inet_prefix * b, int bits)
    272255{
    273     __u32 *a1 = a->data;
    274     __u32 *a2 = b->data;
     256    uint32_t *a1 = a->data;
     257    uint32_t *a2 = b->data;
    275258    int words = bits >> 0x05;
    276259
     
    282265
    283266    if (bits) {
    284         __u32 w1, w2;
    285         __u32 mask;
     267        uint32_t w1, w2;
     268        uint32_t mask;
    286269
    287270        w1 = a1[words];
     
    295278
    296279    return 0;
    297 }
    298 
    299 int __iproute2_hz_internal;
    300 
    301 int __get_hz(void)
    302 {
    303     int hz = 0;
    304     FILE *fp = fopen("/proc/net/psched", "r");
    305 
    306     if (fp) {
    307         unsigned nom, denom;
    308 
    309         if (fscanf(fp, "%*08x%*08x%08x%08x", &nom, &denom) == 2)
    310             if (nom == 1000000)
    311                 hz = denom;
    312         fclose(fp);
    313     }
    314     if (hz)
    315         return hz;
    316     return sysconf(_SC_CLK_TCK);
    317280}
    318281
     
    347310            }
    348311        }
    349         if (len > 0 && (h_ent = gethostbyaddr(addr, len, af)) != NULL) {
    350             snprintf(buf, buflen - 1, "%s", h_ent->h_name);
    351             return buf;
     312        if (len > 0) {
     313            h_ent = gethostbyaddr(addr, len, af);
     314            if (h_ent != NULL) {
     315                safe_strncpy(buf, h_ent->h_name, buflen);
     316                return buf;
     317            }
    352318        }
    353319    }
Note: See TracChangeset for help on using the changeset viewer.