summaryrefslogtreecommitdiff
path: root/src/machine-id-setup
diff options
context:
space:
mode:
authorNils Carlson <pyssling@ludd.ltu.se>2015-07-06 00:00:59 +0200
committerNils Carlson <pyssling@ludd.ltu.se>2016-01-12 22:10:41 +0000
commitee48dbd55f544d9ee4a17497b5757be7e854c869 (patch)
treee290abed946e3c8dc1f77efeafe2aec61095265c /src/machine-id-setup
parenta41a7181c9af8f9ac93a85a2cf133294dd202c8e (diff)
downloadsystemd-ee48dbd55f544d9ee4a17497b5757be7e854c869.tar.gz
core: Add machine-id setting
Allow for overriding all other machine-ids which may be present on the system using a kernel command line systemd.machine_id or --machine-id= option. This is especially useful for network booted systems where the machine-id needs to be static, or for containers where a specific machine-id is wanted.
Diffstat (limited to 'src/machine-id-setup')
-rw-r--r--src/machine-id-setup/machine-id-setup-main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index d805bcfdca..9d19307236 100644
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -112,7 +112,7 @@ int main(int argc, char *argv[]) {
if (arg_commit)
r = machine_id_commit(arg_root);
else
- r = machine_id_setup(arg_root);
+ r = machine_id_setup(arg_root, SD_ID128_NULL);
finish:
free(arg_root);