Import the latest baselayout changes. Merging revision 1648.

svn path=/baselayout-vserver/trunk/; revision=123

4 files changed, 21 insertions, 21 deletions

diff --git a/init.d/bootmisc b/init.d/bootmisc
index f9a76b3..5cc2907 100755
--- a/init.d/bootmisc
+++ b/init.d/bootmisc
@@ -15,17 +15,17 @@ start() {
 	# system startup is complete.
 	#
 	if [[ ${DELAYLOGIN} == "yes" ]] ; then
-		echo "System bootup in progress - please wait" > /etc/nologin
+		echo $"System bootup in progress - please wait" > /etc/nologin
 		cp /etc/nologin /etc/nologin.boot &> /dev/null
 	fi
 
 	if ! touch /var/run/.keep 2> /dev/null ; then
-		ewarn "Skipping /var and /tmp initialization (ro root?)"
+		ewarn $"Skipping /var and /tmp initialization (ro root?)"
 		return 0
 	fi
 
 	if [[ -x /sbin/env-update.sh ]] ; then
-		ebegin "Updating environment"
+		ebegin $"Updating environment"
 		/sbin/env-update.sh -u > /dev/null
 		eend 0
 	fi
@@ -35,12 +35,12 @@ start() {
 	#
 
 	if [[ -d /var/lib/net-scripts/state ]] ; then
-		ebegin "Cleaning /var/lib/net-scripts/state"
+		ebegin $"Cleaning" /var/lib/net-scripts/state
 		rm -rf /var/lib/net-scripts/state/*
 		eend 0
 	fi
 
-	ebegin "Cleaning /var/lock, /var/run"
+	ebegin $"Cleaning" /var/lock, /var/run
 	rm -rf /var/run/console.lock /var/run/console/*
 
 	#
@@ -71,7 +71,7 @@ start() {
 	if [[ -d /tmp ]] ; then
 		cd /tmp
 		if [[ ${WIPE_TMP} == "yes" ]] ; then
-			ebegin "Wiping /tmp directory"
+			ebegin $"Wiping /tmp directory"
 			# This eval stuff sucks, so if someone has a better *working*
 			# solution, please file a bug at http://bugs.gentoo.org/
 			# Originally ripped from Debian init scripts
@@ -92,7 +92,7 @@ start() {
 			eval find . -xdev -depth ${exceptions}   -type d -empty -exec rmdir '{}' \\';'
 			eend 0
 		else
-			ebegin "Cleaning /tmp directory"
+			ebegin $"Cleaning /tmp directory"
 			(
 				rm -f /tmp/.X*-lock /tmp/esrv* /tmp/kio* /tmp/jpsock.* /tmp/.fam*
 				rm -rf /tmp/.esd* /tmp/orbit-* /tmp/ssh-* /tmp/ksocket-* /tmp/.*-unix
diff --git a/init.d/domainname b/init.d/domainname
index 619ad38..5de43cd 100755
--- a/init.d/domainname
+++ b/init.d/domainname
@@ -9,7 +9,7 @@ depend() {
 
 checkconfig_nis() {
 	if [[ -f /etc/nisdomainname ]] ; then
-		ewarn "You should stop using /etc/nisdomainname and use /etc/conf.d/domainname"
+		ewarn $"You should stop using /etc/nisdomainname and use /etc/conf.d/domainname"
 		export NISDOMAIN=$(</etc/nisdomainname)
 		return 0
 	fi
@@ -18,13 +18,13 @@ checkconfig_nis() {
 
 checkconfig_dns() {
 	if [[ -f /etc/dnsdomainname ]] ; then
-		ewarn "You should stop using /etc/dnsdomainname and use /etc/conf.d/domainname"
+		ewarn $"You should stop using /etc/dnsdomainname and use /etc/conf.d/domainname"
 		export DNSDOMAIN=$(</etc/dnsdomainname)
 	fi
 	[[ -z ${DNSDOMAIN} ]] && return 1
 
 	if ! touch /etc/resolv.conf 2> /dev/null ; then
-		ewarn "Unable to set domain in resolv.conf (ro root?)"
+		ewarn $"Unable to set domain in resolv.conf (ro root?)"
 		return 1
 	else
 		return 0
@@ -39,21 +39,21 @@ start() {
 	local retval2=0
 
 	if checkconfig_nis ; then
-		ebegin "Setting NIS domainname to ${NISDOMAIN}"
+		ebegin $"Setting NIS domainname to" ${NISDOMAIN}
 		hostname -y "${NISDOMAIN}"
 		retval=$?
-		eend ${retval} "Failed to set the NIS domainname"
+		eend ${retval} $"Failed to set the NIS domainname"
 	fi
 
 	if checkconfig_dns ; then
-		ebegin "Setting DNS domainname to ${DNSDOMAIN}"
+		ebegin $"Setting DNS domainname to" ${DNSDOMAIN}
 		resolv=$(grep -v '^[[:space:]]*domain' /etc/resolv.conf)
 		[[ ${OVERRIDE} == "1" ]] \
 			&& resolv="${resolv}"$'\n'"domain ${DNSDOMAIN}" \
 			|| resolv="domain ${DNSDOMAIN}"$'\n'"${resolv}"
 		echo "${resolv}" > /etc/resolv.conf
 		retval2=$?
-		eend ${retval2} "Failed to set the DNS domainname"
+		eend ${retval2} $"Failed to set the DNS domainname"
 	fi
 
 	return $((retval + retval2))
diff --git a/init.d/hostname b/init.d/hostname
index 47c200a..0037aab 100755
--- a/init.d/hostname
+++ b/init.d/hostname
@@ -16,16 +16,16 @@ start() {
 	fi
 
 	if [[ -f /etc/hostname ]] ; then
-		ewarn "You should stop using /etc/hostname and use /etc/conf.d/hostname"
+		ewarn $"You should stop using /etc/hostname and use /etc/conf.d/hostname"
 		myhost=$(</etc/hostname)
 	else
 		myhost=${HOSTNAME}
 	fi
 
-	ebegin "Setting hostname to ${myhost}"
+	ebegin $"Setting hostname to" ${myhost}
 	hostname "${myhost}"
 	retval=$?
-	eend ${retval} "Failed to set the hostname"
+	eend ${retval} $"Failed to set the hostname"
 
 	if [[ ${retval} -eq 0 ]] ; then
 		# setup $HOSTNAME, ignore errors in case /etc is readonly.
diff --git a/init.d/local b/init.d/local
index b729e9d..550c0f0 100755
--- a/init.d/local
+++ b/init.d/local
@@ -7,7 +7,7 @@ depend() {
 }
 
 start() {
-	ebegin "Starting local"
+	ebegin $"Starting local"
 
 	# Add any misc programs that should be started
 	# to /etc/conf.d/local.start
@@ -15,11 +15,11 @@ start() {
 		source /etc/conf.d/local.start
 	fi
 
-	eend $? "Failed to start local"
+	eend $? $"Failed to start local"
 }
 
 stop() {
-	ebegin "Stopping local"
+	ebegin $"Stopping local"
 
 	# Add any misc programs that should be stopped
 	# to /etc/conf.d/local.stop
@@ -27,7 +27,7 @@ stop() {
 		source /etc/conf.d/local.stop
 	fi
 
-	eend $? "Failed to stop local"
+	eend $? $"Failed to stop local"
 }