Print this page
OS-224 add more zonecfg net properties
OS-216 store all net config info on zone

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/zonecfg/zonecfg_grammar.y
          +++ new/usr/src/cmd/zonecfg/zonecfg_grammar.y
↓ open down ↓ 128 lines elided ↑ open up ↑
 129  129  %start commands
 130  130  
 131  131  %token HELP CREATE EXPORT ADD DELETE REMOVE SELECT SET INFO CANCEL END VERIFY
 132  132  %token COMMIT REVERT EXIT SEMICOLON TOKEN ZONENAME ZONEPATH AUTOBOOT POOL NET
 133  133  %token FS ATTR DEVICE RCTL SPECIAL RAW DIR OPTIONS TYPE ADDRESS PHYSICAL
 134  134  %token IPTYPE HOSTID FS_ALLOWED ALLOWED_ADDRESS
 135  135  %token NAME MATCH PRIV LIMIT ACTION VALUE EQUAL OPEN_SQ_BRACKET CLOSE_SQ_BRACKET
 136  136  %token OPEN_PAREN CLOSE_PAREN COMMA DATASET LIMITPRIV BOOTARGS BRAND PSET PCAP
 137  137  %token MCAP NCPUS IMPORTANCE SHARES MAXLWPS MAXSHMMEM MAXSHMIDS MAXMSGIDS
 138  138  %token MAXSEMIDS LOCKED SWAP SCHED CLEAR DEFROUTER ADMIN USER AUTHS MAXPROCS
      139 +%token ZFSPRI MAC VLANID GNIC NPROP
 139  140  
 140  141  %type <strval> TOKEN EQUAL OPEN_SQ_BRACKET CLOSE_SQ_BRACKET
 141  142      property_value OPEN_PAREN CLOSE_PAREN COMMA simple_prop_val
 142  143  %type <complex> complex_piece complex_prop_val
 143  144  %type <ival> resource_type NET FS DEVICE RCTL ATTR DATASET PSET PCAP MCAP
 144  145      ADMIN
 145  146  %type <ival> property_name SPECIAL RAW DIR OPTIONS TYPE ADDRESS PHYSICAL NAME
 146  147      MATCH ZONENAME ZONEPATH AUTOBOOT POOL LIMITPRIV BOOTARGS VALUE PRIV LIMIT
 147  148      ACTION BRAND SCHED IPTYPE DEFROUTER HOSTID USER AUTHS FS_ALLOWED
 148      -    ALLOWED_ADDRESS
      149 +    ALLOWED_ADDRESS MAC VLANID GNIC NPROP
 149  150  %type <cmd> command
 150  151  %type <cmd> add_command ADD
 151  152  %type <cmd> cancel_command CANCEL
 152  153  %type <cmd> commit_command COMMIT
 153  154  %type <cmd> create_command CREATE
 154  155  %type <cmd> delete_command DELETE
 155  156  %type <cmd> end_command END
 156  157  %type <cmd> exit_command EXIT
 157  158  %type <cmd> export_command EXPORT
 158  159  %type <cmd> help_command HELP
↓ open down ↓ 810 lines elided ↑ open up ↑
 969  970          | ZONEPATH      { $$ = PT_ZONEPATH; }
 970  971          | AUTOBOOT      { $$ = PT_AUTOBOOT; }
 971  972          | IPTYPE        { $$ = PT_IPTYPE; }
 972  973          | POOL          { $$ = PT_POOL; }
 973  974          | LIMITPRIV     { $$ = PT_LIMITPRIV; }
 974  975          | BOOTARGS      { $$ = PT_BOOTARGS; }
 975  976          | ADDRESS       { $$ = PT_ADDRESS; }
 976  977          | ALLOWED_ADDRESS       { $$ = PT_ALLOWED_ADDRESS; }
 977  978          | PHYSICAL      { $$ = PT_PHYSICAL; }
 978  979          | DEFROUTER     { $$ = PT_DEFROUTER; }
      980 +        | MAC           { $$ = PT_MAC; }
      981 +        | VLANID        { $$ = PT_VLANID; }
      982 +        | GNIC          { $$ = PT_GNIC; }
      983 +        | NPROP         { $$ = PT_NPROP; }
 979  984          | NAME          { $$ = PT_NAME; }
 980  985          | VALUE         { $$ = PT_VALUE; }
 981  986          | MATCH         { $$ = PT_MATCH; }
 982  987          | PRIV          { $$ = PT_PRIV; }
 983  988          | LIMIT         { $$ = PT_LIMIT; }
 984  989          | ACTION        { $$ = PT_ACTION; }
 985  990          | BRAND         { $$ = PT_BRAND; }
 986  991          | NCPUS         { $$ = PT_NCPUS; }
 987  992          | LOCKED        { $$ = PT_LOCKED; }
 988  993          | SWAP          { $$ = PT_SWAP; }
↓ open down ↓ 152 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX