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 7BB7313877A for ; Fri, 22 Aug 2014 19:10:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 128ACE0823; Fri, 22 Aug 2014 19:10:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A880E079B for ; Fri, 22 Aug 2014 19:10:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A08863400CB for ; Fri, 22 Aug 2014 19:10:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D5093BEB for ; Fri, 22 Aug 2014 19:10:09 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1407527340.6a337ff6c531d9d7310253b67b3e95d1ce5d214c.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/, conf.d/ X-VCS-Repository: proj/openrc X-VCS-Files: conf.d/devfs init.d/devfs.in X-VCS-Directories: init.d/ conf.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 6a337ff6c531d9d7310253b67b3e95d1ce5d214c X-VCS-Branch: master Date: Fri, 22 Aug 2014 19:10:09 +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: 45e13378-95ee-4ada-a330-4b83d67c5201 X-Archives-Hash: be176c95b80c7c0cfc72e44531247549 commit: 6a337ff6c531d9d7310253b67b3e95d1ce5d214c Author: William Hubbs gmail com> AuthorDate: Fri Aug 8 19:49:00 2014 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Aug 8 19:49:00 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6a337ff6 devfs: several small clarifications - Rename the static_dev switch in conf.d/devfs to skip_mount_dev since this is a better description of what the switch does. - Clarify the error messages in the devfs service script based on the new name of the switch. --- conf.d/devfs | 10 ++++++++-- init.d/devfs.in | 14 ++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/conf.d/devfs b/conf.d/devfs index 92a8a99..51f8037 100644 --- a/conf.d/devfs +++ b/conf.d/devfs @@ -1,2 +1,8 @@ -# Set this to yes if your /dev is not a devtmpfs or tmpfs. -# static_dev="NO" +# OpenRC will attempt each of the following in succession to mount /dev. +# +# 1. If there is an entry for /dev in fstab, it will be used. +# 2. If devtmpfs is defined in the kernel, it will be used. +# 3. If tmpfs is defined in the kernel, it will be used. +# +# Set this to yes if you do not want OpenRC to attempt to mount /dev. +# skip_mount_dev="NO" diff --git a/init.d/devfs.in b/init.d/devfs.in index ca24231..bcdbdcd 100644 --- a/init.d/devfs.in +++ b/init.d/devfs.in @@ -16,8 +16,8 @@ mount_dev() local action=--mount devfstype msg=Mounting # Some devices require exec, Bug #92921 local mountopts="exec,nosuid,mode=0755" - if yesno ${static_dev:-no}; then - einfo "Using static /dev" + if yesno ${skip_mount_dev:-no} ; then + einfo "/dev will not be mounted due to user request" return 0 fi if mountinfo -q /dev; then @@ -43,11 +43,13 @@ mount_dev() mount -n -t $devfstype -o $mountopts dev /dev eend $? else - ewarn "This kernel does not have devtmpfs or tmpfs support." - ewarn "Assuming you want static /dev. If this is not the case," - ewarn "please set the CONFIG_DEVTMPFS or CONFIG_TMPFS option" - ewarn "in your kernel." + ewarn "This kernel does not have devtmpfs or tmpfs support, and there" + ewarn "is no entry for /dev in fstab." + ewarn "This means /dev will not be mounted." + ewarn "To avoid this message, set CONFIG_DEVTMPFS or CONFIG_TMPFS to y" + ewarn "in your kernel configuration or see @SYSCONFDIR@/conf.d/devfs" fi + return 0 } seed_dev() 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 5C51E13877A for ; Fri, 8 Aug 2014 23:19:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C48FE089C; Fri, 8 Aug 2014 23:19:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6C3BE089C for ; Fri, 8 Aug 2014 23:19:14 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C697B34034A for ; Fri, 8 Aug 2014 23:19:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 56C7018810 for ; Fri, 8 Aug 2014 23:19:11 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1407527340.6a337ff6c531d9d7310253b67b3e95d1ce5d214c.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/, conf.d/ X-VCS-Repository: proj/openrc X-VCS-Files: conf.d/devfs init.d/devfs.in X-VCS-Directories: init.d/ conf.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 6a337ff6c531d9d7310253b67b3e95d1ce5d214c X-VCS-Branch: master Date: Fri, 8 Aug 2014 23:19:11 +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: da158703-4dd8-4f56-acdf-683b978577e4 X-Archives-Hash: 70aba4009d2600dbaf44a7aa670062bc Message-ID: <20140808231911.WUs5TOqY2iBstNxODtZIHlBp_AyGXznwtWOOzuneznE@z> commit: 6a337ff6c531d9d7310253b67b3e95d1ce5d214c Author: William Hubbs gmail com> AuthorDate: Fri Aug 8 19:49:00 2014 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Aug 8 19:49:00 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6a337ff6 devfs: several small clarifications - Rename the static_dev switch in conf.d/devfs to skip_mount_dev since this is a better description of what the switch does. - Clarify the error messages in the devfs service script based on the new name of the switch. --- conf.d/devfs | 10 ++++++++-- init.d/devfs.in | 14 ++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/conf.d/devfs b/conf.d/devfs index 92a8a99..51f8037 100644 --- a/conf.d/devfs +++ b/conf.d/devfs @@ -1,2 +1,8 @@ -# Set this to yes if your /dev is not a devtmpfs or tmpfs. -# static_dev="NO" +# OpenRC will attempt each of the following in succession to mount /dev. +# +# 1. If there is an entry for /dev in fstab, it will be used. +# 2. If devtmpfs is defined in the kernel, it will be used. +# 3. If tmpfs is defined in the kernel, it will be used. +# +# Set this to yes if you do not want OpenRC to attempt to mount /dev. +# skip_mount_dev="NO" diff --git a/init.d/devfs.in b/init.d/devfs.in index ca24231..bcdbdcd 100644 --- a/init.d/devfs.in +++ b/init.d/devfs.in @@ -16,8 +16,8 @@ mount_dev() local action=--mount devfstype msg=Mounting # Some devices require exec, Bug #92921 local mountopts="exec,nosuid,mode=0755" - if yesno ${static_dev:-no}; then - einfo "Using static /dev" + if yesno ${skip_mount_dev:-no} ; then + einfo "/dev will not be mounted due to user request" return 0 fi if mountinfo -q /dev; then @@ -43,11 +43,13 @@ mount_dev() mount -n -t $devfstype -o $mountopts dev /dev eend $? else - ewarn "This kernel does not have devtmpfs or tmpfs support." - ewarn "Assuming you want static /dev. If this is not the case," - ewarn "please set the CONFIG_DEVTMPFS or CONFIG_TMPFS option" - ewarn "in your kernel." + ewarn "This kernel does not have devtmpfs or tmpfs support, and there" + ewarn "is no entry for /dev in fstab." + ewarn "This means /dev will not be mounted." + ewarn "To avoid this message, set CONFIG_DEVTMPFS or CONFIG_TMPFS to y" + ewarn "in your kernel configuration or see @SYSCONFDIR@/conf.d/devfs" fi + return 0 } seed_dev()