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 <gentoo-commits+bounces-414104-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RhVLb-0000BL-Rk
for garchives@archives.gentoo.org; Mon, 02 Jan 2012 00:01:52 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 607AB21C1C0;
Mon, 2 Jan 2012 00:01:41 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 1354721C1C0
for <gentoo-commits@lists.gentoo.org>; Mon, 2 Jan 2012 00:01:41 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8C1021B400B
for <gentoo-commits@lists.gentoo.org>; Mon, 2 Jan 2012 00:01:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id ABE4B80042
for <gentoo-commits@lists.gentoo.org>; Mon, 2 Jan 2012 00:01:39 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" <williamh@gentoo.org>
Message-ID: <8b6ebd414edec59d31ed413dfa8f7e7cd09bc8c8.WilliamH@gentoo>
Subject: [gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/
X-VCS-Repository: proj/udev-gentoo-scripts
X-VCS-Files: init.d/udev-mount
X-VCS-Directories: init.d/
X-VCS-Committer: WilliamH
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: 8b6ebd414edec59d31ed413dfa8f7e7cd09bc8c8
Date: Mon, 2 Jan 2012 00:01:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: b869e0b9-28b6-4be7-a37b-5a04fa86624d
X-Archives-Hash: 29c316fb475fadd44e0617f6c9a5f36e
commit: 8b6ebd414edec59d31ed413dfa8f7e7cd09bc8c8
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 1 23:56:41 2012 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 23:56:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/udev-gentoo-s=
cripts.git;a=3Dcommit;h=3D8b6ebd41
udev-mount: require devtmpfs
Upstream udev now requires that a devtmpfs be mounted on /dev, so we
require this as well.
---
init.d/udev-mount | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/init.d/udev-mount b/init.d/udev-mount
index 62742bd..096e710 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -2,7 +2,7 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
=20
-description=3D"mount devtmpfs or tmpfs on /dev"
+description=3D"mount devtmpfs on /dev"
=20
depend()
{
@@ -11,22 +11,36 @@ depend()
=20
mount_dev_directory()
{
- if mountinfo -q /dev; then
+ local rc=3D0
+
+ if mountinfo -q -f devtmpfs /dev; then
einfo "/dev is already mounted"
return 0
fi
=20
+ # If an entry for /dev exists in fstab it must be a devtmpfs.
+ if fstabinfo -q /dev && ! fstabinfo -q -f devtmpfs /dev; then
+ eerror "The entry in /etc/fstab is not correct."
+ eerror "Udev requires it to be a devtmpfs file system."
+ return 1
+ fi
+
# No options are processed here as they should all be in /etc/fstab
ebegin "Mounting /dev"
if ! fstabinfo --mount /dev; then
- # we mount devtmpfs if supported
- local fs=3Dtmpfs
- grep -qs devtmpfs /proc/filesystems && fs=3Ddevtmpfs
-
- # Some devices require exec, Bug #92921
- mount -n -t "$fs" -o "exec,nosuid,mode=3D0755,size=3D10M" udev /dev
+ if grep -qs devtmpfs /proc/filesystems; then
+ # Some devices require exec, Bug #92921
+ mount -n -t devtmpfs -o "exec,nosuid,mode=3D0755,size=3D10M" udev /de=
v
+ rc=3D$?
+ else
+ eerror "Udev uses a devtmpfs mounted on /dev to manage devices."
+ eerror "This means that CONFIG_DEVTMPFS=3Dy is required"
+ eerror "in the kernel configuration."
+ return 1
+ fi
fi
- eend $?
+
+ eend $rc
}
=20
seed_dev()