summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2005-09-03 18:03:44 +0000
committerChristian Heim <phreak@gentoo.org>2005-09-03 18:03:44 +0000
commit992e76cd763f07dad0e60ba4704cae1283f88dbc (patch)
tree6f1ac55ddd08fffcd403136f7fd5824e702b8425
parentRemove sbin/modules-update, since its completly useless inside a vserver (diff)
downloadbaselayout-vserver-992e76cd763f07dad0e60ba4704cae1283f88dbc.tar.gz
baselayout-vserver-992e76cd763f07dad0e60ba4704cae1283f88dbc.tar.bz2
baselayout-vserver-992e76cd763f07dad0e60ba4704cae1283f88dbc.zip
Removing modules related files, since they are completly useless inside a vserver
svn path=/baselayout-vserver/trunk/; revision=8
-rw-r--r--etc/modules.autoload.d/kernel-2.411
-rw-r--r--etc/modules.autoload.d/kernel-2.610
-rw-r--r--etc/modules.d/aliases46
-rw-r--r--etc/modules.d/i3864
-rwxr-xr-xinit.d/modules122
-rw-r--r--man/modules-update.851
-rw-r--r--man/modules.autoload.519
7 files changed, 0 insertions, 263 deletions
diff --git a/etc/modules.autoload.d/kernel-2.4 b/etc/modules.autoload.d/kernel-2.4
deleted file mode 100644
index a92bec1..0000000
--- a/etc/modules.autoload.d/kernel-2.4
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/modules.autoload.d/kernel-2.4: kernel modules to load when system boots.
-#
-# Note that this file is for 2.4 kernels. If you need different modules
-# for a 2.6 kernel, you can create /etc/modules.autoload.d/kernel-2.6
-#
-# Add the names of modules that you'd like to load when the system
-# starts into this file, one per line. Comments begin with # and
-# are ignored. Read man modules.autoload for additional details.
-
-# For example:
-# 3c59x
diff --git a/etc/modules.autoload.d/kernel-2.6 b/etc/modules.autoload.d/kernel-2.6
deleted file mode 100644
index 6a9efab..0000000
--- a/etc/modules.autoload.d/kernel-2.6
+++ /dev/null
@@ -1,10 +0,0 @@
-# /etc/modules.autoload.d/kernel-2.6: kernel modules to load when system boots.
-#
-# Note that this file is for 2.6 kernels.
-#
-# Add the names of modules that you'd like to load when the system
-# starts into this file, one per line. Comments begin with # and
-# are ignored. Read man modules.autoload for additional details.
-
-# For example:
-# 3c59x
diff --git a/etc/modules.d/aliases b/etc/modules.d/aliases
deleted file mode 100644
index 85ff710..0000000
--- a/etc/modules.d/aliases
+++ /dev/null
@@ -1,46 +0,0 @@
-# Aliases to tell insmod/modprobe which modules to use
-
-# Uncomment the network protocols you don't want loaded:
-# alias net-pf-1 off # Unix
-# alias net-pf-2 off # IPv4
-# alias net-pf-3 off # Amateur Radio AX.25
-# alias net-pf-4 off # IPX
-# alias net-pf-5 off # DDP / appletalk
-# alias net-pf-6 off # Amateur Radio NET/ROM
-# alias net-pf-9 off # X.25
-# alias net-pf-10 off # IPv6
-# alias net-pf-11 off # ROSE / Amateur Radio X.25 PLP
-# alias net-pf-19 off # Acorn Econet
-
-alias char-major-10-175 agpgart
-alias char-major-10-200 tun
-alias char-major-81 bttv
-alias char-major-108 ppp_generic
-alias /dev/ppp ppp_generic
-alias tty-ldisc-3 ppp_async
-alias tty-ldisc-14 ppp_synctty
-alias ppp-compress-21 bsd_comp
-alias ppp-compress-24 ppp_deflate
-alias ppp-compress-26 ppp_deflate
-
-# Crypto modules (see http://www.kerneli.org/)
-alias loop-xfer-gen-0 loop_gen
-alias loop-xfer-3 loop_fish2
-alias loop-xfer-gen-10 loop_gen
-alias cipher-2 des
-alias cipher-3 fish2
-alias cipher-4 blowfish
-alias cipher-6 idea
-alias cipher-7 serp6f
-alias cipher-8 mars6
-alias cipher-11 rc62
-alias cipher-15 dfc2
-alias cipher-16 rijndael
-alias cipher-17 rc5
-
-# Support for i2c and lm_sensors
-alias char-major-89 i2c-dev
-
-# Old nvidia support ...
-alias char-major-195 NVdriver
-alias /dev/nvidiactl char-major-195
diff --git a/etc/modules.d/i386 b/etc/modules.d/i386
deleted file mode 100644
index b89459f..0000000
--- a/etc/modules.d/i386
+++ /dev/null
@@ -1,4 +0,0 @@
-alias parport_lowlevel parport_pc
-alias char-major-10-144 nvram
-alias binfmt-0064 binfmt_aout
-alias char-major-10-135 rtc
diff --git a/init.d/modules b/init.d/modules
deleted file mode 100755
index 38e0f44..0000000
--- a/init.d/modules
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need checkroot hostname
- use isapnp
-}
-
-load_modules() {
- local x=
- local i=0
- local retval=0
- local modules=
- local modargs=
- local modcount=0
- local config="$1"
-
- [[ -z ${config} || ! -r ${config} ]] && return 0
-
- # Loop over every line in $config
- eval $(awk '
- BEGIN {
- COUNT = 0 # Make sure COUNT is set
- }
-
- $0 !~ /(^[[:space:]]*(#|$))/ {
- if (MODULES == "")
- MODULES = $1
- else
- MODULES = MODULES " " $1
-
- # Not the greatest method to remove $1 from $0, but it works
- sub(/^[[:space:]]*[^[:space:]]*[[:space:]]*/, "")
- # Trim trailing comments on the line
- sub(/#.*$/, "")
- ARGS[COUNT] = $0
- COUNT++
- }
-
- END {
- # 'eval' will make sure these are set to proper bash variables
- print "modcount=" COUNT
- print "modules=\"" MODULES "\""
- for (x = 0;x < COUNT;x++)
- print "modargs[" x "]=\"" ARGS[x] "\""
- }
- ' "${config}")
-
- if [[ ${modcount} -gt 0 ]]; then
- einfo "Using ${config} as config:"
-
- for x in ${modules}; do
- ebegin " Loading module ${x}"
- modprobe -q ${x} ${modargs[${i}]} &>/dev/null
- retval=$?
- eend ${retval} " Failed to load ${x}"
-
- i=$((i+1))
- [[ ${retval} -eq 0 ]] || modcount=$((modcount-1))
- done
-
- einfo "Autoloaded ${modcount} module(s)"
- fi
-
- return 0
-}
-
-start() {
- local KV=$(uname -r)
- local KV_MAJOR=$(KV_major "${KV}")
- local KV_MINOR=$(KV_minor "${KV}")
- local KV_MICRO=$(KV_micro "${KV}")
-
- # Should not fail if kernel do not have module
- # support compiled in ...
- [[ -f /proc/modules ]] || return 0
-
- # Make sure depmod from modutils do not whine, but do not bother if
- # we are on a 2.6 kernel without modprobe.old
- if [[ -z "${CDBOOT}" ]] && [[ ! -e /etc/modules.conf ]] && \
- [[ $(get_KV) -lt $(KV_to_int '2.5.48') || -x /sbin/modprobe.old ]]
- then
- echo '### This file is automatically generated by modules-update' \
- > /etc/modules.conf 2>/dev/null
- [[ ! -f /etc/modules.conf ]] && \
- ewarn "Cannot update /etc/modules.conf!"
- fi
-
- # Only do this if we have modules.conf or a 2.6 kernel
- if [[ -z "${CDBOOT}" ]] && \
- [[ -f /etc/modules.conf || $(get_KV) -ge $(KV_to_int '2.5.48') ]]
- then
- /sbin/modules-update
- fi
-
- local autoload=""
- if [[ -f /etc/modules.autoload && ! -L /etc/modules.autoload ]]; then
- autoload=/etc/modules.autoload
- else
- local x
- for x in "${KV}" ${KV_MAJOR}.${KV_MINOR}.${KV_MICRO} ${KV_MAJOR}.${KV_MINOR} ; do
- if [[ -f /etc/modules.autoload.d/kernel-"${x}" ]] ; then
- autoload="/etc/modules.autoload.d/kernel-${x}"
- break
- fi
- done
- fi
- [[ -n ${autoload} ]] && load_modules "${autoload}"
-
- #
- # Just in case a sysadmin prefers generic symbolic links in
- # /lib/modules/boot for boot time modules we will load these modules
- #
- [[ -n $(modprobe -l -t boot) ]] && modprobe -a -t boot \* &>/dev/null
-
- # Above test clobbers the return
- return 0
-}
-
-
-# vim:ts=4
diff --git a/man/modules-update.8 b/man/modules-update.8
deleted file mode 100644
index 84ac7a8..0000000
--- a/man/modules-update.8
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH MODULES-UPDATE 8 "Gentoo Linux" "2001"
-.SH NAME
-modules\-update \- (re)generate /etc/modules.conf
-.SH SYNOPSIS
-.B modules\-update
-[force]
-.SH DESCRIPTION
-.B modules\-update
-is a simple tool to manage
-.IR /etc/modules.conf .
-The Linux module utilities use a single file for all their
-configuration. This makes it difficult for packages to dynamically add
-information about their own modules.
-.PP
-.B modules-update
-makes the dynamic addition of information easier by generating the
-single configuration file from the many files located in
-.IR /etc/modules.d/ .
-All files in that directory are assembled together to form
-.IR /etc/modules.conf .
-.PP
-After generation, a backup of the old file can be found at
-.IR /etc/modules.conf.old .
-.SH "FILES"
-There are two types of file you can put in
-.IR /etc/modules.d/ :
-normal files and exectuable files. Normal files contain standard modules
-configuration information, as described in
-.BR modules.conf (5).
-Executable files are executed and their output is used as extra configuration
-information. Error messages are sent to stderr and thus do not become
-part of the configuration file.
-.SH OPTIONS
-.TP
-.I force
-.B modules\-update
-will check if the current
-.I /etc/modules.conf
-is a generated file by checking for a special tag on the first line. If this
-tag is not found generation is aborted. By supplying
-.I force
-as parameter only a warning is printed.
-.SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
-.SH "SEE ALSO"
-.BR depmod (1),
-.BR modules.conf (5)
-.SH AUTHOR
-This manual page was written by Wichert Akkerman <wakkerma@debian.org>
-for the Debian GNU/Linux system. Modified for
-.I Gentoo Linux.
diff --git a/man/modules.autoload.5 b/man/modules.autoload.5
deleted file mode 100644
index 1a0c3e3..0000000
--- a/man/modules.autoload.5
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH MODULES.AUTOLOAD 5 "Gentoo Linux" "Nov 2001"
-.SH NAME
-\fI/etc/modules.autoload\fR - kernel modules to load at boot time
-.SH DESCRIPTION
-.PP
-The \fI/etc/modules.autoload\fR
-file contains the names of kernel modules that are to be loaded at boot
-time, one per line. Arguments can be given on the same line as the module
-name. Comments begin with a `#', and everything on the line after it is
-ignored. This file is read by the \fI/etc/init.d/modules\fR initscript,
-which is usually linked in the \fI/etc/runlevels/boot\fR directory.
-.SH "SEE ALSO"
-.BR modules-update (8),
-.BR modprobe (8),
-.BR modules.conf (5)
-.TP
-The \fI/sbin/modules-update\fR script.
-.TP
-The files in \fI/etc/modules.d\fR.