diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-10-22 20:29:25 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-10-22 20:30:15 +0200 |
| commit | 07a60cc13c48c5f79616b07aad2808bfe809de22 (patch) | |
| tree | 8143d41b48c7df8df88cf52e458b6be97d7aca46 /src/firstboot | |
| parent | 8483d73ff158ee0d51ccbba09a470cc6ae9b071a (diff) | |
firstboot: don't prohibit re-generating the machine id on the current root fs
If it really is missing it should be safe to create it.
Also see:
http://lists.freedesktop.org/archives/systemd-devel/2014-August/022726.html
Diffstat (limited to 'src/firstboot')
| -rw-r--r-- | src/firstboot/firstboot.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 6b0d2fc86a..93273d903c 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -451,9 +451,6 @@ static int process_machine_id(void) { if (faccessat(AT_FDCWD, etc_machine_id, F_OK, AT_SYMLINK_NOFOLLOW) >= 0) return 0; - if (!arg_root) - return 0; - if (sd_id128_equal(arg_machine_id, SD_ID128_NULL)) return 0; |