From: "Richard Yao" <ryao@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/genkernel:ryao commit in: /, defaults/ Date: Thu, 6 Jun 2013 03:36:24 +0000 (UTC) [thread overview] Message-ID: <1370303345.ddf2c5b934da598d33f4db0457cc8806f86bba2d.ryao@gentoo> (raw) 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
WARNING: multiple messages have this Message-ID (diff)
From: "Richard Yao" <ryao@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ Date: Mon, 3 Jun 2013 23:49:49 +0000 (UTC) [thread overview] Message-ID: <1370303345.ddf2c5b934da598d33f4db0457cc8806f86bba2d.ryao@gentoo> (raw) Message-ID: <20130603234949.coFPwUEa-uMao5CMQAP_aKwohfdKDuo0d90HYj-8wnY@z> (raw) 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
next reply other threads:[~2013-06-06 3:36 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-06-06 3:36 Richard Yao [this message] 2013-06-03 23:49 ` [gentoo-commits] proj/genkernel:master commit in: /, defaults/ Richard Yao -- strict thread matches above, loose matches on Subject: below -- 2013-06-09 6:43 [gentoo-commits] proj/genkernel:ryao " Richard Yao 2013-06-03 23:49 Richard Yao 2013-06-03 23:47 Richard Yao 2013-06-03 23:43 Richard Yao 2013-06-03 23:35 Richard Yao 2012-11-05 18:30 Richard Yao
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1370303345.ddf2c5b934da598d33f4db0457cc8806f86bba2d.ryao@gentoo \ --to=ryao@gentoo.org \ --cc=gentoo-commits@lists.gentoo.org \ --cc=gentoo-dev@lists.gentoo.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox