summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-03-14 08:43:21 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-03-14 09:31:34 -0400
commitfe970a8a30d611d454cb40025cfc32e29efa34e6 (patch)
tree308ca3c94d3d1bb69826ea8b19d8ff86b027467e /src/core
parentcb44f25c12f6203ad1f173d5b32d4059f446508e (diff)
machine-id-setup: use path_kill_slashes and modernizations
Diffstat (limited to 'src/core')
-rw-r--r--src/core/machine-id-setup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
index f3b1b318e1..43720d6289 100644
--- 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