From 6714463bc1ed37eb4fe43b6e9c8159042ee13418 Mon Sep 17 00:00:00 2001 From: luhongxu Date: Fri, 16 Oct 2026 16:02:20 +0800 Subject: [PATCH] fix: use CMAKE_INSTALL_SYSCONFDIR for NM conf path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Replace hardcoded /etc with ${CMAKE_INSTALL_SYSCONFDIR} in install rule 2. Ensure DESTDIR is respected during packaging 3. CMAKE_INSTALL_SYSCONFDIR is provided by GNUInstallDirs already included Influence: 1. Verify package installs conf file under DESTDIR/etc/NetworkManager/conf.d/ 2. Confirm no regression in NetworkManager daemon configuration loading fix: 使用 CMAKE_INSTALL_SYSCONFDIR 替换 NM 配置路径 1. 将 install 规则中硬编码的 /etc 替换为 ${CMAKE_INSTALL_SYSCONFDIR} 2. 确保打包时 DESTDIR 正确生效 3. CMAKE_INSTALL_SYSCONFDIR 已由已包含的 GNUInstallDirs 提供 Influence: 1. 验证打包后配置文件安装到 DESTDIR/etc/NetworkManager/conf.d/ 下 2. 确认 NetworkManager 守护进程配置加载无回归 --- network-service-plugin/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network-service-plugin/CMakeLists.txt b/network-service-plugin/CMakeLists.txt index 65d98565..0689e467 100644 --- a/network-service-plugin/CMakeLists.txt +++ b/network-service-plugin/CMakeLists.txt @@ -77,7 +77,7 @@ else() install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/session/plugin-session-network.json DESTINATION share/deepin-service-manager/user/) endif() -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/system/deepin.dde.daemon.conf DESTINATION /etc/NetworkManager/conf.d/) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/system/deepin.dde.daemon.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/NetworkManager/conf.d/) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/system/org.deepin.dde.Network1.conf DESTINATION share/dbus-1/system.d/) install(FILES ${CMAKE_SOURCE_DIR}/src/misc/polkit-action/com.deepin.dde.network.policy DESTINATION share/polkit-1/actions)