machine-id-setup: use path_kill_slashes and modernizations

diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index b879b40b997d9d718f5ba3ff24de3b17e35713d5..62630fbcab86baefadbd2f2fa2abe23b9b4032d0 100644 (file)
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -97,11 +97,12 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>--root=ROOT</option></term>
+                                <term><option>--root=<replaceable>root</replaceable></option></term>
                                 <listitem><para>Takes a directory path
                                 as an argument. All paths will be
-                                prefixed with the given alternate ROOT
-                                path, including config search paths.
+                                prefixed with the given alternate
+                                <replaceable>root</replaceable> path,
+                                including config search paths.
                                 </para></listitem>
                         </varlistentry>
                         <xi:include href="standard-options.xml" xpointer="help" />

diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
index f3b1b318e1bad88825253293ceee81912091a028..43720d628971103a928e613a9c8ae052a75c72e7 100644 (file)
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -36,6 +36,7 @@
 #include "log.h"
 #include "virt.h"
 #include "fileio.h"
+#include "path-util.h"
 
 static int shorten_uuid(char destination[36], const char *source) {
         unsigned i, j;
@@ -160,14 +161,13 @@ int machine_id_setup(const char *root) {
         bool writable = false;
         struct stat st;
         char id[34]; /* 32 + \n + \0 */
-        _cleanup_free_ char *etc_machine_id = NULL;
-        _cleanup_free_ char *run_machine_id = NULL;
+        char *etc_machine_id, *run_machine_id;
 
-        if (asprintf(&etc_machine_id, "%s/etc/machine-id", root) < 0)
-                return log_oom();
+        etc_machine_id = strappenda(root, "/etc/machine-id");
+        path_kill_slashes(etc_machine_id);
 
-        if (asprintf(&run_machine_id, "%s/run/machine-id", root) < 0)
-                return log_oom();
+        run_machine_id = strappenda(root, "/run/machine-id");
+        path_kill_slashes(run_machine_id);
 
         RUN_WITH_UMASK(0000) {
                 /* We create this 0444, to indicate that this isn't really

diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index a67d436dbd7c40a5f305a8ad535ffe220c0b836d..1c933ce600b3cc0e324a8e4a7c0ec0f4254d66a2 100644 (file)
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -37,7 +37,7 @@ static int help(void) {
                "Initialize /etc/machine-id from a random source.\n\n"
                "  -h --help             Show this help\n"
                "     --version          Show package version\n"
-               "     --root             Filesystem root\n",
+               "     --root=ROOT        Filesystem root\n",
                program_invocation_short_name);
 
         return 0;
@@ -87,7 +87,7 @@ static int parse_argv(int argc, char *argv[]) {
         }
 
         if (optind < argc) {
-                help();
+                log_error("Extraneous arguments");
                 return -EINVAL;
         }