mirror of
https://github.com/systemd/systemd
synced 2025-10-06 20:24:45 +02:00
Compare commits
No commits in common. "ee579e6454bd96afe72d805f53d91b7e4292be5a" and "f3e58b55def926ebaad714a2f32b74b355b56ed0" have entirely different histories.
ee579e6454
...
f3e58b55de
@ -684,21 +684,6 @@ evdev:atkbd:dmi:bvn*:bvr*:svnHP*:pnHP*ProBook*645*G4*:*
|
||||
KEYBOARD_KEY_73=slash # Slash key
|
||||
KEYBOARD_KEY_f8=wlan # Wireless HW switch button
|
||||
|
||||
# HP ProBook 455 G5
|
||||
evdev:atkbd:dmi:bvn*:bvr*:svnHP*:pnHP*ProBook*455*G5*:*
|
||||
KEYBOARD_KEY_85=unknown # lid close; also reported via special evdev
|
||||
KEYBOARD_KEY_f8=wlan # Wireless HW switch button
|
||||
|
||||
# HP mt44 Mobile Thin Client
|
||||
evdev:atkbd:dmi:bvn*:bvr*:svnHP*:pnHP*mt44*Mobile*Thin*Client*:*
|
||||
KEYBOARD_KEY_64=calendar # Calendar icon (Fn + F12)
|
||||
KEYBOARD_KEY_6d=displaytoggle # Display icon
|
||||
KEYBOARD_KEY_66=connect # Pickup phone button → connect → XF86Go
|
||||
KEYBOARD_KEY_65=cancel # Hangup phone button → cancel → Cancel
|
||||
KEYBOARD_KEY_81=f20 # Fn+F8; Microphone mute button, should be micmute
|
||||
KEYBOARD_KEY_85=unknown # lid close; also reported via special evdev
|
||||
KEYBOARD_KEY_f8=wlan # Wireless HW switch button
|
||||
|
||||
# HP Stream 7
|
||||
# The ACPI tables contains a gpio-keys entry for a non connected GPIO
|
||||
# causing spurious events, map this to unknown to disable it
|
||||
|
||||
@ -30,7 +30,7 @@ __get_machines() {
|
||||
}
|
||||
|
||||
_machinectl() {
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
local i verb comps
|
||||
|
||||
local -A OPTS=(
|
||||
|
||||
@ -30,7 +30,7 @@ __get_links() {
|
||||
|
||||
_networkctl() {
|
||||
local i verb comps
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
local -A OPTS=(
|
||||
[STANDALONE]='-a --all -h --help --version --no-pager --no-legend -s --stats -l --full'
|
||||
[ARG]='-n --lines'
|
||||
|
||||
@ -46,7 +46,7 @@ __get_syscall_sets() {
|
||||
|
||||
_systemd_analyze() {
|
||||
local i verb comps mode
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
|
||||
local -A OPTS=(
|
||||
[STANDALONE]='-h --help --version --system --user --global --order --require --no-pager
|
||||
|
||||
@ -25,7 +25,7 @@ __contains_word() {
|
||||
}
|
||||
|
||||
_systemd_cat() {
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
local i verb comps
|
||||
|
||||
local -A OPTS=(
|
||||
|
||||
@ -37,7 +37,7 @@ __get_units_have_cgroup() {
|
||||
}
|
||||
|
||||
_systemd_cgls() {
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
local i verb comps
|
||||
|
||||
local -A OPTS=(
|
||||
|
||||
@ -29,7 +29,7 @@ __get_machines() {
|
||||
}
|
||||
|
||||
_systemd_cgtop() {
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
local comps
|
||||
|
||||
local -A OPTS=(
|
||||
|
||||
@ -24,7 +24,7 @@ __contains_word() {
|
||||
}
|
||||
|
||||
_systemd-delta() {
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
local comps
|
||||
|
||||
local -A OPTS=(
|
||||
|
||||
@ -24,7 +24,7 @@ __contains_word() {
|
||||
}
|
||||
|
||||
_systemd_detect_virt() {
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
local i verb comps
|
||||
|
||||
local -A OPTS=(
|
||||
|
||||
@ -26,7 +26,7 @@ __contains_word () {
|
||||
|
||||
_systemd_id128() {
|
||||
local i verb comps
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
local -A OPTS=(
|
||||
[STANDALONE]='-h --help --version -p --pretty'
|
||||
[ARG]='-a --app-specific'
|
||||
|
||||
@ -58,7 +58,7 @@ __get_rlimit() {
|
||||
}
|
||||
|
||||
_systemd_nspawn() {
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
local i verb comps
|
||||
|
||||
local -A OPTS=(
|
||||
|
||||
@ -30,7 +30,7 @@ __get_names() {
|
||||
|
||||
_systemd_path() {
|
||||
local comps
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
|
||||
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
local -A OPTS=(
|
||||
[STANDALONE]='-h --help --version'
|
||||
[ARG]='--suffix'
|
||||
|
||||
@ -74,7 +74,6 @@ int normalize_recovery_key(const char *password, char **ret) {
|
||||
int make_recovery_key(char **ret) {
|
||||
_cleanup_(erase_and_freep) char *formatted = NULL;
|
||||
_cleanup_(erase_and_freep) uint8_t *key = NULL;
|
||||
size_t j = 0;
|
||||
int r;
|
||||
|
||||
assert(ret);
|
||||
@ -92,7 +91,7 @@ int make_recovery_key(char **ret) {
|
||||
if (!formatted)
|
||||
return -ENOMEM;
|
||||
|
||||
for (size_t i = 0; i < RECOVERY_KEY_MODHEX_RAW_LENGTH; i++) {
|
||||
for (size_t i = 0, j = 0; i < RECOVERY_KEY_MODHEX_RAW_LENGTH; i++) {
|
||||
formatted[j++] = modhex_alphabet[key[i] >> 4];
|
||||
formatted[j++] = modhex_alphabet[key[i] & 0xF];
|
||||
|
||||
@ -100,9 +99,7 @@ int make_recovery_key(char **ret) {
|
||||
formatted[j++] = '-';
|
||||
}
|
||||
|
||||
assert(j == RECOVERY_KEY_MODHEX_FORMATTED_LENGTH);
|
||||
assert(formatted[RECOVERY_KEY_MODHEX_FORMATTED_LENGTH-1] == '-');
|
||||
formatted[RECOVERY_KEY_MODHEX_FORMATTED_LENGTH-1] = 0; /* replace final dash with a NUL */
|
||||
formatted[RECOVERY_KEY_MODHEX_FORMATTED_LENGTH-1] = 0;
|
||||
|
||||
*ret = TAKE_PTR(formatted);
|
||||
return 0;
|
||||
|
||||
@ -433,7 +433,6 @@ static int dns_stub_finish_reply_packet(
|
||||
int rcode,
|
||||
bool tc, /* set the Truncated bit? */
|
||||
bool aa, /* set the Authoritative Answer bit? */
|
||||
bool rd, /* set the Recursion Desired bit? */
|
||||
bool add_opt, /* add an OPT RR to this packet? */
|
||||
bool edns0_do, /* set the EDNS0 DNSSEC OK bit? */
|
||||
bool ad, /* set the DNSSEC authenticated data bit? */
|
||||
@ -474,7 +473,7 @@ static int dns_stub_finish_reply_packet(
|
||||
0 /* opcode */,
|
||||
aa /* aa */,
|
||||
tc /* tc */,
|
||||
rd /* rd */,
|
||||
1 /* rd */,
|
||||
1 /* ra */,
|
||||
ad /* ad */,
|
||||
cd /* cd */,
|
||||
@ -582,7 +581,6 @@ static int dns_stub_send_reply(
|
||||
rcode,
|
||||
truncated,
|
||||
dns_query_fully_authoritative(q),
|
||||
DNS_PACKET_RD(q->request_packet),
|
||||
!!q->request_packet->opt,
|
||||
edns0_do,
|
||||
DNS_PACKET_AD(q->request_packet) && dns_query_fully_authenticated(q),
|
||||
@ -624,7 +622,6 @@ static int dns_stub_send_failure(
|
||||
rcode,
|
||||
truncated,
|
||||
false,
|
||||
DNS_PACKET_RD(p),
|
||||
!!p->opt,
|
||||
DNS_PACKET_DO(p),
|
||||
DNS_PACKET_AD(p) && authenticated,
|
||||
|
||||
@ -686,10 +686,6 @@ int tpm2_unseal(
|
||||
|
||||
assert(pcr_mask < (UINT32_C(1) << TPM2_PCRS_MAX)); /* Support 24 PCR banks */
|
||||
|
||||
r = dlopen_tpm2();
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "TPM2 support is not installed.");
|
||||
|
||||
/* So here's what we do here: We connect to the TPM2 chip. As we do when sealing we generate a
|
||||
* "primary" key on the TPM2 chip, with the same parameters as well as a PCR-bound policy
|
||||
* session. Given we pass the same parameters, this will result in the same "primary" key, and same
|
||||
|
||||
@ -29,12 +29,10 @@ StandardError=tty
|
||||
# Optionally, pick up basic fields from credentials passed to the service
|
||||
# manager. This is useful for importing this data from nspawn's
|
||||
# --set-credential= switch.
|
||||
# FIXME: temporarily disabled as it causes asserts on v247/v248, see:
|
||||
# https://github.com/systemd/systemd/issues/19178
|
||||
#LoadCredential=passwd.hashed-password.root
|
||||
#LoadCredential=passwd.plaintext-password.root
|
||||
#LoadCredential=passwd.shell.root
|
||||
#LoadCredential=firstboot.locale
|
||||
#LoadCredential=firstboot.locale-messages
|
||||
#LoadCredential=firstboot.keymap
|
||||
#LoadCredential=firstboot.timezone
|
||||
LoadCredential=passwd.hashed-password.root
|
||||
LoadCredential=passwd.plaintext-password.root
|
||||
LoadCredential=passwd.shell.root
|
||||
LoadCredential=firstboot.locale
|
||||
LoadCredential=firstboot.locale-messages
|
||||
LoadCredential=firstboot.keymap
|
||||
LoadCredential=firstboot.timezone
|
||||
|
||||
@ -25,8 +25,6 @@ TimeoutSec=90s
|
||||
# Optionally, pick up a root password and shell for the root user from a
|
||||
# credential passed to the service manager. This is useful for importing this
|
||||
# data from nspawn's --set-credential= switch.
|
||||
# FIXME: temporarily disabled as it causes asserts on v247/v248, see:
|
||||
# https://github.com/systemd/systemd/issues/19178
|
||||
#LoadCredential=passwd.hashed-password.root
|
||||
#LoadCredential=passwd.plaintext-password.root
|
||||
#LoadCredential=passwd.shell.root
|
||||
LoadCredential=passwd.hashed-password.root
|
||||
LoadCredential=passwd.plaintext-password.root
|
||||
LoadCredential=passwd.shell.root
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user