aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2017-12-14 12:06:07 -0600
committerWilliam Hubbs <w.d.hubbs@gmail.com>2017-12-14 12:08:38 -0600
commit53844fd0dcd9741b5f19dee7c00787be7e904c3c (patch)
treeec36650ab0bad0255315ad7463cb71ebb40cd25b
parent14938c29cefe869872b987f8e606da72024fa8bb (diff)
devfs: cleanup
clean up local definitions. Also remove @SYSCONFDIR@ substitutions since they can be calculated at runtime.
-rw-r--r--init.d/devfs.in11
1 files 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
}