Merge aa59b00a19 into 33c15ba8e8

Remove leftover .gitmodules file
mkosi: Fix authselect systemd-homed feature name
2024-12-22 09:48:03 -08:00 · 2024-12-22 05:19:46 +00:00 · 2024-12-21 22:43:57 +00:00 · 2024-12-21 21:03:03 +01:00 · 2024-12-21 19:15:01 +01:00 · 2024-12-21 19:14:30 +01:00
6 changed files with 15 additions and 9 deletions
--- a/.gitmodules
+++ b/.gitmodules
--- a/hwdb.d/60-keyboard.hwdb
+++ b/hwdb.d/60-keyboard.hwdb
@ -1451,10 +1451,15 @@ evdev:input:b0003v046DpC309*
 KEYBOARD_KEY_c01b6=images                              # My Pictures (F11)
 KEYBOARD_KEY_c01b7=audio                               # My Music (F12)

+# The wireless receiver b0003v046Dp4092* seems to be used by multiple models.
+# See issue #35691. Hence, the entry below cannot be enabled by default. If
+# you're using the model below, consider copying the entry to a custom hwdb
+# file to enable the setting.
+#
 # Logitech MX Keys for Mac
-evdev:input:b0003v046Dp4092*
- KEYBOARD_KEY_70035=102nd                               # '<' key
- KEYBOARD_KEY_70064=grave                               # '^' key
+#evdev:input:b0003v046Dp4092*
+# KEYBOARD_KEY_70035=102nd                               # '<' key
+# KEYBOARD_KEY_70064=grave                               # '^' key

 ###########################################################
 # Maxdata
--- a/mkosi.postinst.chroot
+++ b/mkosi.postinst.chroot
@ -24,8 +24,8 @@ if command -v authselect >/dev/null; then

    authselect select "$PROFILE"

-    if authselect list-features "$PROFILE" | grep -q "with-homed"; then
-        authselect enable-feature with-homed
+    if authselect list-features "$PROFILE" | grep -q "with-systemd-homed"; then
+        authselect enable-feature with-systemd-homed
    fi
 fi

--- a/rules.d/99-systemd.rules.in
+++ b/rules.d/99-systemd.rules.in
@ -73,10 +73,10 @@ SUBSYSTEM=="udc", TAG+="systemd", ENV{SYSTEMD_WANTS}+="usb-gadget.target"
 ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="{{LIBEXECDIR}}/systemd-sysctl --prefix=/net/ipv4/conf/$name --prefix=/net/ipv4/neigh/$name --prefix=/net/ipv6/conf/$name --prefix=/net/ipv6/neigh/$name"

 {% if ENABLE_BACKLIGHT %}
-# Pull in backlight save/restore for all backlight devices and
-# keyboard backlights
+# Pull in backlight save/restore for all backlight devices,
+# keyboard backlights, and handheld joystick rings
 SUBSYSTEM=="backlight", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_WANTS}+="systemd-backlight@backlight:$name.service"
-SUBSYSTEM=="leds", KERNEL=="*kbd_backlight*", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_WANTS}+="systemd-backlight@leds:$name.service"
+SUBSYSTEM=="leds", KERNEL=="*kbd_backlight*|*joystick_rings*", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_WANTS}+="systemd-backlight@leds:$name.service"
 {% endif %}

 # Pull in rfkill save/restore for all rfkill devices
--- a/units/systemd-homed.service.in
+++ b/units/systemd-homed.service.in
@ -18,6 +18,7 @@ BusName=org.freedesktop.home1
 CapabilityBoundingSet=CAP_SYS_ADMIN CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER CAP_FSETID CAP_SETGID CAP_SETUID CAP_SYS_RESOURCE CAP_SETPCAP CAP_DAC_READ_SEARCH CAP_SETFCAP
 DeviceAllow=/dev/loop-control rw
 DeviceAllow=/dev/mapper/control rw
+DeviceAllow=/dev/btrfs-control rw
 DeviceAllow=block-* rw
 DeviceAllow=char-hidraw rw
 ExecStart={{LIBEXECDIR}}/systemd-homed
--- a/units/systemd-oomd.service.in
+++ b/units/systemd-oomd.service.in
@ -20,7 +20,7 @@ ConditionPathExists=/proc/pressure/cpu
 ConditionPathExists=/proc/pressure/io
 ConditionPathExists=/proc/pressure/memory
 Requires=systemd-oomd.socket
-After=systemd-oomd.socket
+After=systemd-oomd.socket systemd-sysusers.service

 [Service]
 AmbientCapabilities=CAP_KILL CAP_DAC_OVERRIDE
Author	SHA1	Message	Date
Mario Limonciello	0402c58a25	Merge `aa59b00a19` into `33c15ba8e8`	2024-12-22 05:19:46 +00:00
Daan De Meyer	33c15ba8e8	Remove leftover .gitmodules file	2024-12-21 22:43:57 +00:00
Daan De Meyer	5495b11360	mkosi: Fix authselect systemd-homed feature name The feature name is with-systemd-homed, not with-homed.	2024-12-21 21:03:03 +01:00
Daan De Meyer	7655550a49	systemd-homed: Give access to /dev/btrfs-control Otherwise, we see "WARNING: failed to open /dev/btrfs-control, skipping device registration: Operation not permitted" in systemd-homed's logs when creating a btrfs on luks home.	2024-12-21 19:15:01 +01:00
Daan De Meyer	36dd429680	units: Order systemd-oomd after systemd-sysusers systemd-sysusers might create the systemd-oom system user that systemd-oomd runs under so let's order systemd-oomd after systemd-sysusers.	2024-12-21 19:14:30 +01:00
Yu Watanabe	52a2b04947	hwdb: comment out the entry for Logitech MX Keys for Mac This effectively reverts the commit `f70e5620b6`, as the entry seems to match multiple models. Fixes #35691.	2024-12-21 12:19:08 +00:00
Mario Limonciello	aa59b00a19	udev: Save/restore the LEDs for the ROG Ally The kernel has a driver for the LEDs around the joystick rings. BIOS defaults to these LEDs enabled from a cold boot. If user set them off, systemd should restore that. ``` P: /devices/pci0000:00/0000:00:08.1/0000:09:00.3/usb1/1-3/1-3:1.2/0003:0B05:1ABE.0003/leds/ally:rgb:joystick_rings M: ally:rgb:joystick_rings U: leds E: DEVPATH=/devices/pci0000:00/0000:00:08.1/0000:09:00.3/usb1/1-3/1-3:1.2/0003:0B05:1ABE.0003/leds/ally:rgb:joystick_rings E: SUBSYSTEM=leds E: USEC_INITIALIZED=9275537 E: ID_PATH_WITH_USB_REVISION=pci-0000:09:00.3-usbv2-0:3:1.2 E: ID_PATH=pci-0000:09:00.3-usb-0:3:1.2 E: ID_PATH_TAG=pci-0000_09_00_3-usb-0_3_1_2 E: ID_FOR_SEAT=leds-pci-0000_09_00_3-usb-0_3_1_2 E: TAGS=💺 E: CURRENT_TAGS=💺 ``` Fixes: https://github.com/systemd/systemd/issues/35436 Suggested-by: Yu Watanabe <watanabe.yu+github@gmail.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>	2024-12-02 08:50:30 -06:00