[Pkg-kbd-commit] r207 - people/zinoviev/console-setup/debian

[Anton Zinoviev]

Author: zinoviev
Date: 2006-09-16 11:57:59 +0000 (Sat, 16 Sep 2006)
New Revision: 207

Modified:
   people/zinoviev/console-setup/debian/console-setup.console-setup.init
   people/zinoviev/console-setup/debian/console-setup.keyboard-setup.init
   people/zinoviev/console-setup/debian/control
Log:
console-setup: use /lib/lsb/init-functions when available


Modified: people/zinoviev/console-setup/debian/console-setup.console-setup.init
===================================================================
--- people/zinoviev/console-setup/debian/console-setup.console-setup.init	2006-09-16 11:02:31 UTC (rev 206)
+++ people/zinoviev/console-setup/debian/console-setup.console-setup.init	2006-09-16 11:57:59 UTC (rev 207)
@@ -4,6 +4,22 @@
 
 test -f /bin/setupcon || exit 0
 
+if [ -f /lib/lsb/init-functions ]; then
+    . /lib/lsb/init-functions
+else
+    log_action_begin_msg () {
+	echo -n "$@... "
+    }
+
+    log_action_end_msg () {
+	if [ "$1" -eq 0 ]; then 
+	    echo done.
+	else
+	    echo failed.
+	fi
+    }
+fi
+
 case "$1" in
     stop)
         # console-setup isn't a daemon
@@ -11,9 +27,12 @@
     start|force-reload|restart|reload)
 	case `readlink /proc/self/fd/2` in
 	    /dev/tty[0-9]*|/dev/vc/[0-9]*|/dev/console)
-	        echo -n "Setting up font and keyboard on the console... "
-		setupcon
-		echo done.
+	        log_action_begin_msg "Setting up console font and keymap"
+		if setupcon; then
+		    log_action_end_msg 0
+		else
+		    log_action_end_msg $?
+		fi
 		;;
 	    *)
 		exit 0 

Modified: people/zinoviev/console-setup/debian/console-setup.keyboard-setup.init
===================================================================
--- people/zinoviev/console-setup/debian/console-setup.keyboard-setup.init	2006-09-16 11:02:31 UTC (rev 206)
+++ people/zinoviev/console-setup/debian/console-setup.keyboard-setup.init	2006-09-16 11:57:59 UTC (rev 207)
@@ -4,6 +4,22 @@
 
 test -f /bin/setupcon || exit 0
 
+if [ -f /lib/lsb/init-functions ]; then
+    . /lib/lsb/init-functions
+else
+    log_action_begin_msg () {
+	echo -n "$@... "
+    }
+
+    log_action_end_msg () {
+	if [ "$1" -eq 0 ]; then 
+	    echo done.
+	else
+	    echo failed.
+	fi
+    }
+fi
+
 case "$1" in
     stop)
         # keyboard-setup isn't a daemon
@@ -11,9 +27,12 @@
     start|force-reload|restart|reload)
 	case `readlink /proc/self/fd/2` in
 	    /dev/tty[0-9]*|/dev/vc/[0-9]*|/dev/console)
-	        echo -n "Preliminary setting the keyboard on the console... "
-		setupcon -k
-		echo done.
+	        log_action_begin_msg "Setting preliminary keymap..."
+		if setupcon -k; then
+		    log_action_end_msg 0
+		else
+		    log_action_end_msg $?
+		fi
 		;;
 	    *)
 		exit 0 

Modified: people/zinoviev/console-setup/debian/control
===================================================================
--- people/zinoviev/console-setup/debian/control	2006-09-16 11:02:31 UTC (rev 206)
+++ people/zinoviev/console-setup/debian/control	2006-09-16 11:57:59 UTC (rev 207)
@@ -12,6 +12,8 @@
 Architecture: all
 Recommends: kbd (>= 0.99-12) | console-tools (>= 1:0.2.3-16)
 Depends: debconf (>= 0.5) | debconf-2.0, console-terminus (>= 4.16), xkb-data
+Suggests: lsb-base (>= 3.0-6)
+Conflicts: lsb-core (<< 2.0-6), lsb (<< 2.0-6), lsb-base (<< 3.0-6)
 Description: Setup the font and the keyboard on the console
  The package provides the Linux console with the same versatile
  keyboard configuration that X Window uses.  As a result there is no
@@ -31,7 +33,8 @@
 Architecture: all
 Recommends: kbd | console-tools
 Depends: debconf (>= 0.5) | debconf-2.0
-Conflicts: console-setup, console-terminus
+Suggests: lsb-base (>= 3.0-6)
+Conflicts: console-setup, console-terminus, lsb-core (<< 2.0-6), lsb (<< 2.0-6), lsb-base (<< 3.0-6)
 Description: An experimental micro version of console-setup package
  This package can be useful when Debian system is installed on
  handhelds or other devices with small storage space.  It was created