Merge pull request #7360 from poettering/preset-fix
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 17 Nov 2017 14:00:22 +0000 (15:00 +0100)
committerGitHub <noreply@github.com>
Fri, 17 Nov 2017 14:00:22 +0000 (15:00 +0100)
Some fixes for preset-all logic at boot, plus main.c reworking


Trivial merge