Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dde23034343d2a0796449a78ef7a690a86766de7
commit dde23034343d2a0796449a78ef7a690a86766de7 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Wed Dec 19 13:50:04 2007 +0100 module-init-tools-3.4-2-i686 - added patch to prefer modprobe.d over modprobe.conf. this change should not be problematic as we did not use those dirs/files so far - rc.modules now handles module parameters again. closes #2626 diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild index 70c153b..f5d3547 100644 --- a/source/base/module-init-tools/FrugalBuild +++ b/source/base/module-init-tools/FrugalBuild @@ -1,10 +1,9 @@ # Compiling Time: 0.01 SBU # Maintainer: VMiklos <[EMAIL PROTECTED]> -# Modified by Adam Zlehovszky <[EMAIL PROTECTED]> pkgname=module-init-tools pkgver=3.4 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://kerneltools.org/KernelTools.org"; depends=('glibc') @@ -13,16 +12,21 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') backup=('etc/rc.d/rc.modules' 'etc/sysconfig/modules') up2date="lynx -dump http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/|Flasttarbz2" -source=(http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/$pkgname-$pkgver.tar.bz2 rc.modules modules) +source=(http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/$pkgname-$pkgver.tar.bz2 rc.modules modules \ + prefer-modprobe.d.patch) sha1sums=('fcdf758d171211b72210d48b7303ccb5651a1850' \ - '4eea32f43b0adafc380ee88d70dc8f03a0b4b062' \ - '4c840e22304f1b152be871b7b4eb99c0cecf482f') + '8cbe625456dffe92b6ea3207a3a09eca2a7c4ad7' \ + '4c840e22304f1b152be871b7b4eb99c0cecf482f' \ + '4adb4039cc9d2dc1339dd35058094a8fc90a5da2') options=('scriptlet') build() { Fsed '2>&1' '' Makefile* - Fbuild --exec-prefix=/ --enable-zlib + Fpatchall + Fautoreconf + Fmake --exec-prefix=/ --enable-zlib + Fmakeinstall Fmv /bin/lsmod /sbin/ Ffile /etc/sysconfig/modules Frcd modules diff --git a/source/base/module-init-tools/prefer-modprobe.d.patch b/source/base/module-init-tools/prefer-modprobe.d.patch new file mode 100644 index 0000000..4fbfa49 --- /dev/null +++ b/source/base/module-init-tools/prefer-modprobe.d.patch @@ -0,0 +1,23 @@ +diff -Naur module-init-tools-3.4/Makefile.am module-init-tools-3.4-p/Makefile.am +--- module-init-tools-3.4/Makefile.am 2007-10-07 23:51:46.000000000 +0200 ++++ module-init-tools-3.4-p/Makefile.am 2007-12-19 13:31:01.000000000 +0100 +@@ -31,7 +31,7 @@ + + sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static + bin_PROGRAMS = lsmod +-sbin_SCRIPTS = generate-modprobe.conf ++#sbin_SCRIPTS = generate-modprobe.conf + INSTALL = $(SHELL) $(top_srcdir)/install-with-care + + TESTS = tests/runtests +diff -Naur module-init-tools-3.4/modprobe.c module-init-tools-3.4-p/modprobe.c +--- module-init-tools-3.4/modprobe.c 2007-10-07 23:57:23.000000000 +0200 ++++ module-init-tools-3.4-p/modprobe.c 2007-12-19 13:29:38.000000000 +0100 +@@ -1226,7 +1226,6 @@ + + static const char *default_configs[] = + { +- "/etc/modprobe.conf", + "/etc/modprobe.d", + }; + diff --git a/source/base/module-init-tools/rc.modules b/source/base/module-init-tools/rc.modules index 7d1f783..c3bdc9a 100644 --- a/source/base/module-init-tools/rc.modules +++ b/source/base/module-init-tools/rc.modules @@ -52,17 +52,11 @@ if [ "$1" = "start" ]; then ## Starting reading conf file and loading modules if [ -r $MODCONFFILE ]; then start "$modprobe" - Firstcount=$(wc -l < "$MODCONFFILE") - ## Fix line count - NUM=$(expr $Firstcount + 1) - - for module in $(seq $NUM) + while read module do - read module - ## Removing bad lines if [ "$module" != "" -a "$(echo $module | grep -v '#')" ];then - $MODPROBEBIN $module + echo $MODPROBEBIN $module fi done < $MODCONFFILE _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
