colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build/meson: fix missing slash when detecting resolvconf/netconfig binaries

Browse Source 
Fix detection for /usr/local/sbin/{resolvconf,netconfig}.
(and no longer automatically use "/usr/local/sbinnetconfig" if present)

Fixes: 5a0cef2f36 ('build: meson: uniform handling of rc managers')

[thaller@redhat.com: commit message adjusted]

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/349
This commit is contained in:
Will Dietz
2020-01-28 08:19:53 -06:00
committed by Thomas Haller
parent 89c8a47047
commit 2b17f246f0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@@ -621,7 +621,7 @@ foreach prog_name : ['resolvconf', 'netconfig']
prog = find_program(prog_name,
'/usr/' + prog_name,
'/usr/sbin/' + prog_name,
'/usr/local/sbin' + prog_name,
'/usr/local/sbin/' + prog_name,
required : false)
if prog.found()
prog_path = prog.path()