From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QROpo-0002t2-1J for garchives@archives.gentoo.org; Tue, 31 May 2011 13:18:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F5E11C0CF; Tue, 31 May 2011 13:18:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 088E51C0CF for ; Tue, 31 May 2011 13:18:02 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 677441B4011 for ; Tue, 31 May 2011 13:18:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BD32180508 for ; Tue, 31 May 2011 13:18:01 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: Subject: [gentoo-commits] proj/genkernel:master commit in: /, doc/, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog defaults/linuxrc doc/genkernel.8.txt genkernel X-VCS-Directories: / doc/ defaults/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: fad624bc41b33f7bf418845f677caa49a33b6a94 Date: Tue, 31 May 2011 13:18:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c4c734656285a4c1acbbe1e96bc31c13 commit: fad624bc41b33f7bf418845f677caa49a33b6a94 Author: Sebastian Pipping pipping org> AuthorDate: Tue May 31 13:03:12 2011 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Tue May 31 13:17:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Dfad624bc Add rootfstype=3D boot parameter (bug #221245) --- ChangeLog | 7 +++++++ defaults/linuxrc | 11 ++++++++--- doc/genkernel.8.txt | 5 +++++ genkernel | 4 ++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03f20db..6ef649f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ # Distributed under the GPL v2 # $Id$ =20 + 31 May 2011; Sebastian Pipping defaults/linuxrc, + doc/genkernel.8.txt: + Add rootfstype=3D boot parameter (bug #221245) + + Special thanks: + - Marcin Kurek + 31 May 2011; Nelson Batalha defaults/initrd= .defaults: Add Kernel 3.0.0 support (bug #369481) =20 diff --git a/defaults/linuxrc b/defaults/linuxrc index 1819d9f..51c4529 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -37,6 +37,7 @@ CMDLINE=3D`cat /proc/cmdline` # Scan CMDLINE for any specified real_root=3D or cdroot arguments FAKE_ROOT=3D'' REAL_ROOTFLAGS=3D'' +ROOTFSTYPE=3D'auto' CRYPT_SILENT=3D0 for x in ${CMDLINE} do @@ -212,6 +213,9 @@ do real_rootflags\=3D*) REAL_ROOTFLAGS=3D`parse_opt "${x}"` ;; + rootfstype\=3D*) + ROOTFSTYPE=3D`parse_opt "${x}"` + ;; keymap\=3D*) keymap=3D`parse_opt "${x}"` ;; @@ -495,10 +499,11 @@ do else # mount ro so fsck doesn't barf later if [ "${REAL_ROOTFLAGS}" =3D '' ]; then - mount -o ro ${REAL_ROOT} ${NEW_ROOT} + good_msg "Using mount -t ${ROOTFSTYPE} -o ro" + mount -t ${ROOTFSTYPE} -o ro ${REAL_ROOT} ${NEW_ROOT} else - good_msg "Using mount -o ro,${REAL_ROOTFLAGS}" - mount -o ro,${REAL_ROOTFLAGS} ${REAL_ROOT} ${NEW_ROOT} + good_msg "Using mount -t ${ROOTFSTYPE} -o ro,${REAL_ROOTFLAGS}" + mount -t ${ROOTFSTYPE} -o ro,${REAL_ROOTFLAGS} ${REAL_ROOT} ${NEW_RO= OT} fi fi =09 diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index c435646..c12dca2 100644 --- a/doc/genkernel.8.txt +++ b/doc/genkernel.8.txt @@ -440,6 +440,11 @@ which the ramdisk scripts would recognize. *dokeymap*:: Use keymap. Usage of *keymap*=3D implies this option, already. =20 +*rootfstype*=3D<...>:: + Specify the file system type to mount the real root filesystem as. + This can be useful when support for ext2/ext3/ext4 are + in competition. Default is "auto". + =20 NETBOOTING ---------- diff --git a/genkernel b/genkernel index 273d9da..6e18506 100755 --- a/genkernel +++ b/genkernel @@ -353,6 +353,10 @@ then [ "${MDADM}" =3D '1' ] && print_warning 1 'add "domdadm" for RAID suppo= rt' [ "${DMRAID}" =3D '1' ] && print_warning 1 ' or "dodmraid=3D"' [ "${ISCSI}" =3D '1' ] && print_warning 1 'add at least "iscsi_initiato= rname=3D iscsi_target=3D and iscsi_address=3D= " for iscsi support' + if [ `grep 'CONFIG_EXT[0-9]_FS=3D' "${KERNEL_DIR}"/.config | wc -l` -ge= 2 ]; then + print_warning 1 'With support for several ext* filesystems around it m= ay be needed to' + print_warning 1 'add "rootfstype=3Dext3" or "rootfstype=3Dext4"' + fi fi =20 [ "${BOOTRW}" !=3D '' ] && mount -o remount,ro ${BOOTDIR}