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