base-files: install blacklist.conf into /usr/lib/modprobe.d instead.

This commit is contained in:
Juan RP 2014-08-25 20:54:01 +02:00
parent 3d91db8a07
commit 94fd3b13b3

View file

@ -1,7 +1,7 @@
# Template file for 'base-files' # Template file for 'base-files'
pkgname=base-files pkgname=base-files
version=0.107 version=0.108
revision=2 revision=1
bootstrap=yes bootstrap=yes
build_style="meta" build_style="meta"
depends="base-directories xbps-triggers" depends="base-directories xbps-triggers"
@ -24,8 +24,7 @@ conf_files="
/etc/group /etc/group
/etc/fstab /etc/fstab
/etc/crypttab /etc/crypttab
/etc/nsswitch.conf /etc/nsswitch.conf"
/etc/modprobe.d/blacklist.conf"
do_install() { do_install() {
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
@ -50,9 +49,8 @@ do_install() {
install -m644 ${FILESDIR}/*.sh ${DESTDIR}/etc/profile.d install -m644 ${FILESDIR}/*.sh ${DESTDIR}/etc/profile.d
install -m644 ${FILESDIR}/DIR_COLORS* ${DESTDIR}/etc install -m644 ${FILESDIR}/DIR_COLORS* ${DESTDIR}/etc
vinstall ${FILESDIR}/usb-load-ehci-first 644 usr/lib/modprobe.d \ vinstall ${FILESDIR}/usb-load-ehci-first 644 usr/lib/modprobe.d usb-load-ehci-first.conf
usb-load-ehci-first.conf vinstall ${FILESDIR}/blacklist.conf 644 usr/lib/modprobe.d
vinstall ${FILESDIR}/blacklist.conf 644 etc/modprobe.d
# Install common licenses, from Debian. # Install common licenses, from Debian.
vmkdir usr/share/licenses vmkdir usr/share/licenses