From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 08B941381F3 for ; Mon, 3 Jun 2013 23:49:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75351E086E; Mon, 3 Jun 2013 23:49:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E939AE086E for ; Mon, 3 Jun 2013 23:49:51 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E231033DF46 for ; Mon, 3 Jun 2013 23:49:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9428AE545C for ; Mon, 3 Jun 2013 23:49:49 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1370303345.ddf2c5b934da598d33f4db0457cc8806f86bba2d.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/linuxrc gen_initramfs.sh X-VCS-Directories: / defaults/ X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: ddf2c5b934da598d33f4db0457cc8806f86bba2d X-VCS-Branch: master Date: Mon, 3 Jun 2013 23:49:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 64e99ed7-9007-4246-937a-d5ec3b37537e X-Archives-Hash: e4f6adc476e2d313e745da4e8e54d2e6 Message-ID: <20130603234949.coFPwUEa-uMao5CMQAP_aKwohfdKDuo0d90HYj-8wnY@z> commit: ddf2c5b934da598d33f4db0457cc8806f86bba2d Author: Richard Yao gentoo org> AuthorDate: Mon Jun 3 23:40:28 2013 +0000 Commit: Richard Yao gentoo 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 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