Changeset 1770 in MondoRescue for branches/stable/mindi-busybox/include/grp_.h


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/include/grp_.h

    r821 r1770  
     1/* vi: set sw=4 ts=4: */
    12/* Copyright (C) 1991,92,95,96,97,98,99,2000,01 Free Software Foundation, Inc.
    23   This file is part of the GNU C Library.
    … …  
    2122 */
    2223
     24#if !ENABLE_USE_BB_PWD_GRP
    2325
    24 #if !defined CONFIG_USE_BB_PWD_GRP
    2526#include <grp.h>
    2627
    … …  
    2829
    2930#ifndef _GRP_H
    30 #define _GRP_H  1
     31#define _GRP_H 1
     32
     33/* The group structure.  */
     34struct group {
     35    char *gr_name;          /* Group name.  */
     36    char *gr_passwd;        /* Password.    */
     37    gid_t gr_gid;           /* Group ID.    */
     38    char **gr_mem;          /* Member list. */
     39};
     40
     41/* We don't reimplement this, just supplying prototype */
     42/* The function itself is in libc */
     43/* Set the group set for the current user to GROUPS (N of them).  */
     44extern int setgroups(size_t __n, __const gid_t *__groups);
    3145
    3246
    33 #include <sys/types.h>
    34 #include <features.h>
    35 #include <stdio.h>
     47#define setgrent     bb_internal_setgrent
     48#define endgrent     bb_internal_endgrent
     49#define getgrent     bb_internal_getgrent
     50#define fgetgrent    bb_internal_fgetgrent
     51#define putgrent     bb_internal_putgrent
     52#define getgrgid     bb_internal_getgrgid
     53#define getgrnam     bb_internal_getgrnam
     54#define getgrent_r   bb_internal_getgrent_r
     55#define getgrgid_r   bb_internal_getgrgid_r
     56#define getgrnam_r   bb_internal_getgrnam_r
     57#define fgetgrent_r  bb_internal_fgetgrent_r
     58#define getgrouplist bb_internal_getgrouplist
     59#define initgroups   bb_internal_initgroups
    3660
    3761
    38 /* The group structure.  */
    39 struct group
    40 {
    41     char *gr_name;      /* Group name.  */
    42     char *gr_passwd;        /* Password.    */
    43     gid_t gr_gid;       /* Group ID.    */
    44     char **gr_mem;      /* Member list. */
    45 };
     62/* All function names below should be remapped by #defines above
     63 * in order to not collide with libc names.
     64 * In theory it isn't necessary, but I saw weird interactions at link time.
     65 * Let's play safe */
    4666
    4767
    4868/* Rewind the group-file stream.  */
    49 extern void setgrent (void);
     69extern void setgrent(void);
    5070
    5171/* Close the group-file stream.  */
    52 extern void endgrent (void);
     72extern void endgrent(void);
    5373
    5474/* Read an entry from the group-file stream, opening it if necessary.  */
    55 extern struct group *getgrent (void);
     75extern struct group *getgrent(void);
    5676
    5777/* Read a group entry from STREAM.  */
    58 extern struct group *fgetgrent (FILE *__stream);
     78extern struct group *fgetgrent(FILE *__stream);
    5979
    6080/* Write the given entry onto the given stream.  */
    61 extern int putgrent (__const struct group *__restrict __p,
     81extern int putgrent(__const struct group *__restrict __p,
    6282             FILE *__restrict __f);
    6383
    6484/* Search for an entry with a matching group ID.  */
    65 extern struct group *getgrgid (gid_t __gid);
     85extern struct group *getgrgid(gid_t __gid);
    6686
    6787/* Search for an entry with a matching group name.  */
    68 extern struct group *getgrnam (__const char *__name);
     88extern struct group *getgrnam(__const char *__name);
    6989
    7090/* Reentrant versions of some of the functions above.
    … …  
    7696   POSIX people would choose.  */
    7797
    78 extern int getgrent_r (struct group *__restrict __resultbuf,
     98extern int getgrent_r(struct group *__restrict __resultbuf,
    7999               char *__restrict __buffer, size_t __buflen,
    80100               struct group **__restrict __result);
    81101
    82102/* Search for an entry with a matching group ID.  */
    83 extern int getgrgid_r (gid_t __gid, struct group *__restrict __resultbuf,
     103extern int getgrgid_r(gid_t __gid, struct group *__restrict __resultbuf,
    84104               char *__restrict __buffer, size_t __buflen,
    85105               struct group **__restrict __result);
    86106
    87107/* Search for an entry with a matching group name.  */
    88 extern int getgrnam_r (__const char *__restrict __name,
     108extern int getgrnam_r(__const char *__restrict __name,
    89109               struct group *__restrict __resultbuf,
    90110               char *__restrict __buffer, size_t __buflen,
    … …  
    93113/* Read a group entry from STREAM.  This function is not standardized
    94114   an probably never will.  */
    95 extern int fgetgrent_r (FILE *__restrict __stream,
     115extern int fgetgrent_r(FILE *__restrict __stream,
    96116            struct group *__restrict __resultbuf,
    97117            char *__restrict __buffer, size_t __buflen,
    98118            struct group **__restrict __result);
    99119
    100 /* Set the group set for the current user to GROUPS (N of them).  */
    101 extern int setgroups (size_t __n, __const gid_t *__groups);
    102 
    103120/* Store at most *NGROUPS members of the group set for USER into
    104121   *GROUPS.  Also include GROUP.  The actual number of groups found is
    105122   returned in *NGROUPS.  Return -1 if the if *NGROUPS is too small.  */
    106 extern int getgrouplist (__const char *__user, gid_t __group,
     123extern int getgrouplist(__const char *__user, gid_t __group,
    107124             gid_t *__groups, int *__ngroups);
    108125
    … …  
    110127   by reading the group database and using all groups
    111128   of which USER is a member.  Also include GROUP.  */
    112 extern int initgroups (__const char *__user, gid_t __group);
     129extern int initgroups(__const char *__user, gid_t __group);
    113130
    114131
Note: See TracChangeset for help on using the changeset viewer.