| 1 |
Author: agaffney |
| 2 |
Date: 2008-05-09 22:15:46 +0000 (Fri, 09 May 2008) |
| 3 |
New Revision: 675 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/generic/initrd.defaults |
| 8 |
trunk/generic/initrd.scripts |
| 9 |
trunk/generic/linuxrc |
| 10 |
Log: |
| 11 |
Add nomodules kernel commandline parameter to disable loading of modules |
| 12 |
|
| 13 |
Modified: trunk/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- trunk/ChangeLog 2008-05-09 16:13:09 UTC (rev 674) |
| 16 |
+++ trunk/ChangeLog 2008-05-09 22:15:46 UTC (rev 675) |
| 17 |
@@ -2,6 +2,10 @@ |
| 18 |
# Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 19 |
# $Header: $ |
| 20 |
|
| 21 |
+ 09 May 2008; Andrew Gaffney <agaffney@g.o> generic/initrd.defaults, |
| 22 |
+ generic/initrd.scripts, generic/linuxrc: |
| 23 |
+ Add nomodules kernel commandline parameter to disable loading of modules |
| 24 |
+ |
| 25 |
09 May 2008; Andrew Gaffney <agaffney@g.o> gen_funcs.sh, genkernel, |
| 26 |
genkernel.conf: |
| 27 |
Move distfile cache to /var/cache/genkernel/src and add check to make sure |
| 28 |
|
| 29 |
Modified: trunk/generic/initrd.defaults |
| 30 |
=================================================================== |
| 31 |
--- trunk/generic/initrd.defaults 2008-05-09 16:13:09 UTC (rev 674) |
| 32 |
+++ trunk/generic/initrd.defaults 2008-05-09 22:15:46 UTC (rev 675) |
| 33 |
@@ -77,5 +77,5 @@ |
| 34 |
|
| 35 |
# Only sections that are in by default or those that |
| 36 |
# are not module groups need to be defined here... |
| 37 |
-HWOPTS='keymap cache pata sata scsi usb firewire slowusb evms lvm dmraid mdadm fs net' |
| 38 |
-MY_HWOPTS='pata sata scsi usb firewire dmraid mdadm fs net' |
| 39 |
+HWOPTS='keymap cache modules pata sata scsi usb firewire slowusb evms lvm dmraid mdadm fs net' |
| 40 |
+MY_HWOPTS='modules pata sata scsi usb firewire dmraid mdadm fs net' |
| 41 |
|
| 42 |
Modified: trunk/generic/initrd.scripts |
| 43 |
=================================================================== |
| 44 |
--- trunk/generic/initrd.scripts 2008-05-09 16:13:09 UTC (rev 674) |
| 45 |
+++ trunk/generic/initrd.scripts 2008-05-09 22:15:46 UTC (rev 675) |
| 46 |
@@ -448,13 +448,11 @@ |
| 47 |
do |
| 48 |
if [ "${y}" = "${x}" ] |
| 49 |
then |
| 50 |
- FOUND=1 |
| 51 |
+ continue 2 |
| 52 |
fi |
| 53 |
done |
| 54 |
- if [ ! "${FOUND}" = '1' ] |
| 55 |
- then |
| 56 |
- TMP_HWOPTS="${TMP_HWOPTS} ${x}" |
| 57 |
- fi |
| 58 |
+ TMP_HWOPTS="${TMP_HWOPTS} ${x}" |
| 59 |
+ eval DO_`echo ${x} | sed 's/-//'`=1 |
| 60 |
done |
| 61 |
|
| 62 |
MY_HWOPTS=${TMP_HWOPTS} |
| 63 |
@@ -470,7 +468,6 @@ |
| 64 |
for modules in $MY_HWOPTS |
| 65 |
do |
| 66 |
modules_scan $modules |
| 67 |
- eval DO_`echo $modules | sed 's/-//'`=1 |
| 68 |
done |
| 69 |
else |
| 70 |
good_msg 'Skipping module load; no modules in the initrd!' |
| 71 |
|
| 72 |
Modified: trunk/generic/linuxrc |
| 73 |
=================================================================== |
| 74 |
--- trunk/generic/linuxrc 2008-05-09 16:13:09 UTC (rev 674) |
| 75 |
+++ trunk/generic/linuxrc 2008-05-09 22:15:46 UTC (rev 675) |
| 76 |
@@ -203,8 +203,11 @@ |
| 77 |
setup_hotplug |
| 78 |
|
| 79 |
# Load modules listed in MY_HWOPTS if /lib/modules exists for the running kernel |
| 80 |
-if [ -d "/lib/modules/${KV}" ] |
| 81 |
+if [ -z "${DO_modules}" ] |
| 82 |
then |
| 83 |
+ good_msg 'Skipping module load; disabled via commandline' |
| 84 |
+elif [ -d "/lib/modules/${KV}" ] |
| 85 |
+then |
| 86 |
good_msg 'Loading modules' |
| 87 |
# Load appropriate kernel modules |
| 88 |
if [ "${NODETECT}" != '1' ] |
| 89 |
@@ -212,16 +215,11 @@ |
| 90 |
for modules in ${MY_HWOPTS} |
| 91 |
do |
| 92 |
modules_scan ${modules} |
| 93 |
- eval DO_`echo ${modules} | sed 's/-//'`=1 |
| 94 |
done |
| 95 |
fi |
| 96 |
# Always eval doload=... |
| 97 |
modules_load ${MDOLIST} |
| 98 |
else |
| 99 |
- for modules in ${MY_HWOPTS} |
| 100 |
- do |
| 101 |
- eval DO_`echo ${modules} | sed 's/-//'`=1 |
| 102 |
- done |
| 103 |
good_msg 'Skipping module load; no modules in the initrd!' |
| 104 |
fi |
| 105 |
|
| 106 |
|
| 107 |
-- |
| 108 |
gentoo-commits@l.g.o mailing list |
Archives