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)
commita53dbb34ff2d9720fd48e59c28ea4ca791d1e70a
tree7980eab976eb27e5c40a4c0ef9af28016a05a1e9
parentf04c05202565f2e6e4585b6bbc8ece3ee593d019
parent264212289821f357cc3a1df32c5bf0fbb8fcc277
Merge pull request #7360 from poettering/preset-fix

Some fixes for preset-all logic at boot, plus main.c reworking