From 7db87df525106678587784f93ecf9d838fdde41b Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Thu, 27 Nov 2025 12:41:45 +0000 Subject: [PATCH] [bugfix] add hotplug rules for openanolis add hotplug rules for openanolis fix https://bugzilla.openanolis.cn/show_bug.cgi?id=27449 project: TC2024110201 --- 1004-add-hotplug-rules-for-openanolis.patch | 49 +++++++++++++++++++++ systemd.spec | 7 ++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 1004-add-hotplug-rules-for-openanolis.patch diff --git a/1004-add-hotplug-rules-for-openanolis.patch b/1004-add-hotplug-rules-for-openanolis.patch new file mode 100644 index 0000000..d91d2f8 --- /dev/null +++ b/1004-add-hotplug-rules-for-openanolis.patch @@ -0,0 +1,49 @@ +From c93b989e32bac99984e6c99a774d809735d9bf59 Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Thu, 27 Nov 2025 12:33:17 +0000 +Subject: [PATCH] add hotplug rules for openanolis + +--- + rules.d/40-hotplug.rules | 15 +++++++++++++++ + rules.d/meson.build | 3 ++- + 2 files changed, 17 insertions(+), 1 deletion(-) + create mode 100644 rules.d/40-hotplug.rules + +diff --git a/rules.d/40-hotplug.rules b/rules.d/40-hotplug.rules +new file mode 100644 +index 0000000..611a35a +--- /dev/null ++++ b/rules.d/40-hotplug.rules +@@ -0,0 +1,15 @@ ++# do not edit this file, it will be overwritten on update ++ ++# CPU hotadd request ++SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1" ++ ++# Memory hotadd request ++SUBSYSTEM!="memory", GOTO="memory_hotplug_end" ++ACTION!="add", GOTO="memory_hotplug_end" ++PROGRAM="/bin/uname -p", RESULT=="s390*", GOTO="memory_hotplug_end" ++ ++ENV{.state}="online" ++PROGRAM="/bin/systemd-detect-virt", RESULT=="none", ENV{.state}="online_movable" ++ATTR{state}=="offline", ATTR{state}="$env{.state}" ++ ++LABEL="memory_hotplug_end" +diff --git a/rules.d/meson.build b/rules.d/meson.build +index 3040fae..ea920a3 100644 +--- a/rules.d/meson.build ++++ b/rules.d/meson.build +@@ -5,7 +5,8 @@ install_data( + install_dir : udevrulesdir) + + rules = [ +- [files('60-autosuspend.rules', ++ [files('40-hotplug.rules', ++ '60-autosuspend.rules', + '60-block.rules', + '60-cdrom_id.rules', + '60-dmi-id.rules', +-- +2.47.1 + diff --git a/systemd.spec b/systemd.spec index 409e065..22a411e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,4 +1,4 @@ -%define anolis_release 11 +%define anolis_release 12 %global __requires_exclude pkg-config %global pkgdir %{_prefix}/lib/systemd @@ -71,6 +71,7 @@ Patch0497: 0497-print-backtrack-log-to-var-log-messages.patch Patch1001: Systemd-Add-sw64-architecture.patch Patch1002: 1002-bugfix-for-CVE-2023-50387.patch Patch1003: 1003-rules-automatically-modprobe-sg-driver.patch +Patch1004: 1004-add-hotplug-rules-for-openanolis.patch BuildRequires: gcc gcc-c++ clang coreutils BuildRequires: libcap-devel libmount-devel libfdisk-devel libpwquality-devel @@ -1825,6 +1826,7 @@ fi /usr/lib/udev/rules.d/80-net-setup-link.rules /usr/lib/udev/rules.d/81-net-dhcp.rules /usr/lib/udev/rules.d/80-drivers.rules +/usr/lib/udev/rules.d/40-hotplug.rules %ifnarch riscv64 /usr/lib/udev/rules.d/70-memory.rules %endif @@ -2180,6 +2182,9 @@ fi %doc docs/DISTRO_PORTING.md docs/HACKING.md %changelog +* Wed Nov 26 2025 Wenlong Zhang - 255-12 +- add hotplug rules for openanolis + * Wed Nov 19 2025 Kaiqiang Wang - 255-11 - rules: automatically modprobe sg drive -- Gitee