Print this page


Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/zoneadmd/zoneadmd.h
          +++ new/usr/src/cmd/zoneadmd/zoneadmd.h
↓ open down ↓ 62 lines elided ↑ open up ↑
  63   63  #define SHUTDOWN_WAIT           60
  64   64  #define SHUTDOWN_DEFAULT        "/sbin/init 0"
  65   65  #define SHUTDOWN_FMRI   "svc:/system/zones:default"
  66   66  
  67   67  /* 0755 is the default directory mode. */
  68   68  #define DEFAULT_DIR_MODE \
  69   69          (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
  70   70  #define DEFAULT_DIR_USER -1     /* user ID for chown: -1 means don't change */
  71   71  #define DEFAULT_DIR_GROUP -1    /* grp ID for chown: -1 means don't change */
  72   72  
  73      -#define ALT_MOUNT(mount_cmd)    ((mount_cmd) != Z_MNT_BOOT)
       73 +#define ALT_MOUNT(mount_cmd)    ((mount_cmd) != Z_MNT_BOOT)
  74   74  
  75   75  typedef struct zlog {
  76   76          FILE *logfile;  /* file to log to */
  77   77  
  78   78          /*
  79   79           * The following are used if logging to a buffer.
  80   80           */
  81   81          char *log;      /* remaining log */
  82   82          size_t loglen;  /* size of remaining log */
  83   83          char *buf;      /* underlying storage */
↓ open down ↓ 13 lines elided ↑ open up ↑
  97   97  extern char pool_name[MAXNAMELEN];
  98   98  extern char brand_name[MAXNAMELEN];
  99   99  extern char default_brand[MAXNAMELEN];
 100  100  extern char boot_args[BOOTARGS_MAX];
 101  101  extern boolean_t zone_isnative;
 102  102  extern boolean_t zone_iscluster;
 103  103  extern dladm_handle_t dld_handle;
 104  104  
 105  105  extern void zerror(zlog_t *, boolean_t, const char *, ...);
 106  106  extern char *localize_msg(char *locale, const char *msg);
 107      -extern void nwifent_free_attrs(struct zone_nwiftab *);
 108  107  
 109  108  /*
 110  109   * Eventstream interfaces.
 111  110   */
 112  111  typedef enum {
 113  112          Z_EVT_NULL = 0,
 114  113          Z_EVT_ZONE_BOOTING,
 115  114          Z_EVT_ZONE_REBOOTING,
 116  115          Z_EVT_ZONE_HALTED,
 117  116          Z_EVT_ZONE_READIED,
↓ open down ↓ 13 lines elided ↑ open up ↑
 131  130   */
 132  131  typedef enum {
 133  132          Z_MNT_BOOT = 0,
 134  133          Z_MNT_SCRATCH,
 135  134          Z_MNT_UPDATE
 136  135  } zone_mnt_t;
 137  136  
 138  137  /*
 139  138   * Virtual platform interfaces.
 140  139   */
 141      -extern zoneid_t vplat_create(zlog_t *, zone_mnt_t, zoneid_t);
      140 +extern zoneid_t vplat_create(zlog_t *, zone_mnt_t);
 142  141  extern int vplat_bringup(zlog_t *, zone_mnt_t, zoneid_t);
 143      -extern int vplat_teardown(zlog_t *, boolean_t, boolean_t, boolean_t);
      142 +extern int vplat_teardown(zlog_t *, boolean_t, boolean_t);
 144  143  extern int vplat_get_iptype(zlog_t *, zone_iptype_t *);
 145  144  
 146  145  /*
 147  146   * Filesystem mounting interfaces.
 148  147   */
 149  148  extern int valid_mount_path(zlog_t *, const char *, const char *,
 150  149      const char *, const char *);
 151  150  extern int make_one_dir(zlog_t *, const char *, const char *,
 152  151      mode_t, uid_t, gid_t);
 153  152  extern void resolve_lofs(zlog_t *zlogp, char *path, size_t pathlen);
↓ open down ↓ 18 lines elided ↑ open up ↑
 172  171  extern void destroy_log_thread();
 173  172  
 174  173  /*
 175  174   * Contract handling.
 176  175   */
 177  176  extern int init_template(void);
 178  177  
 179  178  /*
 180  179   * Routine to manage child processes.
 181  180   */
 182      -extern int do_subproc(zlog_t *, char *, char **, boolean_t);
      181 +extern int do_subproc(zlog_t *, char *, char **);
 183  182  
 184  183  #ifdef __cplusplus
 185  184  }
 186  185  #endif
 187  186  
 188  187  #endif /* _ZONEADMD_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX