1
0
mirror of https://github.com/systemd/systemd synced 2025-09-29 16:54:46 +02:00

Compare commits

..

No commits in common. "2a613b34ccd07298e3824c0f29c7cd7922d8d4c0" and "aac6673f026229bdad3f57758560b1de186b043c" have entirely different histories.

2 changed files with 26 additions and 35 deletions

View File

@ -432,10 +432,6 @@ mouse:usb:v046dpc51a:name:Logitech USB Receiver:*
mouse:usb:v046dpc01e:name:Logitech USB-PS/2 Optical Mouse:* mouse:usb:v046dpc01e:name:Logitech USB-PS/2 Optical Mouse:*
MOUSE_DPI=400@125 *800@125 1600@125 MOUSE_DPI=400@125 *800@125 1600@125
# Logitech MX 518 Legendary (HERO sensor)
mouse:usb:v046dpc08e:name:Logitech MX518 Gaming Mouse:*
MOUSE_DPI=400@1000 *800@1000 1600@1000 3200@1000 6400@1000
# Logitech MX1000 Laser Cordless Mouse # Logitech MX1000 Laser Cordless Mouse
mouse:bluetooth:v046dpb003:name:Logitech MX1000 mouse:* mouse:bluetooth:v046dpb003:name:Logitech MX1000 mouse:*
MOUSE_DPI=800@80 MOUSE_DPI=800@80

View File

@ -1682,17 +1682,16 @@ int config_parse_exec_root_hash_sig(
return 0; return 0;
} }
int config_parse_exec_cpu_affinity( int config_parse_exec_cpu_affinity(const char *unit,
const char *unit, const char *filename,
const char *filename, unsigned line,
unsigned line, const char *section,
const char *section, unsigned section_line,
unsigned section_line, const char *lvalue,
const char *lvalue, int ltype,
int ltype, const char *rvalue,
const char *rvalue, void *data,
void *data, void *userdata) {
void *userdata) {
ExecContext *c = data; ExecContext *c = data;
int r; int r;
@ -1713,7 +1712,7 @@ int config_parse_exec_cpu_affinity(
if (r >= 0) if (r >= 0)
c->cpu_affinity_from_numa = false; c->cpu_affinity_from_numa = false;
return 0; return r;
} }
int config_parse_capability_set( int config_parse_capability_set(
@ -2743,7 +2742,7 @@ int config_parse_pass_environ(
if (n) { if (n) {
r = strv_extend_strv(passenv, n, true); r = strv_extend_strv(passenv, n, true);
if (r < 0) if (r < 0)
return log_oom(); return r;
} }
return 0; return 0;
@ -2818,7 +2817,7 @@ int config_parse_unset_environ(
if (n) { if (n) {
r = strv_extend_strv(unsetenv, n, true); r = strv_extend_strv(unsetenv, n, true);
if (r < 0) if (r < 0)
return log_oom(); return r;
} }
return 0; return 0;
@ -3096,17 +3095,16 @@ int config_parse_unit_requires_mounts_for(
} }
} }
int config_parse_documentation( int config_parse_documentation(const char *unit,
const char *unit, const char *filename,
const char *filename, unsigned line,
unsigned line, const char *section,
const char *section, unsigned section_line,
unsigned section_line, const char *lvalue,
const char *lvalue, int ltype,
int ltype, const char *rvalue,
const char *rvalue, void *data,
void *data, void *userdata) {
void *userdata) {
Unit *u = userdata; Unit *u = userdata;
int r; int r;
@ -3140,7 +3138,7 @@ int config_parse_documentation(
if (b) if (b)
*b = NULL; *b = NULL;
return 0; return r;
} }
#if HAVE_SECCOMP #if HAVE_SECCOMP
@ -4541,11 +4539,8 @@ int config_parse_set_credential(
r = hashmap_ensure_put(&context->set_credentials, &exec_set_credential_hash_ops, sc->id, sc); r = hashmap_ensure_put(&context->set_credentials, &exec_set_credential_hash_ops, sc->id, sc);
if (r == -ENOMEM) if (r == -ENOMEM)
return log_oom(); return log_oom();
if (r < 0) { if (r < 0)
log_syntax(unit, LOG_WARNING, filename, line, l, return r;
"Duplicated credential value '%s', ignoring assignment: %s", sc->id, rvalue);
return 0;
}
TAKE_PTR(sc); TAKE_PTR(sc);
} }