Print this page
6774 - create-client should take imagepath as optional argument

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/installadm/installadm.c
          +++ new/usr/src/cmd/installadm/installadm.c
↓ open down ↓ 80 lines elided ↑ open up ↑
  81   81          { "enable",     do_enable,
  82   82              "\tenable\t<svcname>",
  83   83              PRIV_REQD                                                   },
  84   84  
  85   85          { "disable",    do_disable,
  86   86              "\tdisable\t[-t] <svcname>",
  87   87              PRIV_REQD                                                   },
  88   88  
  89   89          { "create-client",      do_create_client,
  90   90              "\tcreate-client\t[-b <property>=<value>,...] \n"
  91      -            "\t\t\t-e <macaddr> -t <imagepath> -n <svcname>",
       91 +            "\t\t\t-e <macaddr> -n <svcname> [-t <imagepath>]",
  92   92              PRIV_REQD                                                   },
  93   93  
  94   94          { "delete-client",      do_delete_client,
  95   95              "\tdelete-client\t<macaddr>",
  96   96              PRIV_REQD                                                   },
  97   97  
  98   98          { "add",        do_add,
  99   99              "\tadd\t-m <manifest> -n <svcname>",
 100  100              PRIV_REQD                                                   },
 101  101  
↓ open down ↓ 1119 lines elided ↑ open up ↑
1221 1221                          break;
1222 1222                  default:
1223 1223                          do_opterr(optopt, option, use);
1224 1224                          return (INSTALLADM_FAILURE);
1225 1225                  }
1226 1226          }
1227 1227  
1228 1228          /*
1229 1229           * Make sure required options are there
1230 1230           */
1231      -        if ((mac_addr == NULL) || (svcname == NULL) || (imagepath == NULL)) {
     1231 +        if ((mac_addr == NULL) || (svcname == NULL)) {
1232 1232                  (void) fprintf(stderr, MSG_MISSING_OPTIONS, argv[0]);
1233 1233                  (void) fprintf(stderr, "%s\n", gettext(use));
1234 1234                  return (INSTALLADM_FAILURE);
1235 1235          }
1236 1236  
1237 1237          if (!validate_service_name(svcname)) {
1238 1238                  (void) fprintf(stderr, MSG_BAD_SERVICE_NAME);
1239 1239                  return (INSTALLADM_FAILURE);
1240 1240          }
1241 1241  
↓ open down ↓ 306 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX