[gentoo-commits] proj/genkernel:dracut commit in: /

["Amadeusz Żołnowski" <aidecoe@gentoo.org>]

commit:     203bdc8c856b208c9b9c44ec922fbb8c75b5d07f
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 10:52:25 2012 +0000
Commit:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 10:52:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=203bdc8c

Merge branch 'master' into dracut

Conflicts:
	defaults/initrd.defaults
	defaults/initrd.scripts
	defaults/linuxrc
	gen_arch.sh
	gen_compile.sh
	gen_determineargs.sh
	gen_initramfs.sh
	patches/busybox/1.18.1/1.18.1-mdstart.diff


 ChangeLog                                   |   48 +++++++++++++++++++++++++++
 doc/genkernel.8.txt                         |    3 ++
 gen_bootloader.sh                           |    4 +-
 gen_cmdline.sh                              |    4 +-
 gen_compile.sh                              |    4 +-
 gen_configkernel.sh                         |    2 +-
 gen_determineargs.sh                        |   12 +++---
 gen_funcs.sh                                |   10 +++---
 gen_moddeps.sh                              |    4 +-
 gen_package.sh                              |   33 +++++++++---------
 patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch |   26 ++++++++++++++
 11 files changed, 113 insertions(+), 37 deletions(-)

diff --cc gen_bootloader.sh
index 320685d,79531d4..c5bb85b
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@@ -60,13 -60,18 +60,13 @@@ set_bootloader_grub() 
  			echo "root (${GRUB_BOOT_DISK},${GRUB_BOOT_PARTITION})" >> ${GRUB_CONF}
  			echo >> ${GRUB_CONF}
  
- 			# Add grub configuration to grub.conf	
+ 			# Add grub configuration to grub.conf
  			echo "# Genkernel generated entry, see GRUB documentation for details" >> ${GRUB_CONF}
  			echo "title=Gentoo Linux ($KV)" >> ${GRUB_CONF}
 -			if [ "${BUILD_INITRD}" = '0' ]
 +			echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
 +			if [ "${BUILD_INITRD}" -eq '1' ]
  			then
 -				echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
 -			else
 -				echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=/dev/ram0 init=/linuxrc real_root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
 -				if [ "${PAT}" -gt '4' ]
 -				then
 -				    echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF}
 -				fi
 +				echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF}
  			fi
  			echo >> ${GRUB_CONF}
  		else