From 3e4d870b21b6a85853ad984956a8177f447fa00c Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 23 Nov 2011 21:16:49 +0000 Subject: move back ldetect-lst-modules.alias in /lib/module-init-tools/, it needs to be parsed in its own group, so that modprobe.d/*.conf files are preferred over it --- Makefile.config | 1 - NEWS | 4 ++++ lst/Makefile | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.config b/Makefile.config index 8a92239f..682dbdb7 100644 --- a/Makefile.config +++ b/Makefile.config @@ -4,4 +4,3 @@ datadir = $(prefix)/share bindir = $(prefix)/bin sbindir = $(prefix)/sbin dir = $(datadir)/$(project) -sysconfdir = $(prefix)/etc/ diff --git a/NEWS b/NEWS index 7af83841..84e7da7e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +- move back ldetect-lst-modules.alias in /lib/module-init-tools/, + it needs to be parsed in its own group, so that modprobe.d/*.conf + files are preferred over it + Version 0.1.293 - 21 November 2011 - add support for virtual gfx card diff --git a/lst/Makefile b/lst/Makefile index eb57db18..8b061684 100644 --- a/lst/Makefile +++ b/lst/Makefile @@ -71,7 +71,7 @@ install: $(TMP_TABLES) $(TABLES3) perl -pi -e 's!^Generic CRT Display; Monitor !Generic; !; s!Generic LCD Display; LCD Panel !Generic; Flat Panel !' $(dir)/MonitorsDB install -m 644 fallback-modules.alias $(dir)/fallback-modules.alias - install -D -m 644 preferred-modules.alias $(sysconfdir)/modprobe.d/0_ldetect-lst-modules.alias + install -D -m 644 preferred-modules.alias $(slibdir)/module-init-tools/ldetect-lst-modules.alias install -D -m 644 oui.txt usb.ids pci.ids $(prefix)/share mkdir -p $(prefix)/share/misc install -D -m 644 pnp.ids $(prefix)/share/misc -- cgit v1.2.1