Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (16 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/libbb/messages.c

    r821 r1770  
    44 *
    55 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
    6  *
    76 */
    87
    98#include "libbb.h"
    109
    11 #ifdef L_full_version
    1210#ifndef BB_EXTRA_VERSION
    13 #define LIBBB_BANNER "BusyBox's library v" BB_VER " (" BB_BT ")"
     11#define BANNER "BusyBox v" BB_VER " (" BB_BT ")"
    1412#else
    15 #define LIBBB_BANNER "BusyBox's library v" BB_VER " (" BB_EXTRA_VERSION ")"
     13#define BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")"
    1614#endif
    17     const char * const libbb_msg_full_version = LIBBB_BANNER;
    18 #endif
    19 #ifdef L_memory_exhausted
    20     const char * const bb_msg_memory_exhausted = "memory exhausted";
    21 #endif
    22 #ifdef L_invalid_date
    23     const char * const bb_msg_invalid_date = "invalid date `%s'";
    24 #endif
    25 #ifdef L_io_error
    26     const char * const bb_msg_io_error = "%s: input/output error -- %m";
    27 #endif
    28 #ifdef L_write_error
    29     const char * const bb_msg_write_error = "Write Error";
    30 #endif
    31 #ifdef L_read_error
    32     const char * const bb_msg_read_error = "Read Error";
    33 #endif
    34 #ifdef L_name_longer_than_foo
    35     const char * const bb_msg_name_longer_than_foo = "Names longer than %d chars not supported.";
    36 #endif
    37 #ifdef L_unknown
    38     const char * const bb_msg_unknown = "(unknown)";
    39 #endif
    40 #ifdef L_can_not_create_raw_socket
    41     const char * const bb_msg_can_not_create_raw_socket = "can't create raw socket";
    42 #endif
    43 #ifdef L_perm_denied_are_you_root
    44     const char * const bb_msg_perm_denied_are_you_root = "permission denied. (are you root?)";
    45 #endif
    46 #ifdef L_msg_requires_arg
    47     const char * const bb_msg_requires_arg = "%s requires an argument";
    48 #endif
    49 #ifdef L_msg_invalid_arg
    50     const char * const bb_msg_invalid_arg = "invalid argument `%s' to `%s'";
    51 #endif
    52 #ifdef L_msg_standard_input
    53     const char * const bb_msg_standard_input = "standard input";
    54 #endif
    55 #ifdef L_msg_standard_output
    56     const char * const bb_msg_standard_output = "standard output";
    57 #endif
     15const char bb_banner[] ALIGN1 = BANNER;
    5816
    59 #ifdef L_passwd_file
    60 #define PASSWD_FILE        "/etc/passwd"
    61 const char * const bb_path_passwd_file = PASSWD_FILE;
    62 #endif
     17const char bb_msg_memory_exhausted[] ALIGN1 = "memory exhausted";
     18const char bb_msg_invalid_date[] ALIGN1 = "invalid date '%s'";
     19const char bb_msg_write_error[] ALIGN1 = "write error";
     20const char bb_msg_read_error[] ALIGN1 = "read error";
     21const char bb_msg_unknown[] ALIGN1 = "(unknown)";
     22const char bb_msg_can_not_create_raw_socket[] ALIGN1 = "can't create raw socket";
     23const char bb_msg_perm_denied_are_you_root[] ALIGN1 = "permission denied. (are you root?)";
     24const char bb_msg_requires_arg[] ALIGN1 = "%s requires an argument";
     25const char bb_msg_invalid_arg[] ALIGN1 = "invalid argument '%s' to '%s'";
     26const char bb_msg_standard_input[] ALIGN1 = "standard input";
     27const char bb_msg_standard_output[] ALIGN1 = "standard output";
    6328
    64 #ifdef L_shadow_file
    65 #define SHADOW_FILE        "/etc/shadow"
    66 const char * const bb_path_shadow_file = SHADOW_FILE;
    67 #endif
     29const char bb_str_default[] ALIGN1 = "default";
     30const char bb_hexdigits_upcase[] ALIGN1 = "0123456789ABCDEF";
    6831
    69 #ifdef L_group_file
    70 #define GROUP_FILE         "/etc/group"
    71 const char * const bb_path_group_file = GROUP_FILE;
    72 #endif
     32const char bb_path_passwd_file[] ALIGN1 = "/etc/passwd";
     33const char bb_path_shadow_file[] ALIGN1 = "/etc/shadow";
     34const char bb_path_group_file[] ALIGN1 = "/etc/group";
     35const char bb_path_gshadow_file[] ALIGN1 = "/etc/gshadow";
     36const char bb_path_motd_file[] ALIGN1 = "/etc/motd";
     37const char bb_dev_null[] ALIGN1 = "/dev/null";
     38const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH;
     39const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL;
     40/* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
     41 * but I want to save a few bytes here. Check libbb.h before changing! */
     42const char bb_PATH_root_path[] ALIGN1 = "PATH=/sbin:/usr/sbin:/bin:/usr/bin";
    7343
    74 #ifdef L_gshadow_file
    75 #define GSHADOW_FILE       "/etc/gshadow"
    76 const char * const bb_path_gshadow_file = GSHADOW_FILE;
    77 #endif
    7844
    79 #ifdef L_nologin_file
    80 #define NOLOGIN_FILE       "/etc/nologin"
    81 const char * const bb_path_nologin_file = NOLOGIN_FILE;
    82 #endif
     45const int const_int_0;
     46const int const_int_1 = 1;
    8347
    84 #ifdef L_securetty_file
    85 #define SECURETTY_FILE     "/etc/securetty"
    86 const char * const bb_path_securetty_file = SECURETTY_FILE;
    87 #endif
    88 
    89 #ifdef L_motd_file
    90 #define MOTD_FILE          "/etc/motd"
    91 const char * const bb_path_motd_file = MOTD_FILE;
    92 #endif
    93 
    94 #ifdef L_shell_file
    95 const char * const bb_default_login_shell = LIBBB_DEFAULT_LOGIN_SHELL;
    96 #endif
    97 
    98 #ifdef L_bb_dev_null
    99 const char * const bb_dev_null = "/dev/null";
    100 #endif
    101 
    102 #ifdef L_bb_path_wtmp_file
    10348#include <utmp.h>
    10449/* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */
    105 const char * const bb_path_wtmp_file =
     50const char bb_path_wtmp_file[] ALIGN1 =
    10651#if defined _PATH_WTMP
    10752_PATH_WTMP;
    … …  
    11156# error unknown path to wtmp file
    11257#endif
    113 #endif
    11458
     59char bb_common_bufsiz1[COMMON_BUFSIZE];
    11560
    116 #ifdef L_bb_common_bufsiz1
    117 char bb_common_bufsiz1[BUFSIZ+1];
    118 #endif
     61struct globals;
     62/* Make it reside in R/W memory: */
     63struct globals *const ptr_to_globals __attribute__ ((section (".data")));
Note: See TracChangeset for help on using the changeset viewer.