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>

5 files changed, 4 insertions, 14 deletions

diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c
index cc5140e..c9cb492 100644
--- a/ui/twin/main-generic.c
+++ b/ui/twin/main-generic.c
@@ -317,8 +317,7 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	client = pbt_client_init(opts.backend, 1024, 640,
-		opts.start_daemon, opts.dry_run);
+	client = pbt_client_init(opts.backend, 1024, 640, opts.start_daemon);
 
 	if (!client) {
 		ui_result = EXIT_FAILURE;
diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c
index c664740..875b408 100644
--- a/ui/twin/pbt-client.c
+++ b/ui/twin/pbt-client.c
@@ -261,8 +261,7 @@ static void pbt_client_destructor(struct pbt_client *client)
 }
 
 struct pbt_client *pbt_client_init(enum pbt_twin_backend backend,
-	unsigned int width, unsigned int height,
-	int start_deamon, int dry_run)
+	unsigned int width, unsigned int height, int start_deamon)
 {
 	struct pbt_client *pbt_client;
 	unsigned int i;
@@ -280,7 +279,6 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend,
 	pbt_client->waitset = waitset_create(pbt_client);
 
 	pbt_client->sig = "pbt_client";
-	pbt_client->dry_run = dry_run;
 	pbt_client->frame.scr = pbt_scr_init(pbt_client, pbt_client->waitset,
 			backend, width, height, NULL, NULL);
 
diff --git a/ui/twin/pbt-client.h b/ui/twin/pbt-client.h
index 2c96d48..7b9671f 100644
--- a/ui/twin/pbt-client.h
+++ b/ui/twin/pbt-client.h
@@ -42,7 +42,6 @@ void pbt_frame_status_printf(struct pbt_frame *frame, const char *format, ...);
 
 struct pbt_client {
 	const char *sig;
-	int dry_run;
 	struct pb_signal_data signal_data;
 	void *client_data;
 	struct pbt_frame frame;
@@ -51,8 +50,7 @@ struct pbt_client {
 };
 
 struct pbt_client *pbt_client_init(enum pbt_twin_backend backend,
-	unsigned int width, unsigned int height,
-	int start_deamon, int dry_run);
+	unsigned int width, unsigned int height, int start_deamon);
 void pbt_client_destroy(struct pbt_client *client);
 void pbt_client_resize(struct pbt_client *client);
 
diff --git a/ui/twin/pbt-main.c b/ui/twin/pbt-main.c
index 84e824e..542f949 100644
--- a/ui/twin/pbt-main.c
+++ b/ui/twin/pbt-main.c
@@ -34,7 +34,7 @@ void pbt_print_usage(void)
 {
 	pbt_print_version();
 	printf(
-"Usage: petitboot-twin [-d, --dry-run] [-h, --help] [-l, --log log-file]\n"
+"Usage: petitboot-twin [-h, --help] [-l, --log log-file]\n"
 "                      [-r, --reset-defaults] [-s, --start-daemon]\n"
 "                      [-t, --timeout] [-V, --version]\n"
 "                      [[-f --fbdev] | [-x --x11]]\n");
@@ -47,7 +47,6 @@ void pbt_print_usage(void)
 int pbt_opts_parse(struct pbt_opts *opts, int argc, char *argv[])
 {
 	static const struct option long_options[] = {
-		{"dry-run",        no_argument,       NULL, 'd'},
 		{"fbdev",          no_argument,       NULL, 'f'},
 		{"help",           no_argument,       NULL, 'h'},
 		{"log",            required_argument, NULL, 'l'},
@@ -74,9 +73,6 @@ int pbt_opts_parse(struct pbt_opts *opts, int argc, char *argv[])
 			break;
 
 		switch (c) {
-		case 'd':
-			opts->dry_run = pbt_opt_yes;
-			break;
 		case 'f':
 			opts->backend = pbt_twin_fbdev;
 			break;
diff --git a/ui/twin/pbt-main.h b/ui/twin/pbt-main.h
index e5af71a..b6821cf 100644
--- a/ui/twin/pbt-main.h
+++ b/ui/twin/pbt-main.h
@@ -32,7 +32,6 @@ enum pbt_opt_value {pbt_opt_undef = 0, pbt_opt_yes, pbt_opt_no};
 
 struct pbt_opts {
 	enum pbt_twin_backend backend;
-	enum pbt_opt_value dry_run;
 	enum pbt_opt_value show_help;
 	const char *log_file;
 	enum pbt_opt_value reset_defaults;