From 3950eb6eba585492a9ca31d47d9a59a6e1789a5c Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Wed, 15 Aug 2007 14:49:41 +0000
Subject: `config /etc/fstab' can now be used in depend() functions to show
 that the deptree should be regenerated if /etc/fstab has changed.

---
 init.d/halt.sh  | 14 ++++++++------
 init.d/netmount |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'init.d')

diff --git a/init.d/halt.sh b/init.d/halt.sh
index dfcacedd..2a735613 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 61b7a6c6..2b0af2fe 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}
 }
-- 
cgit v1.2.3