Print this page
*** NO COMMENTS ***

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/beadm/beadm.c
          +++ new/usr/src/cmd/beadm/beadm.c
↓ open down ↓ 16 lines elided ↑ open up ↑
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24   */
  25   25  
  26   26  /*
  27      - * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
       27 + * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
  28   28   */
  29   29  
  30   30  /*
  31   31   * System includes
  32   32   */
  33   33  
  34   34  #include <assert.h>
  35   35  #include <stdio.h>
  36   36  #include <strings.h>
  37   37  #include <libzfs.h>
↓ open down ↓ 341 lines elided ↑ open up ↑
 379  379                  if (parsable)
 380  380                          active[0] = '\0';
 381  381  
 382  382                  tm = localtime(&creation);
 383  383                  (void) strftime(datetime, DT_BUF_LEN, datetime_fmt, tm);
 384  384  
 385  385                  for (snap = cur_be->be_node_snapshots; snap != NULL;
 386  386                      snap = snap->be_next_snapshot)
 387  387                          used += snap->be_snapshot_space_used;
 388  388  
      389 +                if (!cur_be->be_global_active)
      390 +                        active[ai++] = 'x';
      391 +
 389  392                  if (cur_be->be_active)
 390  393                          active[ai++] = 'N';
 391      -                if (cur_be->be_active_on_boot)
 392      -                        active[ai] = 'R';
      394 +                if (cur_be->be_active_on_boot) {
      395 +                        if (!cur_be->be_global_active)
      396 +                                active[ai] = 'b';
      397 +                        else
      398 +                                active[ai] = 'R';
      399 +                }
 393  400  
 394  401                  nicenum(used, buf, sizeof (buf));
 395  402                  if (parsable)
 396  403                          (void) printf("%s;%s;%s;%s;%llu;%s;%ld\n",
 397  404                              name,
 398  405                              cur_be->be_uuid_str,
 399  406                              active,
 400  407                              (cur_be->be_mounted ? mntpt: ""),
 401  408                              used,
 402  409                              cur_be->be_policy_type,
↓ open down ↓ 1111 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX