mirror of
https://github.com/systemd/systemd
synced 2025-11-10 20:34:45 +01:00
Compare commits
7 Commits
7b3046e693
...
c3e80f8f2b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c3e80f8f2b | ||
|
|
d1676fdfbd | ||
|
|
7a62cbfc6d | ||
|
|
74c0ed07a1 | ||
|
|
9ebf0d260d | ||
|
|
399c9f847e | ||
|
|
5efcbae259 |
@ -346,7 +346,6 @@ $ ukify build \
|
|||||||
<programlisting># systemd-cryptenroll --tpm2-device=auto \
|
<programlisting># systemd-cryptenroll --tpm2-device=auto \
|
||||||
--tpm2-public-key=tpm2-pcr-public-key.pem \
|
--tpm2-public-key=tpm2-pcr-public-key.pem \
|
||||||
--tpm2-signature=tpm2-pcr-signature.json \
|
--tpm2-signature=tpm2-pcr-signature.json \
|
||||||
--tpm2-pcrs="" \
|
|
||||||
/dev/sda5</programlisting>
|
/dev/sda5</programlisting>
|
||||||
|
|
||||||
<para>And then unlock the device with the signature:</para>
|
<para>And then unlock the device with the signature:</para>
|
||||||
|
|||||||
@ -3887,7 +3887,7 @@ static int parse_argv(int argc, char *argv[]) {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case ARG_SETENV: {
|
case ARG_SETENV: {
|
||||||
_cleanup_free_ char **l = NULL;
|
_cleanup_strv_free_ char **l = NULL;
|
||||||
_cleanup_(sd_json_variant_unrefp) sd_json_variant *ne = NULL;
|
_cleanup_(sd_json_variant_unrefp) sd_json_variant *ne = NULL;
|
||||||
sd_json_variant *e;
|
sd_json_variant *e;
|
||||||
|
|
||||||
|
|||||||
@ -726,7 +726,7 @@ enum nss_status _nss_systemd_getgrent_r(
|
|||||||
int *errnop) {
|
int *errnop) {
|
||||||
|
|
||||||
_cleanup_(group_record_unrefp) GroupRecord *gr = NULL;
|
_cleanup_(group_record_unrefp) GroupRecord *gr = NULL;
|
||||||
_cleanup_free_ char **members = NULL;
|
_cleanup_strv_free_ char **members = NULL;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
PROTECT_ERRNO;
|
PROTECT_ERRNO;
|
||||||
|
|||||||
@ -1133,6 +1133,8 @@ static int ask_password_credential(const AskPasswordRequest *req, AskPasswordFla
|
|||||||
r = read_credential(req->credential, (void**) &buffer, &size);
|
r = read_credential(req->credential, (void**) &buffer, &size);
|
||||||
if (IN_SET(r, -ENXIO, -ENOENT)) /* No credentials passed or this credential not defined? */
|
if (IN_SET(r, -ENXIO, -ENOENT)) /* No credentials passed or this credential not defined? */
|
||||||
return -ENOKEY;
|
return -ENOKEY;
|
||||||
|
if (r < 0)
|
||||||
|
return r;
|
||||||
|
|
||||||
l = strv_parse_nulstr(buffer, size);
|
l = strv_parse_nulstr(buffer, size);
|
||||||
if (!l)
|
if (!l)
|
||||||
|
|||||||
@ -257,7 +257,7 @@ static int reread_partition_table_full(sd_device *dev, int fd, RereadPartitionTa
|
|||||||
if (FLAGS_SET(flags, REREADPT_BSD_LOCK)) {
|
if (FLAGS_SET(flags, REREADPT_BSD_LOCK)) {
|
||||||
lock_fd = fd_reopen(fd, O_RDONLY|O_CLOEXEC|O_NOCTTY);
|
lock_fd = fd_reopen(fd, O_RDONLY|O_CLOEXEC|O_NOCTTY);
|
||||||
if (lock_fd < 0)
|
if (lock_fd < 0)
|
||||||
return log_device_debug_errno(dev, r, "Failed top open lock fd for block device '%s': %m", p);
|
return log_device_debug_errno(dev, lock_fd, "Failed top open lock fd for block device '%s': %m", p);
|
||||||
|
|
||||||
if (flock(lock_fd, LOCK_EX|LOCK_NB) < 0)
|
if (flock(lock_fd, LOCK_EX|LOCK_NB) < 0)
|
||||||
return log_device_debug_errno(dev, errno, "Failed to take BSD lock on block device '%s': %m", p);
|
return log_device_debug_errno(dev, errno, "Failed to take BSD lock on block device '%s': %m", p);
|
||||||
|
|||||||
@ -346,7 +346,8 @@ EOF
|
|||||||
bootctl remove
|
bootctl remove
|
||||||
}
|
}
|
||||||
|
|
||||||
testcase_secureboot() {
|
# Order this first, as other test cases mess with the ESP and might break 'bootctl status' output
|
||||||
|
testcase_00_secureboot() {
|
||||||
if [ ! -d /sys/firmware/efi ]; then
|
if [ ! -d /sys/firmware/efi ]; then
|
||||||
echo "Not booted with EFI, skipping secureboot tests."
|
echo "Not booted with EFI, skipping secureboot tests."
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user