rc-scripts/branches/vserver: man/Makefile.am man/initlog.1 rc.d/init.d/functions rc.d/rc.sysinit src...

[baggins]

Author: baggins
Date: Sun Oct 16 20:48:24 2005
New Revision: 6445

Removed:
   rc-scripts/branches/vserver/man/initlog.1
   rc-scripts/branches/vserver/src/initlog.c
   rc-scripts/branches/vserver/src/initlog.conf
   rc-scripts/branches/vserver/src/initlog.h
   rc-scripts/branches/vserver/src/minilogd.c
   rc-scripts/branches/vserver/src/process.c
   rc-scripts/branches/vserver/src/process.h
Modified:
   rc-scripts/branches/vserver/man/Makefile.am
   rc-scripts/branches/vserver/rc.d/init.d/functions
   rc-scripts/branches/vserver/rc.d/rc.sysinit
   rc-scripts/branches/vserver/src/Makefile.am
Log:
- killed initlog/minilogd and users, misfeature causing problems
  with left-over processes


Modified: rc-scripts/branches/vserver/man/Makefile.am
==============================================================================
--- rc-scripts/branches/vserver/man/Makefile.am	(original)
+++ rc-scripts/branches/vserver/man/Makefile.am	Sun Oct 16 20:48:24 2005
@@ -6,7 +6,6 @@
 	consoletype.1 \
 	doexec.1 \
 	genhostid.1 \
-	initlog.1 \
 	ipcalc.1 \
 	netreport.1 \
 	usleep.1 \

Modified: rc-scripts/branches/vserver/rc.d/init.d/functions
==============================================================================
--- rc-scripts/branches/vserver/rc.d/init.d/functions	(original)
+++ rc-scripts/branches/vserver/rc.d/init.d/functions	Sun Oct 16 20:48:24 2005
@@ -93,24 +93,6 @@
 
 if is_yes "$FASTRC"; then
 	INIT_DOTS=$(awk "BEGIN{for(\$i=0;\$i<$INIT_COL;\$i++)printf(\".\");}")
-	initlog()
-	{
-		RESULT=0
-		while [ "$1" != "${1##-}" ] || [ "$1" != "${1##+}" ]; do
-			case $1 in
-				-c)
-					shift
-					$1
-					RESULT=$?
-					break
-					;;
-				 *)
-					shift
-					;;
-			esac
-		done
-		return $RESULT
-	}
 fi
 
 kernelver()
@@ -406,12 +388,10 @@
 	show "$message"; busy
 	shift
 	cd /
-	if errors=$(HOME=/tmp TMPDIR=/tmp initlog -c "$*" 2>&1); then
+	if errors=$(HOME=/tmp TMPDIR=/tmp $* 2>&1); then
 		ok
-		log_success "$1 $message"
 	else
 		fail
-		log_failed "$1 $message"
 		exit_code=1
 	fi
 	[ -n "$errors" ] && [ $exit_code -eq 1 -o $force_err -eq 1 ] && echo "$errors"
@@ -491,7 +471,7 @@
 	# And start it up.
 	busy
 	cd /
-	if errors=$(umask ${SERVICE_UMASK:-$DEFAULT_SERVICE_UMASK}; USER=root HOME=/tmp TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} initlog -c "$prog" 2>&1); then
+	if errors=$(umask ${SERVICE_UMASK:-$DEFAULT_SERVICE_UMASK}; USER=root HOME=/tmp TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} $prog 2>&1); then
 		if [ -n "$waitname" -a -n "$waittime" ]; then
 			# Save basename.
 			base=$(basename "$waitname")
@@ -504,12 +484,10 @@
 				checkpid $pid && sleep 1 || break
 			done
 		fi
-		log_success "$1 startup"
 		ok
 	else
 		exit_code=1
 		fail
-		log_failed "$1 startup"
 		[ -n "$errors" ] && echo "$errors"
 	fi
 	return $exit_code
@@ -581,10 +559,8 @@
 			result=$?
 			if [ "$result" -eq 0 ]; then
 				fail
-				log_failed "$1 shutdown"
 			else
 				ok
-				log_success "$1 shutdown"
 			fi
 			result=$(( ! $result ))
 		else
@@ -594,21 +570,17 @@
 				result=$?
 				if [ "$result" -eq 0 ]; then
 					ok
-					log_success "$1 got $killlevel"
 				else
 					result=7
 					fail
-					log_failed "$1 didn't get $killlevel"
 				fi
 			else
 				result=7
 				died
-				log_failed "$1 shutdown"
 			fi
 		fi
 	else
 		died
-		log_failed "$1 shutdown"
 		result=7
 	fi
 	
@@ -783,12 +755,10 @@
 
 log_success ()
 {
-	initlog -n $0 -s "$1 $2" -e 1
 }
 
 log_failed ()
 {
-	initlog -n $0 -s "$1 $2" -e 2
 }
 
 # RedHat/Mandrake specific functions

Modified: rc-scripts/branches/vserver/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/branches/vserver/rc.d/rc.sysinit	(original)
+++ rc-scripts/branches/vserver/rc.d/rc.sysinit	Sun Oct 16 20:48:24 2005
@@ -103,12 +103,6 @@
 	ok
 fi
 
-# The root filesystem is now read-write, so we can now log via
-# syslog() directly...
-if [ -n "$IN_INITLOG" ]; then
-	IN_INITLOG=""
-fi
-
 [ -n "$SELINUX" ] && [ -f /.autorelabel ] && relabel_selinux
 
 # Turn on process accounting

Modified: rc-scripts/branches/vserver/src/Makefile.am
==============================================================================
--- rc-scripts/branches/vserver/src/Makefile.am	(original)
+++ rc-scripts/branches/vserver/src/Makefile.am	Sun Oct 16 20:48:24 2005
@@ -6,9 +6,6 @@
 
 DEFS = @DEFS@ -D_GNU_SOURCE=1 -DSBINDIR=\""@sbindir@"\"
 
-sysconf_DATA = \
-	initlog.conf
-
 bin_PROGRAMS = \
 	doexec \
 	ipcalc \
@@ -19,9 +16,7 @@
 	consoletype \
 	genhostid \
 	getkey \
-	initlog \
 	loglevel \
-	minilogd \
 	netreport \
 	start-stop-daemon
 	
@@ -48,9 +43,6 @@
 
 loglevel_SOURCES = loglevel.c
 
-initlog_SOURCES = initlog.c initlog.h process.c process.h
-initlog_LDADD = -lpopt
-
 getkey_SOURCES = getkey.c
 getkey_LDADD = -lpopt