]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
projects / thirdparty / systemd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2270dfb e01ff70)
Merge pull request #3014 from msekletar/nspawn-empty-machine-id-v3
authorLennart Poettering <lennart@poettering.net>
Mon, 11 Apr 2016 15:27:11 +0000 (17:27 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 11 Apr 2016 15:27:11 +0000 (17:27 +0200)
nspawn: always setup machine id (v3)

1  2 
Makefile.am patch | diff1 | diff2 | blob | history
src/nspawn/nspawn.c patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc src/nspawn/nspawn.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.