From be8bf63601b460af4dc22ec5ec1abea1d16bfe60 Mon Sep 17 00:00:00 2001 From: Ye ShanShan Date: Tue, 13 May 2025 15:09:13 +0800 Subject: [PATCH] refactor: migrate from deepin-api-device to deepin-daemon user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Removed sysusers configuration file for deepin-api-device 2. Updated D-Bus policy configuration to use deepin-daemon 3. Changed service files to run under deepin-daemon user 4. Removed sysusers installation from debian/rules 5. This change consolidates service users under deepin-daemon for better system management refactor: 从 deepin-api-device 迁移到 deepin-daemon 用户 1. 移除了 deepin-api-device 的 sysusers 配置文件 2. 更新 D-Bus 策略配置使用 deepin-daemon 3. 修改服务文件以使用 deepin-daemon 用户运行 4. 从 debian/rules 中移除了 sysusers 安装 5. 此变更有助于统一服务用户管理，使用 deepin-daemon 提高系统管理效率 pms: BUG-311157 --- debian/dde-api.sysusers | 10 ---------- debian/rules | 1 - misc/conf/org.deepin.dde.Device1.conf | 2 +- misc/system-services/org.deepin.dde.Device1.service | 2 +- misc/systemd/system/deepin-api-device.service | 2 +- 5 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 debian/dde-api.sysusers diff --git a/debian/dde-api.sysusers b/debian/dde-api.sysusers deleted file mode 100644 index aaffb64..0000000 --- a/debian/dde-api.sysusers +++ /dev/null @@ -1,10 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -#Type Name ID GECOS Home directory Shell -u deepin-api-device - - -m deepin-api-device netdev diff --git a/debian/rules b/debian/rules index a3d2d3b..ad14081 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,6 @@ endif override_dh_auto_install: dh_auto_install - dh_installsysusers dde-api.sysusers override_dh_strip: dh_strip --dbgsym-migration=dde-api-dbg diff --git a/misc/conf/org.deepin.dde.Device1.conf b/misc/conf/org.deepin.dde.Device1.conf index 3dce318..8d3fe0b 100644 --- a/misc/conf/org.deepin.dde.Device1.conf +++ b/misc/conf/org.deepin.dde.Device1.conf @@ -6,7 +6,7 @@ - + diff --git a/misc/system-services/org.deepin.dde.Device1.service b/misc/system-services/org.deepin.dde.Device1.service index d4077e8..e2280d3 100644 --- a/misc/system-services/org.deepin.dde.Device1.service +++ b/misc/system-services/org.deepin.dde.Device1.service @@ -1,5 +1,5 @@ [D-BUS Service] Name=org.deepin.dde.Device1 Exec=/usr/lib/deepin-api/device -User=deepin-api-device +User=deepin-daemon SystemdService=dbus-org.deepin.dde.Device1.service diff --git a/misc/systemd/system/deepin-api-device.service b/misc/systemd/system/deepin-api-device.service index 5179c7f..bfd4d2c 100644 --- a/misc/systemd/system/deepin-api-device.service +++ b/misc/systemd/system/deepin-api-device.service @@ -10,7 +10,7 @@ After=dbus.socket [Service] Type=dbus -User=deepin-api-device +User=deepin-daemon BusName=org.deepin.dde.Device1 ExecStart=/usr/lib/deepin-api/device