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 20CF1138010 for ; Sun, 31 Mar 2013 12:47:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABF87E07A4; Sun, 31 Mar 2013 12:47:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D6B0E07A4 for ; Sun, 31 Mar 2013 12:47:21 +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 2ED6A33BEFB for ; Sun, 31 Mar 2013 12:47:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B4B70E4073 for ; Sun, 31 Mar 2013 12:47:18 +0000 (UTC) From: "Peter Hjalmarsson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Peter Hjalmarsson" Message-ID: <1364733908.e4ab952d639ff69e57fefa3e3855ee81d4d555fb.xake@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: doc/, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/linuxrc doc/genkernel.8.txt X-VCS-Directories: doc/ defaults/ X-VCS-Committer: xake X-VCS-Committer-Name: Peter Hjalmarsson X-VCS-Revision: e4ab952d639ff69e57fefa3e3855ee81d4d555fb X-VCS-Branch: master Date: Sun, 31 Mar 2013 12:47:18 +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: 58546f6c-4dd7-49c1-80e9-8113fc2af276 X-Archives-Hash: 045fbf162f65f0a3541a31a17a64f8a6 commit: e4ab952d639ff69e57fefa3e3855ee81d4d555fb Author: Peter Hjalmarsson rymdraket net> AuthorDate: Tue Mar 5 21:45:45 2013 +0000 Commit: Peter Hjalmarsson rymdraket net> CommitDate: Sun Mar 31 12:45:08 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e4ab952d Add rootflags to switches we understand Nearly every general documentation including the one in the kernel tree and the scripts for GRUB2 all expects this flag to work. Signed-off-by: Peter Hjalmarsson rymdraket.net> --- defaults/linuxrc | 24 +++++++++++++++++------- doc/genkernel.8.txt | 8 ++++++-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/defaults/linuxrc b/defaults/linuxrc index f1e20ce..703652d 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -37,7 +37,7 @@ CMDLINE=$(cat /proc/cmdline) # Scan CMDLINE for any specified real_root= or cdroot arguments FAKE_ROOT='' FAKE_INIT='' -REAL_ROOTFLAGS='' +FAKE_ROOTFLAGS='' INIT_OPTS='' ROOTFSTYPE='auto' CRYPT_SILENT=0 @@ -236,6 +236,9 @@ do real_rootflags=*) REAL_ROOTFLAGS=${x#*=} ;; + rootflags=*) + FAKE_ROOTFLAGS=${x#*=} + ;; rootfstype=*) ROOTFSTYPE=${x#*=} ;; @@ -267,13 +270,20 @@ do esac done -if [ -z "${REAL_ROOT}" -a \( "${CDROOT}" = '0' \) -a \( "${FAKE_ROOT}" != "/dev/ram0" \) ] -then - REAL_ROOT="${FAKE_ROOT}" -fi -if [ -z "${REAL_INIT}" -a \( "${CDROOT}" = '0' \) -a \( "${FAKE_INIT}" != "/linuxrc" \) ] +if [ \( "${CDROOT}" = '0' \) ] then - REAL_INIT="${FAKE_INIT}" + if [ -z "${REAL_ROOT}" -a \( "${FAKE_ROOT}" != "/dev/ram0" \) ] + then + REAL_ROOT="${FAKE_ROOT}" + fi + if [ -z "${REAL_INIT}" -a \( "${FAKE_INIT}" != "/linuxrc" \) ] + then + REAL_INIT="${FAKE_INIT}" + fi + if [ -z "${REAL_ROOTFLAGS}" ] + then + REAL_ROOTFLAGS="${FAKE_ROOTFLAGS}" + fi fi # Set variables based on the value of REAL_ROOT diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index 4691a98..86d7d53 100644 --- a/doc/genkernel.8.txt +++ b/doc/genkernel.8.txt @@ -545,9 +545,13 @@ which the ramdisk scripts would recognize. *aufs*:: Enables support for AUFS2 (if available in the kernel). -*real_rootflags*=<...>:: +*rootflags*=<...>:: Additional flags to mount the real root system with. - For example *real_rootflags*=noatime would make "-o ro,noatime". + For example *rootflags*=noatime would make "-o ro,noatime". + +*real_rootflags*=<...>:: + Legacy kernel parameter from kernel-2.4 initrd. + Does the same as *rootflags*=, which should be used in its place. *real_resume*=<...>:: *resume*=<...>::