From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 14 Jun 2024 11:24:08 +0000 (+0200)
Subject: Merge pull request #33312 from poettering/cryptsetup-merge-no-token
X-Git-Tag: v257-rc1~1163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99421eb1ef8b7e130d3bb328431ba2807758f3f4;p=thirdparty%2Fsystemd.git

Merge pull request #33312 from poettering/cryptsetup-merge-no-token

cryptsetup: merge two mostly equivalent functions
---

99421eb1ef8b7e130d3bb328431ba2807758f3f4