1 Star 0 Fork 91

xuxinyu / systemd

forked from src-openEuler / systemd 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
backport-login-respect-install_sysconfdir_samples-in-meson-fi.patch 1.35 KB
一键复制 编辑 原始数据 按行查看 历史
From 426cd32268f6068b843bc24d54b3f969034ab998 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 26 Jul 2021 17:20:34 +0200
Subject: [PATCH] login: respect install_sysconfdir_samples in meson file
The refactoring done in c900d89faa0 caused the configuration files to be
installed into the pkgsysconfdir regardless of the state of the
install_sysconfdir_samples boolean that indicates whether or not the
sample files should be installed.
(cherry picked from commit 72964d047a7a8f79ae12ab41168feb0080eef6c3)
Conflict:NA
Reference:https://github.com/systemd/systemd/commit/426cd32268f6068b843bc24d54b3f969034ab998
---
src/login/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/meson.build b/src/login/meson.build
index 8c20e6be65..b637adc9a2 100644
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -67,7 +67,7 @@ pam_systemd_c = files('pam_systemd.c')
enable_logind = conf.get('ENABLE_LOGIND') == 1
in_files = [
- ['logind.conf', pkgsysconfdir, enable_logind],
+ ['logind.conf', pkgsysconfdir, enable_logind and install_sysconfdir_samples],
['70-uaccess.rules', udevrulesdir, enable_logind and conf.get('HAVE_ACL') == 1],
['71-seat.rules', udevrulesdir, enable_logind],
['73-seat-late.rules', udevrulesdir, enable_logind],
--
2.33.0
1
https://gitee.com/xuiny/systemd.git
git@gitee.com:xuiny/systemd.git
xuiny
systemd
systemd
master

搜索帮助