| 1 |
commit: 4a1fe88b46fa1e42b7023bdbb3cc326df6a2efea |
| 2 |
Author: Richard Yao <ryao <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 3 23:40:28 2013 +0000 |
| 4 |
Commit: Richard Yao <ryao <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 3 23:46:09 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4a1fe88b |
| 7 |
|
| 8 |
Fix /etc/modprobe.d regression |
| 9 |
|
| 10 |
Commit 3a054014e880e5b1ff28e3d87767c45a073da6b5 replaced our modprobe |
| 11 |
with busybox's modprobe, which broke the code responsible for making |
| 12 |
options from /etc/modprobe.d work. We replace the old mechanism with a |
| 13 |
new one that copies /etc/modprobe.d to correct that. |
| 14 |
|
| 15 |
Signed-off-by: Richard Yao <ryao <AT> gentoo.org> |
| 16 |
|
| 17 |
--- |
| 18 |
defaults/linuxrc | 7 ------- |
| 19 |
gen_initramfs.sh | 20 ++------------------ |
| 20 |
2 files changed, 2 insertions(+), 25 deletions(-) |
| 21 |
|
| 22 |
diff --git a/defaults/linuxrc b/defaults/linuxrc |
| 23 |
index 4bbe5e2..9ea305b 100644 |
| 24 |
--- a/defaults/linuxrc |
| 25 |
+++ b/defaults/linuxrc |
| 26 |
@@ -262,13 +262,6 @@ do |
| 27 |
nounionfs) |
| 28 |
USE_UNIONFS_NORMAL=0 |
| 29 |
;; |
| 30 |
- *=*) |
| 31 |
- case "${x%%=*}" in |
| 32 |
- *.*) |
| 33 |
- echo "${x#*.}" >> "/etc/module_options/${x%%.*}.conf" |
| 34 |
- ;; |
| 35 |
- esac |
| 36 |
- ;; |
| 37 |
esac |
| 38 |
done |
| 39 |
|
| 40 |
|
| 41 |
diff --git a/gen_initramfs.sh b/gen_initramfs.sh |
| 42 |
index 784c0cc..427ffad 100755 |
| 43 |
--- a/gen_initramfs.sh |
| 44 |
+++ b/gen_initramfs.sh |
| 45 |
@@ -625,24 +625,8 @@ append_modprobed() { |
| 46 |
rm -r "${TDIR}" |
| 47 |
fi |
| 48 |
|
| 49 |
- mkdir -p "${TDIR}/etc/module_options/" |
| 50 |
- |
| 51 |
- # Load module parameters |
| 52 |
- for dir in $(find "${MODPROBEDIR}"/*) |
| 53 |
- do |
| 54 |
- while read x |
| 55 |
- do |
| 56 |
- case "${x}" in |
| 57 |
- options*) |
| 58 |
- module_name="$(echo "$x" | cut -d ' ' -f 2)" |
| 59 |
- [ "${module_name}" != "$(echo)" ] || continue |
| 60 |
- module_options="$(echo "$x" | cut -d ' ' -f 3-)" |
| 61 |
- [ "${module_options}" != "$(echo)" ] || continue |
| 62 |
- echo "${module_options}" >> "${TDIR}/etc/module_options/${module_name}.conf" |
| 63 |
- ;; |
| 64 |
- esac |
| 65 |
- done < "${dir}" |
| 66 |
- done |
| 67 |
+ mkdir -p "${TDIR}/etc" |
| 68 |
+ cp -r "/etc/modprobe.d" "${TDIR}/etc/modprobe.d" |
| 69 |
|
| 70 |
cd "${TDIR}" |
| 71 |
log_future_cpio_content |
Archives