dm-mod and dm-crypt will be autoloaded when needed (at least on kernels
newer than 2.6.36).

The rtc modules should be compiled in, as they have been in the official
kernels for some time.

Signed-off-by: Tom Gundersen <[email protected]>
---
 functions  |    2 --
 rc.sysinit |    3 ---
 2 files changed, 5 deletions(-)

diff --git a/functions b/functions
index 129b3d4..f5da93c 100644
--- a/functions
+++ b/functions
@@ -372,9 +372,7 @@ udevd_modprobe() {
 
 activate_vgs() {
        [[ $USELVM = [yY][eE][sS] && -x $(type -P lvm) && -d /sys/block ]] || 
return 0
-       # Kernel 2.6.x, LVM2 groups
        stat_busy "Activating LVM2 groups"
-               modprobe -q dm-mod 2>/dev/null
                vgchange --sysinit -a y >/dev/null
        (( $? == 0 )) && stat_done || stat_fail
 }
diff --git a/rc.sysinit b/rc.sysinit
index ddac829..06b4bda 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -54,8 +54,6 @@ esac
 
 if [[ $HWCLOCK_PARAMS ]]; then
        stat_busy "Adjusting system time and setting kernel timezone"
-               # enable rtc access
-               modprobe -q -a rtc-cmos rtc genrtc
 
                # Adjust the system time for timezone offset if rtc is not in 
UTC
                # 1. Make creation time on device nodes sane (FS#8665)
@@ -91,7 +89,6 @@ activate_vgs
 # Set up non-root encrypted partition mappings
 if [[ -f /etc/crypttab ]] && type -p cryptsetup >/dev/null; then
        stat_busy "Unlocking encrypted volumes:"
-               modprobe -q dm-crypt 2>/dev/null
                do_unlock() {
                        # $1 = requested name
                        # $2 = source device
-- 
1.7.9.4

Reply via email to