nspawn: make sure --template= and --machine= my be combined
authorLennart Poettering <lennart@poettering.net>
Tue, 25 Aug 2015 18:26:51 +0000 (20:26 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 25 Aug 2015 18:28:31 +0000 (20:28 +0200)
commitc1521918b48f45a316f0bd034976809ae0ce4dd8
treec847127580fcdf4079b8e382df7a8679c0c068be
parent33c1c9745ccc478c8eda72f8bae76945487076ae
nspawn: make sure --template= and --machine= my be combined

Fixes #1018.

Based on a patch from Seth Jennings.
src/nspawn/nspawn.c