From 52664d77f9913ba13b3365adc5da2293549cf36e Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sun, 22 Jul 2007 11:23:56 +0000
Subject: Cater for einfo calls inside the depend function

---
 sh/gendepends.sh | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'sh')

diff --git a/sh/gendepends.sh b/sh/gendepends.sh
index 0cb04e66..5927aab1 100755
--- a/sh/gendepends.sh
+++ b/sh/gendepends.sh
@@ -6,19 +6,29 @@
 . /etc/init.d/functions.sh
 
 need() {
-    [ -n "$*" ] && echo "${SVCNAME} ineed $*"
+	exec 1>&3
+	[ -n "$*" ] && echo "${SVCNAME} ineed $*"
+	exec 1>&2
 }
 use() {
-    [ -n "$*" ] && echo "${SVCNAME} iuse $*"
+	exec 1>&3
+	[ -n "$*" ] && echo "${SVCNAME} iuse $*"
+	exec 1>&2
 }
 before() {
-    [ -n "$*" ] && echo "${SVCNAME} ibefore $*"
+	exec 1>&3
+	[ -n "$*" ] && echo "${SVCNAME} ibefore $*"
+	exec 1>&2
 }
 after() {
-    [ -n "$*" ] && echo "${SVCNAME} iafter $*"
+	exec 1>&3
+	[ -n "$*" ] && echo "${SVCNAME} iafter $*"
+	exec 1>&2
 }
 provide() {
-    [ -n "$*" ] && echo "${SVCNAME} iprovide $*"
+	exec 1>&3
+	[ -n "$*" ] && echo "${SVCNAME} iprovide $*"
+	exec 1>&2
 } 
 depend() {
 	:
@@ -45,10 +55,10 @@ for SVCNAME in * ; do
 	[ -e /etc/conf.d/"${SVCNAME}" ] && . /etc/conf.d/"${SVCNAME}" >&2
 	
 	if . /etc/init.d/"${SVCNAME}" ; then
-		# Restore stdout now
 		exec 1>&3
-
 		echo "${SVCNAME}"
+		exec 1>&2
+
 	    depend
 
 		# Add any user defined depends
-- 
cgit v1.2.3