discover: Handle and track plugin_options

[petitboot] / ui / twin / pbt-main.c

diff --git a/ui/twin/pbt-main.c b/ui/twin/pbt-main.c
index a8c1ea5fe2408acfceda14079087fc62e2373eda..cf546625090f8305e43fd777c42cbec2cfe45fe8 100644 (file)
--- a/ui/twin/pbt-main.c
+++ b/ui/twin/pbt-main.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <getopt.h>
 
@@ -34,8 +33,9 @@ void pbt_print_usage(void)
 {
        pbt_print_version();
        printf(
-"Usage: petitboot-twin [-d, --start-daemon] [-h, --help] [-l, --log log-file]\n"
-"                      [-r, --reset-defaults][-t, --timeout] [-V, --version]\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");
 }
 
@@ -46,17 +46,17 @@ void pbt_print_usage(void)
 int pbt_opts_parse(struct pbt_opts *opts, int argc, char *argv[])
 {
        static const struct option long_options[] = {
-               {"start-daemon",   no_argument,       NULL, 'd'},
                {"fbdev",          no_argument,       NULL, 'f'},
                {"help",           no_argument,       NULL, 'h'},
                {"log",            required_argument, NULL, 'l'},
                {"reset-defaults", no_argument,       NULL, 'r'},
+               {"start-daemon",   no_argument,       NULL, 's'},
                {"timeout",        no_argument,       NULL, 't'},
                {"version",        no_argument,       NULL, 'V'},
                {"x11",            no_argument,       NULL, 'x'},
                { NULL, 0, NULL, 0},
        };
-       static const char short_options[] = "dfhl:trVx";
+       static const char short_options[] = "dfhl:strVx";
        static const struct pbt_opts default_values = {
                .backend = pbt_twin_x11,
                .log_file = "/var/log/petitboot/petitboot-twin.log",
@@ -72,9 +72,6 @@ int pbt_opts_parse(struct pbt_opts *opts, int argc, char *argv[])
                        break;
 
                switch (c) {
-               case 'd':
-                       opts->start_daemon = pbt_opt_yes;
-                       break;
                case 'f':
                        opts->backend = pbt_twin_fbdev;
                        break;
@@ -84,6 +81,9 @@ int pbt_opts_parse(struct pbt_opts *opts, int argc, char *argv[])
                case 'l':
                        opts->log_file = optarg;
                        break;
+               case 's':
+                       opts->start_daemon = pbt_opt_yes;
+                       break;
                case 't':
                        opts->use_timeout = pbt_opt_yes;
                        break;