diff options
| author | Jon Severinsson <jon@severinsson.net> | 2014-07-01 20:00:00 +0200 |
|---|---|---|
| committer | Jon Severinsson <jon@severinsson.net> | 2014-07-11 02:23:25 +0200 |
| commit | 60f067b41061282b2cd5c4c10935910db9283c80 (patch) | |
| tree | f41be399b30284aac463e5d7da1704c6760f4418 /src/machine-id-setup | |
| parent | 14228c0ddf1fe80e2ed0193f0cd1cdb06e5db522 (diff) | |
| download | systemd-60f067b41061282b2cd5c4c10935910db9283c80.tar.gz | |
Imported Upstream version 214
Diffstat (limited to 'src/machine-id-setup')
| -rw-r--r-- | src/machine-id-setup/machine-id-setup-main.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c index eb2d514855..1c933ce600 100644 --- a/src/machine-id-setup/machine-id-setup-main.c +++ b/src/machine-id-setup/machine-id-setup-main.c @@ -29,12 +29,15 @@ #include "log.h" #include "build.h" +static const char *arg_root = ""; + static int help(void) { printf("%s [OPTIONS...]\n\n" "Initialize /etc/machine-id from a random source.\n\n" " -h --help Show this help\n" - " --version Show package version\n", + " --version Show package version\n" + " --root=ROOT Filesystem root\n", program_invocation_short_name); return 0; @@ -43,13 +46,15 @@ static int help(void) { static int parse_argv(int argc, char *argv[]) { enum { - ARG_VERSION = 0x100 + ARG_VERSION = 0x100, + ARG_ROOT, }; static const struct option options[] = { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, ARG_VERSION }, - { NULL, 0, NULL, 0 } + { "root", required_argument, NULL, ARG_ROOT }, + {} }; int c; @@ -62,25 +67,27 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); - return 0; + return help(); case ARG_VERSION: puts(PACKAGE_STRING); puts(SYSTEMD_FEATURES); return 0; + case ARG_ROOT: + arg_root = optarg; + break; + case '?': return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } } if (optind < argc) { - help(); + log_error("Extraneous arguments"); return -EINVAL; } @@ -97,5 +104,5 @@ int main(int argc, char *argv[]) { if (r <= 0) return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; - return machine_id_setup() < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + return machine_id_setup(arg_root) < 0 ? EXIT_FAILURE : EXIT_SUCCESS; } |