Compare commits

..

No commits in common. "09e4b620e7a9d157b2d359f7ac5d5a430d916007" and "1e904320aacb21b1b9563015cb8a7f2014088920" have entirely different histories.

4 changed files with 10 additions and 13 deletions

7
TODO
View File

@ -17,6 +17,12 @@ Janitorial Clean-ups:
* rework mount.c and swap.c to follow proper state enumeration/deserialization * rework mount.c and swap.c to follow proper state enumeration/deserialization
semantics, like we do for device.c now semantics, like we do for device.c now
Before v244:
* revisit SystemdOptions EFI variable. Find a better, systematic name and use
it for the env var, the bootctl verb and the EFI variable itself, clear up
semantics.
Features: Features:
* socket units: allow creating a udev monitor socket with ListenDevices= or so, * socket units: allow creating a udev monitor socket with ListenDevices= or so,
@ -1149,3 +1155,4 @@ Regularly:
* link up selected blog stories from man pages and unit files Documentation= fields * link up selected blog stories from man pages and unit files Documentation= fields
String is not UTF-8 clean, ignoring assignment String is not UTF-8 clean, ignoring assignment
timedatex.service: Consumed 26ms CPU time.

View File

@ -477,10 +477,6 @@ mouse:bluetooth:v046dpb019:name:MX Master 2S Mouse:
MOUSE_WHEEL_CLICK_COUNT=24 MOUSE_WHEEL_CLICK_COUNT=24
MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL=14 MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL=14
# Logitech MX Ergo (via Bluetooth)
mouse:bluetooth:v046dpb01d:name:MX Ergo Mouse:
ID_INPUT_TRACKBALL=1
## Other ## ## Other ##
# Logitech M-BJ58 Optical Mouse # Logitech M-BJ58 Optical Mouse

View File

@ -404,7 +404,7 @@ static void acquire_wlan_link_info(LinkInfo *link) {
if (r < 0) if (r < 0)
log_debug_errno(r, "%s: failed to query ssid: %m", link->name); log_debug_errno(r, "%s: failed to query ssid: %m", link->name);
if (link->wlan_iftype == NL80211_IFTYPE_STATION) { if (link->iftype == NL80211_IFTYPE_STATION) {
k = wifi_get_station(genl, link->ifindex, &link->bssid); k = wifi_get_station(genl, link->ifindex, &link->bssid);
if (k < 0) if (k < 0)
log_debug_errno(k, "%s: failed to query bssid: %m", link->name); log_debug_errno(k, "%s: failed to query bssid: %m", link->name);

View File

@ -32,7 +32,6 @@
#include "cpu-set-util.h" #include "cpu-set-util.h"
#include "dirent-util.h" #include "dirent-util.h"
#include "dropin.h" #include "dropin.h"
#include "efi-loader.h"
#include "efivars.h" #include "efivars.h"
#include "env-util.h" #include "env-util.h"
#include "escape.h" #include "escape.h"
@ -3515,13 +3514,8 @@ static int load_kexec_kernel(void) {
return log_error_errno(errno, KEXEC" is not available: %m"); return log_error_errno(errno, KEXEC" is not available: %m");
r = boot_entries_load_config_auto(NULL, NULL, &config); r = boot_entries_load_config_auto(NULL, NULL, &config);
if (r == -ENOKEY) if (r == -ENOKEY) /* The call doesn't log about ENOKEY, let's do so here. */
/* The call doesn't log about ENOKEY, let's do so here. */ return log_error_errno(r, "Cannot find the ESP partition mount point.");
return log_error_errno(r,
"No kexec kernel loaded and autodetection failed.\n%s",
is_efi_boot()
? "Cannot automatically load kernel: ESP partition mount point not found."
: "Automatic loading works only on systems booted with EFI.");
if (r < 0) if (r < 0)
return r; return r;