From 92524490f809a01c15c05d8d2c4246e6a8ba9cda Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Fri, 9 Aug 2024 10:41:13 -0700 Subject: [PATCH] fix(Suspend/Resume): Remove resume service - Removes inputplumer-resume.service. Testing on v0.34.2 shows the service is no longer needed for device input to be registered after a resume event. Specific reasons for the behavior change are not known, but I suspect a commbination of using udev and unique ID's for the DS5 has resovled the issue. Fixes #77 --- Cargo.toml | 1 - Makefile | 1 - pkg/rpm/inputplumber.spec | 1 - .../usr/lib/systemd/system/inputplumber-resume.service | 10 ---------- 4 files changed, 13 deletions(-) delete mode 100644 rootfs/usr/lib/systemd/system/inputplumber-resume.service diff --git a/Cargo.toml b/Cargo.toml index 9d5eabf..d306ffa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,6 @@ assets = [ { source = "target/release/inputplumber", dest = "/usr/bin/inputplumber", mode = "755" }, { source = "rootfs/usr/share/dbus-1/system.d/org.shadowblip.InputPlumber.conf", dest = "/usr/share/dbus-1/system.d/org.shadowblip.InputPlumber.conf", mode = "644" }, { source = "rootfs/usr/lib/systemd/system/inputplumber.service", dest = "/usr/lib/systemd/system/inputplumber.service", mode = "644" }, - { source = "rootfs/usr/lib/systemd/system/inputplumber-resume.service", dest = "/usr/lib/systemd/system/inputplumber-resume.service", mode = "644" }, { source = "rootfs/usr/share/inputplumber/devices/*.yaml", dest = "/usr/share/inputplumber/devices/", mode = "644" }, { source = "rootfs/usr/share/inputplumber/schema/*.json", dest = "/usr/share/inputplumber/schema/", mode = "644" }, { source = "rootfs/usr/share/inputplumber/capability_maps/*.yaml", dest = "/usr/share/inputplumber/capability_maps/", mode = "644" }, diff --git a/Makefile b/Makefile index efc3da9..2058034 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,6 @@ uninstall: ## Uninstall inputplumber rm $(PREFIX)/bin/$(NAME) rm $(PREFIX)/share/dbus-1/system.d/$(DBUS_NAME).conf rm $(PREFIX)/lib/systemd/system/$(NAME).service - rm $(PREFIX)/lib/systemd/system/$(NAME)-resume.service rm $(PREFIX)/lib/udev/hwdb.d/59-inputplumber.hwdb rm -rf $(PREFIX)/share/$(NAME)/devices/ rm -rf $(PREFIX)/share/$(NAME)/schema/ diff --git a/pkg/rpm/inputplumber.spec b/pkg/rpm/inputplumber.spec index 58fbd2d..24571f9 100644 --- a/pkg/rpm/inputplumber.spec +++ b/pkg/rpm/inputplumber.spec @@ -61,7 +61,6 @@ systemctl disable inputplumber.servce /usr/bin/inputplumber /usr/share/dbus-1/system.d/org.shadowblip.InputPlumber.conf /usr/lib/systemd/system/inputplumber.service -/usr/lib/systemd/system/inputplumber-resume.service /usr/lib/udev/hwdb.d/59-inputplumber.hwdb /usr/share/inputplumber/capability_maps/ally_type1.yaml /usr/share/inputplumber/capability_maps/anbernic_type1.yaml diff --git a/rootfs/usr/lib/systemd/system/inputplumber-resume.service b/rootfs/usr/lib/systemd/system/inputplumber-resume.service deleted file mode 100644 index 2eb4653..0000000 --- a/rootfs/usr/lib/systemd/system/inputplumber-resume.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Restart InputPlumber after resume -After=suspend.target - -[Service] -Type=simple -ExecStart=/usr/bin/systemctl --no-block restart inputplumber.service - -[Install] -WantedBy=suspend.target