From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QBWVD-0005Z7-6w for garchives@archives.gentoo.org; Sun, 17 Apr 2011 18:15:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 544CB1C041; Sun, 17 Apr 2011 18:14:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 253E61C041 for ; Sun, 17 Apr 2011 18:14:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3CF41BC00A for ; Sun, 17 Apr 2011 18:14:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0FCF08006A for ; Sun, 17 Apr 2011 18:14:56 +0000 (UTC) From: "Amadeusz Żołnowski" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amadeusz Żołnowski" Message-ID: Subject: [gentoo-commits] proj/genkernel:dracut commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_dracut.sh X-VCS-Directories: / X-VCS-Committer: aidecoe X-VCS-Committer-Name: Amadeusz Żołnowski X-VCS-Revision: b3d5157aaa14e936335b4b7010eedce1b607a67d Date: Sun, 17 Apr 2011 18:14:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 90c76ae6c842e35e7bab104eac2efa47 commit: b3d5157aaa14e936335b4b7010eedce1b607a67d Author: Amadeusz =C5=BBo=C5=82nowski gentoo org> AuthorDate: Sun Apr 17 18:11:51 2011 +0000 Commit: Amadeusz =C5=BBo=C5=82nowski gentoo org> CommitDate: Sun Apr 17 18:11:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Db3d5157a gen_dracut: Updated to latest changes in Dracut options --- gen_dracut.sh | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gen_dracut.sh b/gen_dracut.sh index 62b431d..acc76af 100755 --- a/gen_dracut.sh +++ b/gen_dracut.sh @@ -2,7 +2,7 @@ # $Id$ =20 BASIC_MODULES=3Ddash\ i18n\ kernel-modules\ resume\ rootfs-block\ termin= fo -BASIC_MODULES+=3D\ udev-rules\ uswsusp\ base +BASIC_MODULES+=3D\ udev-rules\ base MODULES=3Dlvm\ dmraid\ iscsi\ mdraid\ crypt\ multipath\ plymouth\ genspl= ash =20 dracut_modules() { @@ -26,7 +26,7 @@ dracut_modules() { } =20 create_initramfs() { - local tmprd=3D"${TMPDIR}/initramfs-${KV}" opts=3D'-f -v' add_files=3D() + local tmprd=3D"${TMPDIR}/initramfs-${KV}" opts=3D'-f -L=3D3 -M' add_fil= es=3D() =20 print_info 1 'initramfs: >> Initializing Dracut...' =20 @@ -42,7 +42,7 @@ create_initramfs() { if isTrue "${NORAMDISKMODULES}" || isTrue "${BUILD_STATIC}" then print_info 1 ' >> Not copying kernel modules and firmware...= ' - opts+=3D\ --ignore-kernel-modules + opts+=3D\ --no-kernel else isTrue "${FIRMWARE}" && opts+=3D" --fwdir ${FIRMWARE_DIR}" [[ ${FIRMWARE_FILES} ]] && add_files+=3D(${FIRMWARE_FILES}) @@ -54,17 +54,24 @@ create_initramfs() { opts+=3D" ${EXTRA_OPTIONS}" opts+=3D" $(dracut_modules)" =20 - export DRACUT_GENSPLASH_THEME=3D${GENSPLASH_THEME} - export DRACUT_GENSPLASH_RES=3D${GENSPLASH_RES} - print_info 1 " >> DRACUT_GENSPLASH_THEME=3D${GENSPLASH_THEME}= " - print_info 1 " >> DRACUT_GENSPLASH_RES=3D${GENSPLASH_RES}" + if isTrue "${GENSPLASH}" + then + export DRACUT_GENSPLASH_THEME=3D${GENSPLASH_THEME} + export DRACUT_GENSPLASH_RES=3D${GENSPLASH_RES} + print_info 1 " >> DRACUT_GENSPLASH_THEME=3D${GENSPLASH_THEME= }" + print_info 1 " >> DRACUT_GENSPLASH_RES=3D${GENSPLASH_RES}" + fi print_info 1 " >> dracut ${opts} '${tmprd}' '${KV}'" if [[ ${DRACUT_DIR} ]]; then cd "${DRACUT_DIR}" eval ./dracut ${opts} \'${tmprd}\' \'${KV}\' cd - >/dev/null else - eval dracut ${opts} \'${tmprd}\' \'${KV}\' + eval dracut ${opts} \'${tmprd}\' \'${KV}\' | while read module; do + [[ \ $MODULES\ =3D~ \ $module\ ]] && \ + module=3D"${BOLD}${module}${NORMAL}" + print_info 1 " >> Including module: $module" + done fi =20 if isTrue "${INTEGRATED_INITRAMFS}"