summaryrefslogtreecommitdiff
path: root/init.d
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-08-15 14:49:41 +0000
committerRoy Marples <roy@marples.name>2007-08-15 14:49:41 +0000
commit3950eb6eba585492a9ca31d47d9a59a6e1789a5c (patch)
tree773523573cbad43ca473dae817222435890ca420 /init.d
parent7d68200f2443fc37809698d612fe6278a8f18016 (diff)
downloadopenrc-3950eb6eba585492a9ca31d47d9a59a6e1789a5c.tar.gz
openrc-3950eb6eba585492a9ca31d47d9a59a6e1789a5c.tar.bz2
openrc-3950eb6eba585492a9ca31d47d9a59a6e1789a5c.tar.xz
`config /etc/fstab' can now be used in depend() functions to show that
the deptree should be regenerated if /etc/fstab has changed.
Diffstat (limited to 'init.d')
-rwxr-xr-xinit.d/halt.sh14
-rwxr-xr-xinit.d/netmount1
2 files changed, 9 insertions, 6 deletions
diff --git a/init.d/halt.sh b/init.d/halt.sh
index dfcaced..2a73561 100755
--- a/init.d/halt.sh
+++ b/init.d/halt.sh
@@ -42,15 +42,17 @@ if mountinfo "${RC_SVCDIR}" >/dev/null && [ -w "${RC_LIBDIR}" ] ; then
fuser -k ${f_opts} "${svcdir}" 1>/dev/null 2>/dev/null
sleep 2
fi
- cp -p "${RC_SVCDIR}"/deptree "${RC_SVCDIR}"/softlevel \
- "${RC_SVCDIR}"/nettree "${RC_LIBDIR}" 2>/dev/null
+ cp -p "${RC_SVCDIR}"/deptree "${RC_SVCDIR}"/depconfig \
+ "${RC_SVCDIR}"/softlevel "${RC_SVCDIR}"/nettree \
+ "${RC_LIBDIR}" 2>/dev/null
umount "${RC_SVCDIR}"
rm -rf "${RC_SVCDIR}"/*
# Pipe errors to /dev/null as we may have future timestamps
- cp -p "${RC_LIBDIR}"/deptree "${RC_LIBDIR}"/softlevel \
- "${RC_LIBDIR}"/nettree "${RC_SVCDIR}" 2>/dev/null
- rm -f "${RC_LIBDIR}"/deptree "${RC_LIBDIR}"/softlevel \
- "${RC_LIBDIR}"/nettree
+ cp -p "${RC_LIBDIR}"/deptree "${RC_LIBDIR}"/depconfig \
+ "${RC_LIBDIR}"/softlevel "${RC_LIBDIR}"/nettree \
+ "${RC_SVCDIR}" 2>/dev/null
+ rm -f "${RC_LIBDIR}"/deptree "${RC_LIBDIR}"/depconfig \
+ "${RC_LIBDIR}"/softlevel "${RC_LIBDIR}"/nettree
# Release the memory disk if we used it
case "${mnt}" in
"/dev/md"[0-9]*) mdconfig -d -u "${mnt#/dev/md*}" ;;
diff --git a/init.d/netmount b/init.d/netmount
index 61b7a6c..2b0af2f 100755
--- a/init.d/netmount
+++ b/init.d/netmount
@@ -25,6 +25,7 @@ depend() {
myuse="${myuse} ${pmap}"
fi
+ config /etc/fstab
need net ${myneed}
use afc-client amd autofs dns nfs nfsmount ${myuse}
}