Print this page
patch zone-auto-create-be

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libbe/common/be_zones.c
          +++ new/usr/src/lib/libbe/common/be_zones.c
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24   */
  25   25  
  26   26  /*
  27   27   * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
       28 + * Copyright 2015 Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
  28   29   */
  29   30  
  30   31  /*
  31   32   * System includes
  32   33   */
  33   34  #include <assert.h>
  34   35  #include <errno.h>
  35   36  #include <libintl.h>
  36   37  #include <libnvpair.h>
  37   38  #include <libzfs.h>
↓ open down ↓ 261 lines elided ↑ open up ↑
 299  300          if (!zfs_dataset_exists(g_zfs, zone_container_ds,
 300  301              ZFS_TYPE_FILESYSTEM)) {
 301  302                  be_print_err(gettext("be_zone_supported: "
 302  303                      "zonepath dataset (%s) does not have a zone root container "
 303  304                      "dataset, zone is not supported, skipping ...\n"),
 304  305                      zonepath_ds);
 305  306                  return (B_FALSE);
 306  307          }
 307  308  
 308  309          return (B_TRUE);
 309      -}
 310      -
 311      -/*
 312      - * Function:    be_get_supported_brandlist
 313      - * Desciption:  This functions retuns a list of supported brands in
 314      - *              a zoneBrandList_t object.
 315      - * Parameters:
 316      - *              None
 317      - * Returns:
 318      - *              Failure - NULL if no supported brands found.
 319      - *              Success - pointer to zoneBrandList structure.
 320      - * Scope:
 321      - *              Semi-private (library wide use only)
 322      - */
 323      -zoneBrandList_t *
 324      -be_get_supported_brandlist(void)
 325      -{
 326      -        return (z_make_brand_list(BE_ZONE_SUPPORTED_BRANDS,
 327      -            BE_ZONE_SUPPORTED_BRANDS_DELIM));
 328  310  }
 329  311  
 330  312  /*
 331  313   * Function:    be_zone_get_parent_uuid
 332  314   * Description: This function gets the parentbe property of a zone root
 333  315   *              dataset, parsed it into internal uuid format, and returns
 334  316   *              it in the uuid_t reference pointer passed in.
 335  317   * Parameters:
 336  318   *              root_ds - dataset name of a zone root dataset
 337  319   *              uu - pointer to a uuid_t to return the parentbe uuid in
↓ open down ↓ 290 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX