From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-990366-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 68ED5139083
for <garchives@archives.gentoo.org>; Thu, 14 Dec 2017 18:53:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C1E44E108F;
Thu, 14 Dec 2017 18:53:07 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A1E95E108F
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Dec 2017 18:53:07 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8118333BEBE
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Dec 2017 18:53:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 14A82AE75
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Dec 2017 18:53:05 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
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" <williamh@gentoo.org>
Message-ID: <1513274918.53844fd0dcd9741b5f19dee7c00787be7e904c3c.williamh@OpenRC>
Subject: [gentoo-commits] proj/openrc:master commit in: init.d/
X-VCS-Repository: proj/openrc
X-VCS-Files: init.d/devfs.in
X-VCS-Directories: init.d/
X-VCS-Committer: williamh
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: 53844fd0dcd9741b5f19dee7c00787be7e904c3c
X-VCS-Branch: master
Date: Thu, 14 Dec 2017 18:53:05 +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
X-Archives-Salt: e944db16-1234-4d99-a414-b19a644789f4
X-Archives-Hash: 94f972306eeb2361b5fb57cf1757d809
commit: 53844fd0dcd9741b5f19dee7c00787be7e904c3c
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Dec 14 18:06:07 2017 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 18:08:38 2017 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=53844fd0
devfs: cleanup
clean up local definitions. Also remove @SYSCONFDIR@ substitutions since
they can be calculated at runtime.
init.d/devfs.in | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/init.d/devfs.in b/init.d/devfs.in
index 8038c541..61ba45f8 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -20,9 +20,12 @@ depend()
mount_dev()
{
- local action=--mount devfstype msg=Mounting
+ local action conf_d_dir devfstype msg mountopts
+ action=--mount
+ conf_d_dir="${RC_SERVICE%/*/*}/conf.d"
+ msg=Mounting
# Some devices require exec, Bug #92921
- local mountopts="exec,nosuid,mode=0755"
+ mountopts="exec,nosuid,mode=0755"
if yesno ${skip_mount_dev:-no} ; then
einfo "/dev will not be mounted due to user request"
return 0
@@ -33,7 +36,7 @@ mount_dev()
msg=Remounting
fi
if fstabinfo -q /dev; then
- ebegin "$msg /dev according to @SYSCONFDIR@/fstab"
+ ebegin "$msg /dev according to fstab"
fstabinfo -q $action /dev
eend $?
return 0
@@ -54,7 +57,7 @@ mount_dev()
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"
+ ewarn "in your kernel configuration or see ${conf_d_dir}/${RC_SVCNAME}"
fi
return 0
}