diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-03-07 10:22:42 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-04-15 15:42:27 +0800 |
| commit | dbf139003bd6c8c6ca03ae7f533aa74afd8060c6 (patch) | |
| tree | 7613e9e0eeb314aadbef3aa341643db8c360c8f1 /discover/pb-discover.c | |
| parent | c62667e5c78ea212e5ac49244e9792954a1d8f71 (diff) | |
| download | talos-petitboot-dbf139003bd6c8c6ca03ae7f533aa74afd8060c6.tar.gz talos-petitboot-dbf139003bd6c8c6ca03ae7f533aa74afd8060c6.zip | |
Move --dry-run option to discover server
Now that the server does the booting, we should move the --dry-run
argument to the server.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/pb-discover.c')
| -rw-r--r-- | discover/pb-discover.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/discover/pb-discover.c b/discover/pb-discover.c index 536f6e6..c83b574 100644 --- a/discover/pb-discover.c +++ b/discover/pb-discover.c @@ -43,6 +43,7 @@ struct opts { enum opt_value show_help; const char *log_file; enum opt_value show_version; + enum opt_value dry_run; }; /** @@ -54,12 +55,14 @@ static int opts_parse(struct opts *opts, int argc, char *argv[]) static const struct option long_options[] = { {"help", no_argument, NULL, 'h'}, {"log", required_argument, NULL, 'l'}, + {"dry-run", no_argument, NULL, 'n'}, {"version", no_argument, NULL, 'V'}, { NULL, 0, NULL, 0}, }; - static const char short_options[] = "hl:V"; + static const char short_options[] = "hl:nV"; static const struct opts default_values = { .log_file = "/var/log/petitboot/pb-discover.log", + .dry_run = opt_no, }; *opts = default_values; @@ -78,6 +81,9 @@ static int opts_parse(struct opts *opts, int argc, char *argv[]) case 'l': opts->log_file = optarg; break; + case 'n': + opts->dry_run = opt_yes; + break; case 'V': opts->show_version = opt_yes; break; @@ -145,7 +151,7 @@ int main(int argc, char *argv[]) if (!server) return EXIT_FAILURE; - handler = device_handler_init(server); + handler = device_handler_init(server, opts.dry_run == opt_yes); if (!handler) return EXIT_FAILURE; |
