45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
From b29215773c179d29cbd009fa5dbe608537842eee Mon Sep 17 00:00:00 2001
|
|
From: Chengen Du <chengen.du@canonical.com>
|
|
Date: Mon, 12 Aug 2024 11:41:52 +0800
|
|
Subject: [PATCH] udev: Handle PTP device symlink properly on udev action
|
|
'change'
|
|
|
|
PTP device symlink creation rules are currently executed only when the
|
|
udev action is 'add'. If a user reloads the rules and runs the udevadm
|
|
trigger command to reapply changes, the symlink may be deleted, which
|
|
can prevent the chronyd service from restarting properly.
|
|
|
|
Signed-off-by: Chengen Du <chengen.du@canonical.com>
|
|
(cherry picked from commit 6bd12be3fa7761f190e17efdbdbff4440da7528b)
|
|
|
|
Resolves: RHEL-59088
|
|
---
|
|
rules.d/50-udev-default.rules.in | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
|
|
index ab29f6a17f..3543a0ee0d 100644
|
|
--- a/rules.d/50-udev-default.rules.in
|
|
+++ b/rules.d/50-udev-default.rules.in
|
|
@@ -21,6 +21,9 @@ ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"
|
|
|
|
SUBSYSTEM=="net", IMPORT{builtin}="net_driver"
|
|
|
|
+SUBSYSTEM=="ptp", ATTR{clock_name}=="KVM virtual PTP", SYMLINK+="ptp_kvm"
|
|
+SUBSYSTEM=="ptp", ATTR{clock_name}=="hyperv", SYMLINK+="ptp_hyperv"
|
|
+
|
|
ACTION!="add", GOTO="default_end"
|
|
|
|
SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666"
|
|
@@ -109,10 +112,6 @@ KERNEL=="vhost-net", GROUP="kvm", MODE="{{DEV_KVM_MODE}}", OPTIONS+="static_node
|
|
|
|
KERNEL=="udmabuf", GROUP="kvm"
|
|
|
|
-SUBSYSTEM=="ptp", ATTR{clock_name}=="KVM virtual PTP", SYMLINK += "ptp_kvm"
|
|
-
|
|
-SUBSYSTEM=="ptp", ATTR{clock_name}=="hyperv", SYMLINK += "ptp_hyperv"
|
|
-
|
|
SUBSYSTEM!="dmi", GOTO="dmi_end"
|
|
ENV{ID_SYS_VENDOR_IS_RUBBISH}!="1", ENV{ID_VENDOR}="$attr{sys_vendor}"
|
|
ENV{ID_SYSFS_ATTRIBUTE_MODEL}=="", ENV{ID_PRODUCT_NAME_IS_RUBBISH}!="1", ENV{ID_MODEL}="$attr{product_name}"
|