aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hjalmarsson <xake@rymdraket.net>2012-04-09 20:36:56 +0200
committerRobin H. Johnson <robbat2@gentoo.org>2012-10-15 17:00:46 -0700
commita9a3c6d173b9e3e21080f7b493756fda359f8ebd (patch)
tree369e56164b4404677581f88d8b6ec26e8b117161 /gen_bootloader.sh
parentBump to 3.4.44.2 with depmod corner cases by xake. (diff)
downloadgenkernel-a9a3c6d173b9e3e21080f7b493756fda359f8ebd.tar.gz
genkernel-a9a3c6d173b9e3e21080f7b493756fda359f8ebd.tar.bz2
genkernel-a9a3c6d173b9e3e21080f7b493756fda359f8ebd.zip
Update the documentation to reflect current status
We only support creating initramfs nowdays, so RAM disk support is not needed. Since initramfs does not need root=/dev/ram0 (and we actually ignore it if it is set), we should not tell people to use it. We should also stop tell people to use real_root. Conflicts: genkernel Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'gen_bootloader.sh')
-rwxr-xr-xgen_bootloader.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 5b73d97..7a4f485 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -89,11 +89,8 @@ 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' ]
- 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}
+ echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
+ if [ "${BUILD_INITRD}" = '1' ]
if [ "${PAT}" -gt '4' ]
then
echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF}