diff options
author | Tom Gundersen <teg@jklm.no> | 2011-05-31 01:11:23 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2011-05-31 01:11:23 +0200 |
commit | 2b188618291d537c0b5da8c3b84902e53436352a (patch) | |
tree | 61511eb3f4a7181abdbbec1672367f93c70b3361 | |
parent | 997f095bf69a4470189e1ccfc345f354899192d8 (diff) |
Revert "udev: generate blacklist on boot"
This reverts commit 99d64f5789f01243903be4b32078ec38bdce75fa.
We decided not to provide a compatibility layer, but rather require
the user to create blacklist files in /etc/modprobe.d manually.
Hence, this is no longer needed.
The reason was that the compatibliy would not be 1-to-1, so it might
be missleading to pretend that it was. Also, most people should not
need the blacklisting in the first place.
Conflicts:
Makefile
Signed-off-by: Tom Gundersen <teg@jklm.no>
-rw-r--r-- | Makefile | 5 | ||||
-rwxr-xr-x | modprobe-blacklist | 25 | ||||
-rw-r--r-- | rc.conf | 2 | ||||
-rwxr-xr-x | rc.sysinit | 3 |
4 files changed, 3 insertions, 32 deletions
@@ -1,5 +1,5 @@ VER := $(shell git describe) -DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /etc/cron.hourly /sbin /etc/modprobe.d /etc/bash_completion.d /usr/share/zsh/site-functions +DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /etc/cron.hourly /sbin /etc/bash_completion.d /usr/share/zsh/site-functions minilogd: minilogd.o @@ -12,8 +12,7 @@ install: minilogd installdirs install -m755 -t $(DESTDIR)/etc/cron.hourly adjtime install -m644 -t $(DESTDIR)/etc/rc.d functions install -m755 -t $(DESTDIR)/etc/rc.d hwclock network netfs - install -m755 -t $(DESTDIR)/sbin minilogd rc.d modprobe-blacklist - ln -s /run/initscripts/modprobe-blacklist.conf $(DESTDIR)/etc/modprobe.d/arch-blacklist.conf + install -m755 -t $(DESTDIR)/sbin minilogd rc.d install -m644 -T bash-completion $(DESTDIR)/etc/bash_completion.d/rc.d install -m644 -T zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_rc.d diff --git a/modprobe-blacklist b/modprobe-blacklist deleted file mode 100755 index 8af5d90..0000000 --- a/modprobe-blacklist +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# /etc/rc.gen-modules-list -# - -. /etc/rc.conf - -declare -a blacklist -for mod in "${MODULES[@]}"; do - case $mod in - !*) blacklist+=("${mod:1}") ;; - *) ;; - esac -done - -# create new module blacklist in /run/initscripts, there should be a symlink in /etc/modprobe.d/ pointing here -if [[ $blacklist ]]; then - /bin/mkdir -p /run/initscripts - echo "# Autogenerated from rc.conf at boot, do not edit" > /run/initscripts/modprobe-blacklist.conf - (( ${#blacklist[@]} )) && printf 'blacklist %s\n' "${blacklist[@]}" >> /run/initscripts/modprobe-blacklist.conf -fi - -unset blacklist - -# vim: set noet ts=2 sw=2: @@ -36,7 +36,7 @@ VERBOSE="3" # MOD_AUTOLOAD: Allow autoloading of modules at boot and when needed # MODULES: Modules to load at boot-up. Prefix with a ! to blacklist. # -MOD_AUTOLOAD="yes" # (DEPRECATED) always leave at "yes" +MOD_AUTOLOAD="yes" MODULES=() # Udev settle timeout (default to 30) @@ -83,9 +83,6 @@ if [[ $HWCLOCK_PARAMS ]]; then fi fi -# parse rc.conf and create the blacklist file for use by modprobe -status "Creating UDev blacklist" /sbin/modprobe-blacklist - status "Starting UDev Daemon" /sbin/udevd --daemon run_hook sysinit_udevlaunched |