| Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 1 | From 5d5ba8a2b8010db6bee68bd712f829cb737c9ac1 Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 2 | From: Lei Maohui <leimaohui@fujitsu.com> |
| 3 | Date: Fri, 10 Mar 2023 03:48:46 +0000 |
| 4 | Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib. |
| 5 | |
| 6 | Error: Transaction test error: |
| 7 | file /usr/share/man/man8/dhcpcd.8 conflicts between attempted |
| 8 | installs of dhcpcd-doc-9.4.1-r0.cortexa57 and |
| 9 | lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon |
| 10 | |
| 11 | The differences between the two files are as follows: |
| 12 | @@ -821,7 +821,7 @@ |
| 13 | If you always use the same options, put them here. |
| 14 | .It Pa /usr/libexec/dhcpcd-run-hooks |
| 15 | Bourne shell script that is run to configure or de-configure an interface. |
| 16 | -.It Pa /usr/lib64/dhcpcd/dev |
| 17 | +.It Pa /usr/lib/dhcpcd/dev |
| 18 | Linux |
| 19 | .Pa /dev |
| 20 | management modules. |
| 21 | |
| 22 | It is just a man file, there is no necessary to manage multiple |
| 23 | versions. |
| 24 | |
| 25 | Upstream-Status: Inappropriate [oe specific] |
| 26 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> |
| Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 27 | |
| Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 28 | --- |
| 29 | src/dhcpcd.8.in | 2 +- |
| 30 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 31 | |
| 32 | diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in |
| Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 33 | index 93232840..09930a31 100644 |
| Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 34 | --- a/src/dhcpcd.8.in |
| 35 | +++ b/src/dhcpcd.8.in |
| Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 36 | @@ -824,7 +824,7 @@ Configuration file for dhcpcd. |
| Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 37 | If you always use the same options, put them here. |
| 38 | .It Pa @SCRIPT@ |
| 39 | Bourne shell script that is run to configure or de-configure an interface. |
| 40 | -.It Pa @LIBDIR@/dhcpcd/dev |
| 41 | +.It Pa /usr/<libdir>/dhcpcd/dev |
| 42 | Linux |
| 43 | .Pa /dev |
| 44 | management modules. |