[gentoo-commits] proj/genkernel:ryao commit in: /, defaults/

["Richard Yao" <ryao@gentoo.org>]

commit:     ddf2c5b934da598d33f4db0457cc8806f86bba2d
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 23:40:28 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 23:49:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ddf2c5b9

Fix /etc/modprobe.d regression

Commit 3a054014e880e5b1ff28e3d87767c45a073da6b5 replaced our modprobe
with busybox's modprobe, which broke the code responsible for making
options from /etc/modprobe.d work. We replace the old mechanism with a
new one that copies /etc/modprobe.d to correct that.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/linuxrc |  7 -------
 gen_initramfs.sh | 20 ++------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4bbe5e2..9ea305b 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -262,13 +262,6 @@ do
 		nounionfs)
 			USE_UNIONFS_NORMAL=0
 			;;
-		*=*)
-			case "${x%%=*}" in
-			*.*)
-				echo "${x#*.}" >> "/etc/module_options/${x%%.*}.conf"
-			;;
-			esac
-		;;
 	esac
 done
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 784c0cc..427ffad 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -625,24 +625,8 @@ append_modprobed() {
 		rm -r "${TDIR}"
 	fi
 
-	mkdir -p "${TDIR}/etc/module_options/"
-
-	# Load module parameters
-	for dir in $(find "${MODPROBEDIR}"/*)
-	do
-		while read x
-		do
-			case "${x}" in
-				options*)
-					module_name="$(echo "$x" | cut -d ' ' -f 2)"
-					[ "${module_name}" != "$(echo)" ] || continue
-					module_options="$(echo "$x" | cut -d ' ' -f 3-)"
-					[ "${module_options}" != "$(echo)" ] || continue
-					echo "${module_options}" >> "${TDIR}/etc/module_options/${module_name}.conf"
-				;;
-			esac
-		done < "${dir}"
-	done
+	mkdir -p "${TDIR}/etc"
+	cp -r "/etc/modprobe.d" "${TDIR}/etc/modprobe.d"
 
 	cd "${TDIR}"
 	log_future_cpio_content