Compare commits
9 Commits
aaaf42cb44
...
e9b0b64f77
Author | SHA1 | Date |
---|---|---|
Lukas K | e9b0b64f77 | |
Mike Gilbert | 19bb96759a | |
James Buren | 2a5180945a | |
HATAYAMA Daisuke | 9c1f969d40 | |
Ryan Attard | 06654d1225 | |
Anita Zhang | 1e84031952 | |
Anita Zhang | 54a2f5e69c | |
Zbigniew Jędrzejewski-Szmek | e60228bf68 | |
Yu Watanabe | 662d74daf7 |
|
@ -384,7 +384,7 @@ sensor:modalias:acpi:KIOX000A*:dmi:*svnLAMINA:pnT-1016BNORD*
|
||||||
sensor:modalias:acpi:NCPE0388*:dmi:*:rnLenovoYOGA510-14IKB:*
|
sensor:modalias:acpi:NCPE0388*:dmi:*:rnLenovoYOGA510-14IKB:*
|
||||||
ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, -1, 0; 0, 0, 1
|
ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, -1, 0; 0, 0, 1
|
||||||
|
|
||||||
sensor:modalias:acpi:BOSC0200:BOSC0200:dmi:*ThinkPadYoga11e3rdGen*
|
sensor:modalias:acpi:BOSC0200*:dmi:*ThinkPadYoga11e3rdGen*
|
||||||
ACCEL_MOUNT_MATRIX=0, 1, 0; -1, 0, 0; 0, 0, 1
|
ACCEL_MOUNT_MATRIX=0, 1, 0; -1, 0, 0; 0, 0, 1
|
||||||
|
|
||||||
# Miix3-1030
|
# Miix3-1030
|
||||||
|
@ -473,6 +473,10 @@ sensor:modalias:acpi:KIOX000A*:dmi:*:svnTMAX:pnTM800W560L:*
|
||||||
sensor:modalias:acpi:KIOX000A*:dmi:*:svnTMAX:pnTM101W610L:*
|
sensor:modalias:acpi:KIOX000A*:dmi:*:svnTMAX:pnTM101W610L:*
|
||||||
ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
|
ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
|
||||||
|
|
||||||
|
# Nuvision Encite Split 11. NES11-C432SSA
|
||||||
|
sensor:modalias:acpi:BOSC0200*:dmi:*:svnNuvision:pnNES11:*
|
||||||
|
ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
|
||||||
|
|
||||||
#########################################
|
#########################################
|
||||||
# Onda
|
# Onda
|
||||||
#########################################
|
#########################################
|
||||||
|
|
|
@ -724,9 +724,15 @@ static void swap_enter_active(Swap *s, SwapResult f) {
|
||||||
static void swap_enter_dead_or_active(Swap *s, SwapResult f) {
|
static void swap_enter_dead_or_active(Swap *s, SwapResult f) {
|
||||||
assert(s);
|
assert(s);
|
||||||
|
|
||||||
if (s->from_proc_swaps)
|
if (s->from_proc_swaps) {
|
||||||
|
Swap *other;
|
||||||
|
|
||||||
swap_enter_active(s, f);
|
swap_enter_active(s, f);
|
||||||
else
|
|
||||||
|
LIST_FOREACH_OTHERS(same_devnode, other, s)
|
||||||
|
if (UNIT(other)->job)
|
||||||
|
swap_enter_dead_or_active(other, f);
|
||||||
|
} else
|
||||||
swap_enter_dead(s, f);
|
swap_enter_dead(s, f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,6 +55,7 @@ else
|
||||||
read -r -d '' -a line < /proc/cmdline
|
read -r -d '' -a line < /proc/cmdline
|
||||||
for i in "${line[@]}"; do
|
for i in "${line[@]}"; do
|
||||||
[[ "${i#initrd=*}" != "$i" ]] && continue
|
[[ "${i#initrd=*}" != "$i" ]] && continue
|
||||||
|
[[ "${i#BOOT_IMAGE=*}" != "$i" ]] && continue
|
||||||
BOOT_OPTIONS+=("$i")
|
BOOT_OPTIONS+=("$i")
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -4107,7 +4107,7 @@ int json_dispatch_user_group_name(const char *name, JsonVariant *variant, JsonDi
|
||||||
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a string.", strna(name));
|
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a string.", strna(name));
|
||||||
|
|
||||||
n = json_variant_string(variant);
|
n = json_variant_string(variant);
|
||||||
if (!valid_user_group_name(n))
|
if (!valid_user_group_name_compat(n))
|
||||||
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a valid user/group name.", strna(name));
|
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a valid user/group name.", strna(name));
|
||||||
|
|
||||||
r = free_and_strdup(s, n);
|
r = free_and_strdup(s, n);
|
||||||
|
|
|
@ -600,7 +600,7 @@ int json_dispatch_user_group_list(const char *name, JsonVariant *variant, JsonDi
|
||||||
if (!json_variant_is_string(e))
|
if (!json_variant_is_string(e))
|
||||||
return json_log(e, flags, SYNTHETIC_ERRNO(EINVAL), "JSON array element is not a string.");
|
return json_log(e, flags, SYNTHETIC_ERRNO(EINVAL), "JSON array element is not a string.");
|
||||||
|
|
||||||
if (!valid_user_group_name(json_variant_string(e)))
|
if (!valid_user_group_name_compat(json_variant_string(e)))
|
||||||
return json_log(e, flags, SYNTHETIC_ERRNO(EINVAL), "JSON array element is not a valid user/group name: %s", json_variant_string(e));
|
return json_log(e, flags, SYNTHETIC_ERRNO(EINVAL), "JSON array element is not a valid user/group name: %s", json_variant_string(e));
|
||||||
|
|
||||||
r = strv_extend(&l, json_variant_string(e));
|
r = strv_extend(&l, json_variant_string(e));
|
||||||
|
|
|
@ -587,7 +587,7 @@ int userdb_by_name(const char *name, UserDBFlags flags, UserRecord **ret) {
|
||||||
_cleanup_(json_variant_unrefp) JsonVariant *query = NULL;
|
_cleanup_(json_variant_unrefp) JsonVariant *query = NULL;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
if (!valid_user_group_name(name))
|
if (!valid_user_group_name_compat(name))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
r = json_build(&query, JSON_BUILD_OBJECT(
|
r = json_build(&query, JSON_BUILD_OBJECT(
|
||||||
|
@ -700,12 +700,8 @@ int userdb_all(UserDBFlags flags, UserDBIterator **ret) {
|
||||||
setpwent();
|
setpwent();
|
||||||
iterator->nss_iterating = true;
|
iterator->nss_iterating = true;
|
||||||
goto finish;
|
goto finish;
|
||||||
}
|
} else if (r < 0)
|
||||||
|
return r;
|
||||||
if (!FLAGS_SET(flags, USERDB_DONT_SYNTHESIZE))
|
|
||||||
goto finish;
|
|
||||||
|
|
||||||
return r;
|
|
||||||
|
|
||||||
finish:
|
finish:
|
||||||
*ret = TAKE_PTR(iterator);
|
*ret = TAKE_PTR(iterator);
|
||||||
|
@ -801,7 +797,7 @@ int groupdb_by_name(const char *name, UserDBFlags flags, GroupRecord **ret) {
|
||||||
_cleanup_(json_variant_unrefp) JsonVariant *query = NULL;
|
_cleanup_(json_variant_unrefp) JsonVariant *query = NULL;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
if (!valid_user_group_name(name))
|
if (!valid_user_group_name_compat(name))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
r = json_build(&query, JSON_BUILD_OBJECT(
|
r = json_build(&query, JSON_BUILD_OBJECT(
|
||||||
|
@ -994,7 +990,7 @@ int membershipdb_by_user(const char *name, UserDBFlags flags, UserDBIterator **r
|
||||||
|
|
||||||
assert(ret);
|
assert(ret);
|
||||||
|
|
||||||
if (!valid_user_group_name(name))
|
if (!valid_user_group_name_compat(name))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
r = json_build(&query, JSON_BUILD_OBJECT(
|
r = json_build(&query, JSON_BUILD_OBJECT(
|
||||||
|
@ -1037,7 +1033,7 @@ int membershipdb_by_group(const char *name, UserDBFlags flags, UserDBIterator **
|
||||||
|
|
||||||
assert(ret);
|
assert(ret);
|
||||||
|
|
||||||
if (!valid_user_group_name(name))
|
if (!valid_user_group_name_compat(name))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
r = json_build(&query, JSON_BUILD_OBJECT(
|
r = json_build(&query, JSON_BUILD_OBJECT(
|
||||||
|
|
|
@ -354,7 +354,7 @@ static int disk_identify(int fd,
|
||||||
ret = disk_identify_packet_device_command(fd, out_identify, 512);
|
ret = disk_identify_packet_device_command(fd, out_identify, 512);
|
||||||
goto check_nul_bytes;
|
goto check_nul_bytes;
|
||||||
}
|
}
|
||||||
if (peripheral_device_type != 0x00) {
|
if (!IN_SET(peripheral_device_type, 0x00, 0x14)) {
|
||||||
ret = -1;
|
ret = -1;
|
||||||
errno = EIO;
|
errno = EIO;
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Reference in New Issue