diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-23 19:36:21 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-29 21:55:51 +0200 |
| commit | 4a9b1dd4ad38e54e6b7df99fe3366ceddd1fa572 (patch) | |
| tree | e7425f56edc4e8f9a78200d033ba9decc2407f18 /units | |
| parent | c2fc2c2560f0ca0fab383753c065e45d76f465e5 (diff) | |
machine-id-commit: merge machine-id-commit functionality into machine-id-setup
And remove machine-id-commit as separate binary.
There's really no point in keeping this separate, as the sources are
pretty much identical, and have pretty identical interfaces. Let's unify
this in one binary.
Given that machine-id-commit was a private binary of systemd (shipped in
/usr/lib/) removing the tool is not an API break.
While we are at it, improve the documentation of the command substantially.
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-machine-id-commit.service.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/units/systemd-machine-id-commit.service.in b/units/systemd-machine-id-commit.service.in index cccbf7b626..1f3f5da0f3 100644 --- a/units/systemd-machine-id-commit.service.in +++ b/units/systemd-machine-id-commit.service.in @@ -18,5 +18,5 @@ ConditionPathIsMountPoint=/etc/machine-id [Service] Type=oneshot RemainAfterExit=yes -ExecStart=@rootlibexecdir@/systemd-machine-id-commit +ExecStart=@rootbindir@/systemd-machine-id-setup --commit TimeoutSec=30s |