system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 12:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

machine-id-setup: add new --print switch

Browse source 
If specified we'll simply output the used machine ID.
This commit is contained in:
Lennart Poettering 2016-07-22 12:21:21 +02:00
parent 4b1afed01f
commit 487ddeb8bc
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
man/systemd-machine-id-setup.xml
View file

@ -151,6 +151,12 @@
early boot service.</para></listitem> early boot service.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><option>--print</option></term>
<listitem><para>Print the machine ID generated or commited after the operation is complete.</para></listitem>
</varlistentry>
<xi:include href="standard-options.xml" xpointer="help" /> <xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" /> <xi:include href="standard-options.xml" xpointer="version" />
</variablelist> </variablelist>

30
src/machine-id-setup/machine-id-setup-main.c
View file

@ -29,6 +29,7 @@
static char *arg_root = NULL; static char *arg_root = NULL;
static bool arg_commit = false; static bool arg_commit = false;
static bool arg_print = false;
static void help(void) { static void help(void) {
printf("%s [OPTIONS...]\n\n" printf("%s [OPTIONS...]\n\n"
@ -37,6 +38,7 @@ static void help(void) {
" --version Show package version\n" " --version Show package version\n"
" --root=ROOT Filesystem root\n" " --root=ROOT Filesystem root\n"
" --commit Commit transient ID\n" " --commit Commit transient ID\n"
" --print Print used machine ID\n"
, program_invocation_short_name); , program_invocation_short_name);
} }
@ -46,6 +48,7 @@ static int parse_argv(int argc, char *argv[]) {
ARG_VERSION = 0x100, ARG_VERSION = 0x100,
ARG_ROOT, ARG_ROOT,
ARG_COMMIT, ARG_COMMIT,
ARG_PRINT,
}; };
static const struct option options[] = { static const struct option options[] = {
@ -53,6 +56,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "version", no_argument, NULL, ARG_VERSION }, { "version", no_argument, NULL, ARG_VERSION },
{ "root", required_argument, NULL, ARG_ROOT }, { "root", required_argument, NULL, ARG_ROOT },
{ "commit", no_argument, NULL, ARG_COMMIT }, { "commit", no_argument, NULL, ARG_COMMIT },
{ "print", no_argument, NULL, ARG_PRINT },
{} {}
}; };
@ -82,6 +86,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_commit = true; arg_commit = true;
break; break;
case ARG_PRINT:
arg_print = true;
break;
case '?': case '?':
return -EINVAL; return -EINVAL;
@ -98,6 +106,8 @@ static int parse_argv(int argc, char *argv[]) {
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
char buf[SD_ID128_STRING_MAX];
sd_id128_t id;
int r; int r;
log_parse_environment(); log_parse_environment();
@ -107,10 +117,24 @@ int main(int argc, char *argv[]) {
if (r <= 0) if (r <= 0)
goto finish; goto finish;
if (arg_commit) if (arg_commit) {
r = machine_id_commit(arg_root); r = machine_id_commit(arg_root);
else if (r < 0)
r = machine_id_setup(arg_root, SD_ID128_NULL, NULL); goto finish;
r = sd_id128_get_machine(&id);
if (r < 0) {
log_error_errno(r, "Failed to read machine ID back: %m");
goto finish;
}
} else {
r = machine_id_setup(arg_root, SD_ID128_NULL, &id);
if (r < 0)
goto finish;
}
if (arg_print)
puts(sd_id128_to_string(id, buf));
finish: finish:
free(arg_root); free(arg_root);