Print this page
OS-4109 'zlogin -I' should close /dev/zfd/0 when it exits
OS-3280 need a way to specify the root of a native system in the lx brand
OS-3279 lx brand should allow delegated datasets
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/head/zone.h
          +++ new/usr/src/head/zone.h
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
       24 + * Copyright 2015 Joyent Inc.
  24   25   */
  25   26  
  26   27  #ifndef _ZONE_H
  27   28  #define _ZONE_H
  28   29  
  29   30  #include <sys/types.h>
  30   31  #include <sys/zone.h>
  31   32  #include <sys/priv.h>
  32   33  #include <tsol/label.h>
  33   34  
↓ open down ↓ 5 lines elided ↑ open up ↑
  39   40   * Functions for mapping between id and name for active zones.
  40   41   */
  41   42  extern zoneid_t         getzoneid(void);
  42   43  extern zoneid_t         getzoneidbyname(const char *);
  43   44  extern ssize_t          getzonenamebyid(zoneid_t, char *, size_t);
  44   45  
  45   46  /*
  46   47   * NOTE
  47   48   *
  48   49   * The remaining contents of this file are private to the implementation
  49      - * of Solaris and are subject to change at any time without notice,
       50 + * of Illumos and are subject to change at any time without notice,
  50   51   * Applications using these interfaces may fail to run on future releases.
  51   52   */
  52   53  
       54 +#define ZLOGIN_DISCONNECT       0x1     /* disconnect on zone halt */
       55 +#define ZLOGIN_ZFD_EOF          0x2     /* EOF on ZFD */
       56 +
  53   57  extern int zonept(int, zoneid_t);
  54   58  extern int zone_get_id(const char *, zoneid_t *);
  55   59  
  56   60  /* System call API */
  57   61  extern zoneid_t zone_create(const char *, const char *,
  58   62      const struct priv_set *, const char *, size_t, const char *, size_t, int *,
  59   63      int, int, const bslabel_t *, int);
  60   64  extern int      zone_boot(zoneid_t);
  61   65  extern int      zone_destroy(zoneid_t);
  62   66  extern ssize_t  zone_getattr(zoneid_t, int, void *, size_t);
  63   67  extern int      zone_setattr(zoneid_t, int, void *, size_t);
  64   68  extern int      zone_enter(zoneid_t);
  65   69  extern int      zone_list(zoneid_t *, uint_t *);
  66   70  extern int      zone_shutdown(zoneid_t);
  67   71  extern int      zone_version(int *);
  68   72  extern int      zone_add_datalink(zoneid_t, datalink_id_t);
  69   73  extern int      zone_remove_datalink(zoneid_t, datalink_id_t);
  70   74  extern int      zone_check_datalink(zoneid_t *, datalink_id_t);
  71   75  extern int      zone_list_datalink(zoneid_t, int *, datalink_id_t *);
       76 +extern const char *zone_get_nroot(void);
  72   77  
  73   78  #ifdef  __cplusplus
  74   79  }
  75   80  #endif
  76   81  
  77   82  #endif /* _ZONE_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX