From 6a337ff6c531d9d7310253b67b3e95d1ce5d214c Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Fri, 8 Aug 2014 14:49:00 -0500
Subject: [PATCH] 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 92a8a99d..51f80370 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 ca242318..bcdbdcd4 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()