]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
modprobe.d: fix directory of modprobe configuration file (#7149)
authorMichael Biebl <mbiebl@gmail.com>
Sat, 21 Oct 2017 06:32:50 +0000 (08:32 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 21 Oct 2017 06:32:50 +0000 (08:32 +0200)
kmod upstream uses /lib/modprobe.d which means we need to use rootprefix
instead of prefix for installing the modprobe configuration file as
otherwise split-usr systems are broken.

See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879191

meson.build

index f7a610af3ba870836530378d968084606700f3af..e394ee5eee5466edd68b90a55a307a5b15841416 100644 (file)
@@ -83,7 +83,7 @@ polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor
 varlogdir = join_paths(localstatedir, 'log')
 xinitrcdir = join_paths(sysconfdir, 'X11/xinit/xinitrc.d')
 rpmmacrosdir = get_option('rpmmacrosdir')
-modprobedir = join_paths(prefixdir, 'lib/modprobe.d')
+modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d')
 
 # Our own paths
 pkgdatadir = join_paths(datadir, 'systemd')