sysmaster/backport-fix-devmaster-keep-the-same-name-with-udev-control-s.patch

44 lines
1.7 KiB
Diff
Raw Permalink Normal View History

2023-12-07 00:19:38 +08:00
From 9f50a5627a9cfb9b6dba4eeaa524d8986f2408b8 Mon Sep 17 00:00:00 2001
From: chenjiayi <chenjiayi22@huawei.com>
Date: Mon, 30 Oct 2023 20:58:53 +0800
Subject: [PATCH 008/103] fix(devmaster): keep the same name with udev control
socket
The libudev api will check the /run/udev/control socket to indicate
wether udevd is running. Keep the name of control socket same with
udev.
---
exts/devmaster/src/lib/framework/control_manager.rs | 2 +-
exts/devmaster/src/lib/framework/worker_manager.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/exts/devmaster/src/lib/framework/control_manager.rs b/exts/devmaster/src/lib/framework/control_manager.rs
index 38c7c337..75fae984 100644
--- a/exts/devmaster/src/lib/framework/control_manager.rs
+++ b/exts/devmaster/src/lib/framework/control_manager.rs
@@ -27,7 +27,7 @@ use std::{
};
/// listening address for control manager
-pub const CONTROL_MANAGER_LISTEN_ADDR: &str = "/run/devmaster/control.sock";
+pub const CONTROL_MANAGER_LISTEN_ADDR: &str = "/run/devmaster/control";
/// control manager
#[derive(Debug)]
diff --git a/exts/devmaster/src/lib/framework/worker_manager.rs b/exts/devmaster/src/lib/framework/worker_manager.rs
index 55778ddb..c7c1d45f 100644
--- a/exts/devmaster/src/lib/framework/worker_manager.rs
+++ b/exts/devmaster/src/lib/framework/worker_manager.rs
@@ -38,7 +38,7 @@ use std::{
use super::devmaster::Devmaster;
/// worker manager listen address
-pub const WORKER_MANAGER_LISTEN_ADDR: &str = "/run/devmaster/worker.sock";
+pub const WORKER_MANAGER_LISTEN_ADDR: &str = "/run/devmaster/worker";
/// messages sended by manager to workers
pub(crate) enum WorkerMessage {
--
2.33.0