From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Mar 2019 18:15:49 +0000 (+0100)
Subject: Merge pull request #12046 from keszybz/simplify-invocation-id-check
X-Git-Tag: v242-rc1~89
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e947830460645ceab5574a55c1f251300dbcdc70;p=thirdparty%2Fsystemd.git

Merge pull request #12046 from keszybz/simplify-invocation-id-check

sd-id128: look for invocation id in environment first, keyring second
---

e947830460645ceab5574a55c1f251300dbcdc70