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 3FA4C13800E for ; Tue, 24 Jul 2012 08:29:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BCF7E0459; Tue, 24 Jul 2012 08:29:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E63CFE0459 for ; Tue, 24 Jul 2012 08:29:05 +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 5D3661B4444 for ; Tue, 24 Jul 2012 08:29:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F2BD8E5436 for ; Tue, 24 Jul 2012 08:29:03 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1343118524.c924bde4b7accbe1cf3bdba666b615d412c869bf.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog defaults/initrd.scripts X-VCS-Directories: / defaults/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: c924bde4b7accbe1cf3bdba666b615d412c869bf X-VCS-Branch: master Date: Tue, 24 Jul 2012 08:29:03 +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: aaa74d8e-8ea8-4c41-98e4-f16722ce521b X-Archives-Hash: bfc4b0d0e3ea02772cf8dbaa45f36321 commit: c924bde4b7accbe1cf3bdba666b615d412c869bf Author: Robin H. Johnson gentoo org> AuthorDate: Tue Jul 24 08:26:43 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Jul 24 08:28:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c924bde4 Prior commit to only mount devtmpfs and devpts if they were not already mounted made assumptions about the device names they were mounted as. Check the filesystem column of /proc/mounts instead. Signed-off-by: Robin H. Johnson gentoo.org> --- ChangeLog | 5 +++++ defaults/initrd.scripts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc9ab5b..de4fac8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ # - 2008-2011 Various authors (see AUTHORS) # Distributed under the GPL v2 # $Id$ + + 24 Jul 2012; Robin H. Johnson defaults/initrd.scripts: + Prior commit to only mount devtmpfs and devpts if they were not already + mounted made assumptions about the device names they were mounted as. Check + the filesystem column of /proc/mounts instead. 21 Jul 2012; Sebastian Pipping genkernel: Bump version to 3.4.39 diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 4f0ce1b..fb64f84 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -307,13 +307,13 @@ mount_devfs () { fi # Options copied from /etc/init.d/udev-mount, should probably be kept in sync - if grep -qs '^devtmpfs' /proc/mounts; then + if awk 'BEGIN{m=1;} /devtmpfs/{if($3 == "devtmpfs") {m=0;} } END { exit m;}' /proc/mounts; then mount -t $devfs -o "exec,nosuid,mode=0755,size=10M" udev /dev \ || bad_msg "Failed to mount /dev as ${devfs}" fi # http://git.busybox.net/busybox/plain/docs/mdev.txt - if grep -qs '^devpts' /proc/mounts; then + if awk 'BEGIN{m=1;} /devtmpfs/{if($3 == "devpts") {m=0;} } END { exit m;}' /proc/mounts; then mkdir -m 0755 /dev/pts mount -t devpts -o gid=5,mode=0620 devpts /dev/pts || bad_msg "Failed to mount /dev/pts" fi