Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=84404abd947dde98673e49604fcdbec99f2e3cb5
commit 84404abd947dde98673e49604fcdbec99f2e3cb5 Author: Miklos Vajna <vmik...@frugalware.org> Date: Sun Dec 5 10:35:41 2010 +0100 module-init-tools-3.12-3-i686 - replace rc.modules with modules-load.d diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild index 25e5db1..c140db4 100644 --- a/source/base/module-init-tools/FrugalBuild +++ b/source/base/module-init-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=module-init-tools pkgver=3.12 -pkgrel=2 +pkgrel=3 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://kerneltools.org/KernelTools.org"; depends=('glibc>=2.8-3') @@ -14,9 +14,8 @@ backup=('etc/rc.d/rc.modules' 'etc/sysconfig/modules') _F_archive_grepv="pre\|rc" up2date="Flasttar http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/"; source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/$pkgname-$pkgver.tar.bz2 - rc.modules modules binfmt_misc.conf) + modules binfmt_misc.conf) sha1sums=('caf70188c85370936626027ae5b5a9258cc851f9' \ - 'b8178a9fcba9c8209e50cbaa095c1ccc7a71b165' \ '07c76e65af673c8aad478ad78ef2d750b8ea407e' \ '73cef31f3c1f924c3ef1cd112672ffda750266a5') options=('scriptlet') @@ -34,8 +33,9 @@ build() sed -i '/\(^[^#]\)/d' $Fsrcdir/modules fi Ffile /etc/sysconfig/modules + Fmkdir /etc/modules-load.d + Fln ../sysconfig/modules /etc/modules-load.d/sysconfig.conf Ffile /etc/modprobe.d/binfmt_misc.conf - Frcd modules } # optimization ok diff --git a/source/base/module-init-tools/module-init-tools.install b/source/base/module-init-tools/module-init-tools.install index c9c2119..a66070e 100644 --- a/source/base/module-init-tools/module-init-tools.install +++ b/source/base/module-init-tools/module-init-tools.install @@ -1,19 +1,5 @@ -post_install() -{ - cd /etc/rc.d/rcS.d - ln -sf ../rc.modules S13rc.modules -} - post_upgrade() { - if [ -e /etc/rc.d/rcS.d/S20rc.modules ]; then - rm -f /etc/rc.d/rcS.d/S20rc.modules - ln -sf ../rc.modules /etc/rc.d/rcS.d/S13rc.modules - fi -} - -post_remove() -{ rm -f /etc/rc.d/rcS.d/S13rc.modules } diff --git a/source/base/module-init-tools/rc.modules b/source/base/module-init-tools/rc.modules deleted file mode 100644 index c211eab..0000000 --- a/source/base/module-init-tools/rc.modules +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Default-Start: S -### END INIT INFO - -# (c) 2003, 2010 Miklos Vajna <vmik...@frugalware.org> -# (c) Patrick J. Volkerding, <volke...@slackware.com> -# (c) 2005 Mauras Olivier <tuxbubl...@tiscali.fr> -# sysconfig integration -# rc.modules for Frugalware -# distributed under GPL License - -. /etc/rc.d/rc.functions - -MODPROBEBIN=/sbin/modprobe -MODCONFFILE=/etc/sysconfig/modules - -# This file loads extra drivers manually into the Linux kernel. -# The modules will be looked for under /lib/modules/<kernel version number> - -if [ "$1" = "start" ]; then - # update module dependencies - kernelver=`uname -r` - [ -d "/lib/modules/$kernelver" ] || exit 0 - # if /usr is mounted and we have 'find', we can try to take a shortcut: - if [ -x /usr/bin/find -a -e /lib/modules/$kernelver/modules.dep \ - -a /lib/modules/$kernelver/modules.dep \ - -nt /etc/modules.conf ]; then - news="`/usr/bin/find /lib/modules/$kernelver -name '*.ko*' -type f -newer /lib/modules/$kernelver/modules.dep`" - # only rebuild dependencies if new module(s) are found: - if ! [ "" = "$news" ]; then - start "$updatemoddeps" - /sbin/depmod -a - ok $? - else - start "$noupdate" - ok $? - fi - else - # we don't have find, or there is no existing modules.dep, - # or it is out of date. - start "$updatemoddeps" - /sbin/depmod -A - ok $? - fi - - ## Put global modules to load. - ## (eg.: Hardcoded modules that needs to load at startup) - ## At here you can do anything, run any commands, example iptables or any other base - ## commands like in the older rc.modules file. - if grep -q quota /etc/fstab ; then - $MODPROBEBIN quota_v2 - fi - - ## Starting reading conf file and loading modules - if [ -r $MODCONFFILE ]; then - start "$modprobe" - while read module - do - ## Removing bad lines - if [ "$module" != "" -a "$(echo $module | grep -v '#')" ];then - $MODPROBEBIN $module - fi - - done < $MODCONFFILE - - ok $? - else - start "$nomodprobe" - return 1 - ok $? - fi - -fi _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
