diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-04-14 10:14:41 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-04-14 10:14:41 +0200 |
| commit | 8fae819099a189f03213ee657f44545c1b035f7e (patch) | |
| tree | a398d2aea2046ae90f149288f9df9befc8d7e4fb /src/core/machine-id-setup.c | |
| parent | 43bbb8f005177bcad135ec894419361f0f420034 (diff) | |
| parent | 78df0edc1b594017b1d3493eb2033d8a92d9d43f (diff) | |
Merge pull request #3033 from keszybz/code-cleanups
Code cleanups
Diffstat (limited to 'src/core/machine-id-setup.c')
| -rw-r--r-- | src/core/machine-id-setup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index 86da16c31e..9de528b6cf 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -259,11 +259,12 @@ int machine_id_setup(const char *root, sd_id128_t machine_id) { /* Hmm, we couldn't write it? So let's write it to * /run/machine-id as a replacement */ - RUN_WITH_UMASK(0022) + RUN_WITH_UMASK(0022) { r = write_string_file(run_machine_id, id, WRITE_STRING_FILE_CREATE); - if (r < 0) { - (void) unlink(run_machine_id); - return log_error_errno(r, "Cannot write %s: %m", run_machine_id); + if (r < 0) { + (void) unlink(run_machine_id); + return log_error_errno(r, "Cannot write %s: %m", run_machine_id); + } } /* And now, let's mount it over */ |