diff options
| author | anonymix007 <48598263+anonymix007@users.noreply.github.com> | 2024-10-22 13:40:57 +0200 |
|---|---|---|
| committer | anonymix007 <48598263+anonymix007@users.noreply.github.com> | 2024-11-05 22:47:04 +0100 |
| commit | 4c0b7f425024923f37c7e571fa563f602e8bf369 (patch) | |
| tree | 9af10f68dc85f197845f1bd03a0fdcfdfa85937d | |
| parent | uki: add new .dtbauto PE section type (diff) | |
| download | systemd-4c0b7f425024923f37c7e571fa563f602e8bf369.tar.xz systemd-4c0b7f425024923f37c7e571fa563f602e8bf369.zip | |
measure: Introduce .dtbauto support
| -rw-r--r-- | man/systemd-measure.xml | 5 | ||||
| -rw-r--r-- | src/boot/measure.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/man/systemd-measure.xml b/man/systemd-measure.xml index a21b2dcecc..69b9db59bb 100644 --- a/man/systemd-measure.xml +++ b/man/systemd-measure.xml @@ -77,7 +77,7 @@ <option>--osrel=</option>, <option>--cmdline=</option>, <option>--initrd=</option>, <option>--ucode=</option>, <option>--splash=</option>, <option>--dtb=</option>, <option>--uname=</option>, <option>--sbat=</option>, <option>--pcrpkey=</option>, - <option>--profile=</option>, <option>--hwids=</option>, see below. Only <option>--linux=</option> is mandatory. (Alternatively, + <option>--profile=</option>, <option>--dtbauto=</option>, <option>--hwids=</option>, see below. Only <option>--linux=</option> is mandatory. (Alternatively, specify <option>--current</option> to use the current values of PCR register 11 instead.)</para> <xi:include href="version-info.xml" xpointer="v252"/> @@ -125,6 +125,7 @@ <term><option>--sbat=<replaceable>PATH</replaceable></option></term> <term><option>--pcrpkey=<replaceable>PATH</replaceable></option></term> <term><option>--profile=<replaceable>PATH</replaceable></option></term> + <term><option>--dtbauto=<replaceable>PATH</replaceable></option></term> <term><option>--hwids=<replaceable>PATH</replaceable></option></term> <listitem><para>When used with the <command>calculate</command> or <command>sign</command> verb, @@ -135,7 +136,7 @@ <xi:include href="version-info.xml" xpointer="v252"/> - <para id="v257">With the exception of <option>--profile=</option> and <option>--hwids=</option>, which have been added in version + <para id="v257">With the exception of <option>--profile=</option>, <option>--dtbauto=</option> and <option>--hwids=</option>, which have been added in version 257.</para></listitem> </varlistentry> diff --git a/src/boot/measure.c b/src/boot/measure.c index eece58f43f..9e6295b9da 100644 --- a/src/boot/measure.c +++ b/src/boot/measure.c @@ -148,8 +148,9 @@ static int parse_argv(int argc, char *argv[]) { _ARG_PCRSIG, /* the .pcrsig section is not input for signing, hence not actually an argument here */ ARG_PCRPKEY, ARG_PROFILE, + ARG_HWIDS, _ARG_SECTION_LAST, - ARG_HWIDS = _ARG_SECTION_LAST, + ARG_DTBAUTO = _ARG_SECTION_LAST, ARG_BANK, ARG_PRIVATE_KEY, ARG_PRIVATE_KEY_SOURCE, @@ -172,6 +173,7 @@ static int parse_argv(int argc, char *argv[]) { { "ucode", required_argument, NULL, ARG_UCODE }, { "splash", required_argument, NULL, ARG_SPLASH }, { "dtb", required_argument, NULL, ARG_DTB }, + { "dtbauto", required_argument, NULL, ARG_DTBAUTO }, { "uname", required_argument, NULL, ARG_UNAME }, { "sbat", required_argument, NULL, ARG_SBAT }, { "pcrpkey", required_argument, NULL, ARG_PCRPKEY }, @@ -196,7 +198,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argv); /* Make sure the arguments list and the section list, stays in sync */ - // assert_cc(_ARG_SECTION_FIRST + _UNIFIED_SECTION_MAX == _ARG_SECTION_LAST + 1); + assert_cc(_ARG_SECTION_FIRST + _UNIFIED_SECTION_MAX == _ARG_SECTION_LAST + 1); while ((c = getopt_long(argc, argv, "hjc", options, NULL)) >= 0) switch (c) { |