X-Git-Url: http://git.pld-linux.org/?p=packages%2Fconsole-tools.git;a=blobdiff_plain;f=console.init;h=1ed11aa097bd480aa6d139272363f7773b567cc6;hp=9f87cc0f46a57a13704d21c85c3e104ef0e87ad2;hb=HEAD;hpb=17d1285dd9eacd467c23d858d9ca39cae8d8647a

diff --git a/console.init b/console.init
index 9f87cc0..1ed11aa 100644
--- a/console.init
+++ b/console.init
@@ -20,46 +20,30 @@
 . /etc/rc.d/init.d/functions
 
 case "$1" in
-	start|restart)
-		. /etc/sysconfig/console
+  start|restart|reload|force-reload)
+	. /etc/sysconfig/console
 
-		if [ "$SVGATEXTMODE" != "" ]
-		then
-			SVGATextMode $SVGATEXTMODE
-		fi
-		if [ "$CONSOLEFONT" != "" ]
-		then
-			show "Loading console font"
-			busy
-			consolechars -f $CONSOLEFONT > /dev/null 2>&1
-			deltext;ok
-			# Don't use "" here because additional options may be
-			# specified after the font name (e.g. fallback tables)
-		fi
-		if [ "$CONSOLEMAP" != "" ]
-		then
-			show "Loading console map"
-			busy
-			consolechars -m $CONSOLEMAP > /dev/null 2>&1
-			deltext;ok
-		fi
-		if [ "$KEYTABLE" != "" ]
-		then
-			show "Loading keyboard table"
-			busy
-			loadkeys $KEYTABLE > /dev/null 2>&1
-		        deltext;ok
-		fi
-		;;
-	stop)
-		# Nothing to stop
-		;;
-	status)
-		# Nothing to report
-		;;
-	*)
-		msg_Usage "$0 {start|stop|status|restart}"
-		exit 1
+	if [ -n "$SVGATEXTMODE" ]; then
+		run_cmd "$(nls 'Setting Text Mode') $SVGATEXTMODE" SVGATextMode $SVGATEXTMODE
+	fi
+	if [ -n "$FBSET" ]; then
+		run_cmd "$(nls 'Setting Text Mode') $FBSET" fbset -a $FBSET
+	fi
+	if [ -n "$CONSOLEFONT" ]; then
+		run_cmd "Loading console font and map" consolechars -m ${CONSOLEMAP:-trivial.trans} -f $CONSOLEFONT
+		# Don't use "" here because additional options may be
+		# specified after the font name (e.g. fallback tables)
+	fi
+	if [ -n "$KEYTABLE" ]; then
+		run_cmd "Loading keyboard table" loadkeys $KEYTABLE < /dev/tty0 > /dev/tty0
+	fi
+	;;
+  stop|status)
+	# Nothing to stop and/or report
+	;;
+  *)
+	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	exit 3
 esac
 
 exit 0