picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

test: check /usr/lib and /lib for systemd binaries

Browse source 
Fedora uses /usr/lib while Debian uses /lib; find the right location
This commit is contained in:
Dan Streetman 2019-10-31 06:44:20 -04:00
parent 856423f14d
commit 7471bcb06e
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/test-network/systemd-networkd-tests.py
View file

@ -22,12 +22,16 @@ network_sysctl_ipv4_path='/proc/sys/net/ipv4/conf'
dnsmasq_pid_file='/run/networkd-ci/test-test-dnsmasq.pid' dnsmasq_pid_file='/run/networkd-ci/test-test-dnsmasq.pid'
dnsmasq_log_file='/run/networkd-ci/test-dnsmasq-log-file' dnsmasq_log_file='/run/networkd-ci/test-dnsmasq-log-file'
networkd_bin='/usr/lib/systemd/systemd-networkd' systemd_lib_paths=['/usr/lib/systemd', '/lib/systemd']
resolved_bin='/usr/lib/systemd/systemd-resolved' which_paths=':'.join(systemd_lib_paths + os.getenv('PATH', os.defpath).lstrip(':').split(':'))
wait_online_bin='/usr/lib/systemd/systemd-networkd-wait-online'
networkctl_bin='/usr/bin/networkctl' networkd_bin=shutil.which('systemd-networkd', path=which_paths)
resolvectl_bin='/usr/bin/resolvectl' resolved_bin=shutil.which('systemd-resolved', path=which_paths)
timedatectl_bin='/usr/bin/timedatectl' wait_online_bin=shutil.which('systemd-networkd-wait-online', path=which_paths)
networkctl_bin=shutil.which('networkctl', path=which_paths)
resolvectl_bin=shutil.which('resolvectl', path=which_paths)
timedatectl_bin=shutil.which('timedatectl', path=which_paths)
use_valgrind=False use_valgrind=False
enable_debug=True enable_debug=True
env = {} env = {}