emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

devfs: cleanup

Browse Source 
clean up local definitions. Also remove @SYSCONFDIR@ substitutions since
they can be calculated at runtime.
This commit is contained in:
William Hubbs 2017-12-14 12:06:07 -06:00
parent 14938c29ce
commit 53844fd0dc
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
init.d/devfs.in
View File

@ -20,9 +20,12 @@ depend()
mount_dev() 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 # Some devices require exec, Bug #92921
local mountopts="exec,nosuid,mode=0755" mountopts="exec,nosuid,mode=0755"
if yesno ${skip_mount_dev:-no} ; then if yesno ${skip_mount_dev:-no} ; then
einfo "/dev will not be mounted due to user request" einfo "/dev will not be mounted due to user request"
return 0 return 0
@ -33,7 +36,7 @@ mount_dev()
msg=Remounting msg=Remounting
fi fi
if fstabinfo -q /dev; then if fstabinfo -q /dev; then
ebegin "$msg /dev according to @SYSCONFDIR@/fstab" ebegin "$msg /dev according to fstab"
fstabinfo -q $action /dev fstabinfo -q $action /dev
eend $? eend $?
return 0 return 0
@ -54,7 +57,7 @@ mount_dev()
ewarn "is no entry for /dev in fstab." ewarn "is no entry for /dev in fstab."
ewarn "This means /dev will not be mounted." ewarn "This means /dev will not be mounted."
ewarn "To avoid this message, set CONFIG_DEVTMPFS or CONFIG_TMPFS to y" 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 fi
return 0 return 0
} }