X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=gen_bootloader.sh;h=5848bd24220c8aeefe6c0b254a3221afde19dda3;hb=refs%2Fheads%2Fmaster;hp=f0273db19bb304d98799ebff0a3f6ab064d5f54a;hpb=b882252bebf51bfe343106a1634fda333ea6d84b;p=genkernel.git

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index f0273db..5848bd2 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -51,6 +51,7 @@ set_bootloader_grub2() {
 	print_info 1 "You can customize Grub2 parameters in /etc/default/grub."
 	print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..."
 	grub2-mkconfig -o "${GRUB_CONF}"
+	[ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}"
 }
 
 set_bootloader_grub() {
@@ -88,11 +89,9 @@ set_bootloader_grub() {
 			# 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}" = '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}