sync branch and trunk; fix typos

svn path=/baselayout-vserver/branches/baselayout-1_12/; revision=140

5 files changed, 21 insertions, 20 deletions

diff --git a/bin/rc-status b/bin/rc-status
index 2056800..299383c 100755
--- a/bin/rc-status
+++ b/bin/rc-status
@@ -90,7 +90,7 @@ if [[ -z ${runlevel} ]] ; then
 	if [[ -e ${svcdir}/softlevel ]] ; then
 		runlevel=$(<${svcdir}/softlevel)
 	else
-		ewarn "Could not local current runlevel in ${svcdir}/softlevel"
+		ewarn "Could not locate current runlevel in ${svcdir}/softlevel"
 		if [[ -d ${runleveldir}/default ]] ; then
 			runlevel=default
 		else
diff --git a/etc/conf.d/rc b/etc/conf.d/rc
index 3fd51ec..3387538 100644
--- a/etc/conf.d/rc
+++ b/etc/conf.d/rc
@@ -41,7 +41,7 @@ RC_AUTO_INTERFACE="no"
 
 RC_VERBOSE="no"
 
-# RC_INITSTYLE_HACK allows it to use the old (obsoleted) init style of 
+# RC_INITSTYLE_HACK allows it to use the old (obsoleted) init style of
 # util-vserver
 
 RC_INITSTYLE_HACK="no"
diff --git a/mkrelease.sh b/mkrelease
index 8bf86f5..84eec7c 100755
--- a/mkrelease.sh
+++ b/mkrelease
@@ -5,30 +5,30 @@ svnroot="http://dev.croup.de/repos/gentoo-vps/${proj}"
 ver=${1:-1.13.0}
 
 usage() {
-       echo "Usage: mkrelease"
+	echo "Usage: mkrelease"
 }
 
 die() {
-       echo $1
-       exit ${2:-1}
+	echo $1
+	exit ${2:-1}
 }
 
 if [[ $1 != "-f" ]] ; then
-       echo "Performing sanity checks (run with -f to skip) ..."
-
-       # Check that we're updated
-       svnfiles="$( svn status 2>&1 | egrep -v '^(U|P)' )"
-       if [[ -n ${svnfiles} ]] ; then
-               echo "Refusing to package tarball until svn is in sync:"
-               echo "$svnfiles"
-               exit 1
-       fi
+	echo "Performing sanity checks (run with -f to skip) ..."
+
+	# Check that we're updated
+	svnfiles="$( svn status 2>&1 | egrep -v '^(U|P)' )"
+	if [[ -n ${svnfiles} ]] ; then
+		echo "Refusing to package tarball until svn is in sync:"
+		echo "$svnfiles"
+		exit 1
+	fi
 fi
 
 echo "Creating release tag... "
 
 svn copy ${svnroot}/trunk ${svnroot}/tags/release-${ver} \
-       -m "Tagging the ${ver} release of the ${proj} project" &>/dev/null || die "svn copy failed"
+	-m "Tagging the ${ver} release of the ${proj} project" &>/dev/null || die "svn copy failed"
 
 
 echo "Make dist tarball..."
@@ -38,7 +38,7 @@ dest=dist/${proj}-${ver}
 mkdir -p ${dest} &>/dev/null
 
 for x in bin etc init.d sbin src rc-lists man; do
-       svn export $x ${dest}/${x}
+	svn export $x ${dest}/${x}
 done
 
 mkdir -p ${dest}/lib/rcscripts
@@ -54,7 +54,7 @@ pushd dist/ &>/dev/null || die "pushd failed"
 tar cjf ${proj}-${ver}.tar.bz2 ${proj}-${ver} || die "tar failed"
 
 for i in *.tar*; do
-       md5sum $i > $i.md5
+	md5sum $i > $i.md5
 done
 
 echo "Tarball ist at `pwd`"
diff --git a/sbin/functions.sh b/sbin/functions.sh
index 0d899cf..5fc0adf 100644
--- a/sbin/functions.sh
+++ b/sbin/functions.sh
@@ -90,7 +90,7 @@ bootlog() {
 #    parameters.
 #
 get_bootconfig() {
-	export BOOTLEVEL="${newbootlevel}"
+	export BOOTLEVEL="boot"
 	export DEFAULTLEVEL="default"
 
 	return 0
diff --git a/sbin/rc b/sbin/rc
index 3f896b9..3a89d14 100755
--- a/sbin/rc
+++ b/sbin/rc
@@ -263,7 +263,8 @@ dep_stop() {
 
 	# If this is a 'net' service, we do not want to stop it if it was
 	# not in the previous runlevel, and we are not shutting down,
-	# rebooting.  This is because the user might have started it ...
+	# rebooting or going to single runlevel.  This is because the user
+	# (or hotplut) might have started it (net.ppp?) ...
 	if net_service "${myservice}" && \
 	   [[ ${SOFTLEVEL} != "reboot" && \
 	      ${SOFTLEVEL} != "shutdown" ]] ; then
@@ -350,7 +351,7 @@ if [[ ${SOFTLEVEL} == "reboot" || ${SOFTLEVEL} == "shutdown" ]] ; then
 	# should help speed things up a bit
 	rm -rf $(ls -d1 "${svcdir}/"* 2>/dev/null | \
 	         grep -ve '\(depcache\|deptree\|envcache\)')
-	
+
 	source /etc/init.d/halt.sh
 
 	# we just die here since we have no init