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 1QBWUy-0005Vn-5H for garchives@archives.gentoo.org; Sun, 17 Apr 2011 18:15:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A64B1C044; 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 EB4391C041 for ; Sun, 17 Apr 2011 18:14:56 +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 574CB1B4092 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 8539280074 for ; Sun, 17 Apr 2011 18:14:55 +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-Committer: aidecoe X-VCS-Committer-Name: Amadeusz Żołnowski X-VCS-Revision: d37dd8c2e6044ae4d899279d0dd7c049949165d7 Date: Sun, 17 Apr 2011 18:14:55 +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: 8bbc7d817f96a4746f29aafb995634b6 commit: d37dd8c2e6044ae4d899279d0dd7c049949165d7 Author: Amadeusz =C5=BBo=C5=82nowski gentoo org> AuthorDate: Sun Apr 17 13:06:40 2011 +0000 Commit: Amadeusz =C5=BBo=C5=82nowski gentoo org> CommitDate: Sun Apr 17 13:06:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Dd37dd8c2 Merge branch 'stable' into dracut Conflicts: defaults/initrd.defaults defaults/initrd.scripts gen_cmdline.sh gen_determineargs.sh gen_initramfs.sh genkernel.conf ChangeLog | 24 ++++++++++++++++++++++++ arch/alpha/modules_load | 2 +- arch/arm/modules_load | 2 +- arch/ia64/modules_load | 2 +- arch/mips/modules_load | 2 +- arch/parisc/modules_load | 2 +- arch/parisc64/modules_load | 2 +- arch/ppc/modules_load | 2 +- arch/ppc64/modules_load | 2 +- arch/sparc/modules_load | 2 +- arch/sparc64/modules_load | 2 +- arch/um/modules_load | 2 +- arch/x86/modules_load | 2 +- arch/x86_64/modules_load | 2 +- defaults/modules_load | 2 +- doc/genkernel.8.txt | 9 +++++++-- gen_cmdline.sh | 6 ++---- genkernel | 2 +- 18 files changed, 48 insertions(+), 21 deletions(-) diff --cc gen_cmdline.sh index 098eb09,506ca3f..9e6b093 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@@ -40,9 -41,11 +40,9 @@@ longusage()=20 echo " --no-install Do not install the kernel after building" echo " --symlink Manage symlinks in /boot for installed images" echo " --no-symlink Do not manage symlinks" - echo " --no-ramdisk-modules Don't copy any modules to the ramdisk" - echo " --all-ramdisk-modules Copy all kernel modules to the ramdisk" echo " --callback=3D<...> Run the specified arguments after the" echo " kernel and modules have been compiled" - echo " --static Build a static (monolithic) kernel." + echo " --static Build a static (monolithic kernel)." echo " Kernel settings" echo " --kerneldir=3D Location of the kernel sources" echo " --kernel-config=3D Kernel configuration file to use for = compilation" @@@ -52,30 -55,26 +52,30 @@@ echo " --kernel-cc=3D Compiler to use for kernel (e.g. dist= cc)" echo " --kernel-as=3D Assembler to use for kernel" echo " --kernel-ld=3D Linker to use for kernel" - echo " --kernel-cross-compile=3D CROSS_COMPILE kernel vari= able" echo " --kernel-make=3D GNU Make to use for kernel" - echo " --utils-cc=3D Compiler to use for utilities" - echo " --utils-as=3D Assembler to use for utils" - echo " --utils-ld=3D Linker to use for utils" - echo " --utils-make=3D GNU Make to use for utils" - echo " --utils-cross-compile=3D CROSS_COMPILE utils variab= le" - echo " --utils-arch=3D Force to arch for utils only instead of= " - echo " autodetect." echo " --makeopts=3D Make options such as -j2, etc..." echo " --mountboot Mount BOOTDIR automatically if mountable" - echo " --no-mountboot Don't mount BOOTDIR automatically" + echo " --no-mountboot Don't mount BOOTDIR automatically" =20 echo " --bootdir=3D Set the location of the boot-directory, def= ault is /boot" echo " Initialization" - echo " --splash=3D Enable framebuffer splash using " - echo " --splash-res=3D Select splash theme resolutions to instal= l" - echo " --splash=3D Enable framebuffer splash using " - echo " --splash-res=3D Select splash theme resolutions to instal= l" - echo " --do-keymap-auto Forces keymap selection at boot" - echo " --no-keymap Disables keymap selection support" + echo " --bootloader=3Dgrub Add new kernel to GRUB configuration" + echo " Dracut engine" + echo " --add-modules=3D" + echo " Additional Dracut modules;" + echo " see /usr/share/dracut/modules.d for possible" + echo " values; separate modules by space, e.g.:" + echo " --add-modules=3D\"lvm crypt nfs\"" + echo " --auto Rely on Dracut system check instead of" + echo " specifying modules by hand" + echo " --crypt Include LUKS support" + echo " --> 'emerge cryptsetup'" + echo " --no-ramdisk-modules Don't copy any modules to the ramdisk" + echo " --dmraid Include DMRAID support" + echo " --dracut-dir=3D Directory of Dracut sources; if given Dra= cut" + echo " is run in local mode (see description of '-l'" + echo " in 'man 8 dracut'); script changes current" + echo " directory to , so don't use relative" + echo " paths then" echo " --evms Include EVMS support" echo " --> 'emerge evms' in the host operating system" echo " first"