From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6B5321381F3 for ; Mon, 5 Nov 2012 18:32:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6741E05A4; Mon, 5 Nov 2012 18:30:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C679521C033 for ; Mon, 5 Nov 2012 18:30:32 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD01033D875 for ; Mon, 5 Nov 2012 18:30:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C8A83E5442 for ; Mon, 5 Nov 2012 18:30:28 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1350345646.a9a3c6d173b9e3e21080f7b493756fda359f8ebd.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:ryao commit in: /, doc/ X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog README doc/genkernel.8.txt gen_bootloader.sh genkernel X-VCS-Directories: / doc/ X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: a9a3c6d173b9e3e21080f7b493756fda359f8ebd X-VCS-Branch: ryao Date: Mon, 5 Nov 2012 18:30:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c59c6160-ef32-4c62-bdaa-f1c2650106f4 X-Archives-Hash: 8a0623f03fa47c63bae8682860ecaadb commit: a9a3c6d173b9e3e21080f7b493756fda359f8ebd Author: Peter Hjalmarsson rymdraket net> AuthorDate: Mon Apr 9 18:36:56 2012 +0000 Commit: Richard Yao gentoo org> CommitDate: Tue Oct 16 00:00:46 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a9a3c6d1 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 gentoo.org> --- ChangeLog | 4 ++++ README | 11 +++-------- doc/genkernel.8.txt | 16 ++++++++++------ gen_bootloader.sh | 7 ++----- genkernel | 9 +++------ 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10680da..dfe39e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ + 15 Oct 2012; Peter Hjalmarsson README, + doc/genkernel.8.txt, gen_bootloader.sh, genkernel: + Update the documentation to reflect current status re real_root/init. + 15 Oct 2012; Robin H. Johnson genkernel: Bump to 3.4.44.2 with depmod corner cases by xake. diff --git a/README b/README index 196e956..c202a54 100644 --- a/README +++ b/README @@ -21,18 +21,13 @@ PORTING: IMPORTANT KERNEL NOTES: - You MUST have /dev/pts turned on. - "Block devices->Loopback device support" - "Block devices->RAM disk support" - To boot genkernel properly, the kernel config must have - RAM disk support and Initial RAM disk support. You should - also set your "Default RAM disk size to 8192" + Initial RAM disk support. BOOTING A KERNEL WITH INITRD: GRUB: - real_root= needs to point to your root partition - root= needs to point to the ramdisk (should stay at /dev/ram0) - init= needs to point to the linuxrc file to execute on the ramdisk + root= needs to point to your root partition vga= should be the resolution you want your screen. 0x317 is 1024x768 - 16bpp and you'll get a pretty splash if configured properly @@ -40,5 +35,5 @@ BOOTING A KERNEL WITH INITRD: GRUB EXAMPLE ENTRY: title=2.6.0 [ Genkernel ] root (hd0,0) - kernel (hd0,0)/boot/kernel-2.6.0-gentoo root=/dev/ram0 init=/linuxrc real_root=/dev/hda3 vga=0x317 + kernel (hd0,0)/boot/kernel-2.6.0-gentoo root=/dev/hda3 vga=0x317 initrd (hd0,0)/boot/initrd-2.6.0-gentoo diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index 0f88334..dc04240 100644 --- a/doc/genkernel.8.txt +++ b/doc/genkernel.8.txt @@ -384,9 +384,13 @@ RAMDISK OPTIONS The following options can be passed as kernel parameters from the bootloader, which the ramdisk scripts would recognize. -*real_root*=<...>:: +*root*=<...>:: Specifies the device node of the root filesystem to mount. +*real_root*=<...>:: + Legacy kernel parameter from kernel-2.4 initrd. + Does the same as *root*=, which should be used in its place. + *crypt_root*=<...>:: This specifies the device encrypted by Luks, which contains the root filesystem to mount. @@ -423,9 +427,13 @@ which the ramdisk scripts would recognize. *dodmraid*[=<...>]:: Activate Device-Mapper RAID and (optionally) pass arguments to it. -*real_init*=<...>:: +*init*=<...>:: Override location of init script, default is "/sbin/init". +*real_init*=<...>:: + Legacy kernel parameter from kernel-2.4 initrd. + Does the same as *init*=, which should be used in its place. + *init_opts*=<...>:: Passes arguments to init on bootup. @@ -486,10 +494,6 @@ which the ramdisk scripts would recognize. *nocache*:: Enables/disables caching of CD contents in RAM. -*root*=<...>:: - Omit or specify as "/dev/ram0". - For other values be sure to know what you're doing. - *subdir*=<...>:: switch_root into "/" instead of "/". is "/newroot" (or "/union") usually. 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} diff --git a/genkernel b/genkernel index e84e089..ca634d4 100755 --- a/genkernel +++ b/genkernel @@ -331,23 +331,20 @@ then print_info 1 "Kernel compiled successfully!" print_info 1 '' print_info 1 'Required Kernel Parameters:' + print_info 1 ' root=/dev/$ROOT' if [ "${BUILD_RAMDISK}" = '0' ] then - print_info 1 ' root=/dev/$ROOT' print_info 1 ' [ And "vga=0x317 splash=verbose" if you use a framebuffer ]' print_info 1 '' print_info 1 ' Where $ROOT is the device node for your root partition as the' print_info 1 ' one specified in /etc/fstab' else - print_info 1 ' real_root=/dev/$ROOT' print_info 1 '' print_info 1 ' Where $ROOT is the device node for your root partition as the' print_info 1 ' one specified in /etc/fstab' print_info 1 '' print_info 1 "If you require Genkernel's hardware detection features; you MUST" - print_info 1 'tell your bootloader to use the provided INITRAMFS file. Otherwise;' - print_info 1 'substitute the root argument for the real_root argument if you are' - print_info 1 'not planning to use the initramfs...' + print_info 1 'tell your bootloader to use the provided INITRAMFS file.' fi fi @@ -362,7 +359,7 @@ then [ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support' [ "${DMRAID}" = '1' ] && print_warning 1 ' or "dodmraid="' [ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS volume management support' - [ "${ZFS}" = '1' ] && print_warning 1 'add either "real_root=ZFS" (bootfs autodetection) or "real_root=ZFS=" to boot from a ZFS dataset' + [ "${ZFS}" = '1' ] && print_warning 1 ' and either "root=ZFS" to use bootfs autodetection or "root=ZFS=" to force booting from a specific dataset' [ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname= iscsi_target= and iscsi_address=" for iscsi support' if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then