1*4882a593SmuzhiyunFrom 6e835350b7413210c410d3578cfab804186b7a4f Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Kai Kang <kai.kang@windriver.com> 3*4882a593SmuzhiyunDate: Tue, 17 Nov 2020 11:13:40 +0800 4*4882a593SmuzhiyunSubject: [PATCH] sudo.conf.in: fix conflict with multilib 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunWhen pass ${libdir} to --libexecdir of sudo, it fails to install sudo 7*4882a593Smuzhiyunand lib32-sudo at same time: 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun| Error: Transaction test error: 10*4882a593Smuzhiyun| file /etc/sudo.conf conflicts between attempted installs of 11*4882a593Smuzhiyun sudo-1.9.3p1-r0.core2_64 and lib32-sudo-1.9.3p1-r0.core2_32 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunUpdate the comments in sudo.conf.in to avoid the conflict. 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Kai Kang <kai.kang@windriver.com> 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunUpstream-Status: Inappropriate [OE configuration specific] 18*4882a593Smuzhiyun 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun examples/sudo.conf.in | 8 ++++---- 21*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 4 deletions(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/examples/sudo.conf.in b/examples/sudo.conf.in 24*4882a593Smuzhiyunindex 2187457..0908d24 100644 25*4882a593Smuzhiyun--- a/examples/sudo.conf.in 26*4882a593Smuzhiyun+++ b/examples/sudo.conf.in 27*4882a593Smuzhiyun@@ -4,7 +4,7 @@ 28*4882a593Smuzhiyun # Sudo plugins: 29*4882a593Smuzhiyun # Plugin plugin_name plugin_path plugin_options ... 30*4882a593Smuzhiyun # 31*4882a593Smuzhiyun-# The plugin_path is relative to @plugindir@ unless 32*4882a593Smuzhiyun+# The plugin_path is relative to $plugindir such as /usr/lib/sudo unless 33*4882a593Smuzhiyun # fully qualified. 34*4882a593Smuzhiyun # The plugin_name corresponds to a global symbol in the plugin 35*4882a593Smuzhiyun # that contains the plugin interface structure. 36*4882a593Smuzhiyun@@ -51,7 +51,7 @@ 37*4882a593Smuzhiyun # The compiled-in value is usually sufficient and should only be changed 38*4882a593Smuzhiyun # if you rename or move the sudo_intercept.so file. 39*4882a593Smuzhiyun # 40*4882a593Smuzhiyun-#Path intercept @intercept_file@ 41*4882a593Smuzhiyun+#Path intercept $intercept_file 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun # 44*4882a593Smuzhiyun # Sudo noexec: 45*4882a593Smuzhiyun@@ -65,7 +65,7 @@ 46*4882a593Smuzhiyun # The compiled-in value is usually sufficient and should only be changed 47*4882a593Smuzhiyun # if you rename or move the sudo_noexec.so file. 48*4882a593Smuzhiyun # 49*4882a593Smuzhiyun-#Path noexec @noexec_file@ 50*4882a593Smuzhiyun+#Path noexec $noexec_file 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun # 53*4882a593Smuzhiyun # Sudo plugin directory: 54*4882a593Smuzhiyun@@ -74,7 +74,7 @@ 55*4882a593Smuzhiyun # The default directory to use when searching for plugins that are 56*4882a593Smuzhiyun # specified without a fully qualified path name. 57*4882a593Smuzhiyun # 58*4882a593Smuzhiyun-#Path plugin_dir @plugindir@ 59*4882a593Smuzhiyun+#Path plugin_dir $plugindir 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun # 62*4882a593Smuzhiyun # Core dumps: 63