[Glibc-bsd-commits] r1705 - trunk/freebsd-utils/debian

[Aurelien Jarno]

Author: aurel32
Date: 2006-11-07 16:05:06 +0100 (Tue, 07 Nov 2006)
New Revision: 1705

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/kbdcontrol.init.d
   trunk/freebsd-utils/debian/kbdcontrol.postinst
   trunk/freebsd-utils/debian/rules
Log:
  * Add start/stop options to /etc/init.d/kbdcontrol
  * Add LSB section to /etc/init.d/kbdcontrol
  * Use debhelper code to call /etc/init.d/kbdcontrol



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-11-07 14:37:07 UTC (rev 1704)
+++ trunk/freebsd-utils/debian/changelog	2006-11-07 15:05:06 UTC (rev 1705)
@@ -8,8 +8,11 @@
 
   [ Aurelien Jarno ]
   * Bumped Standards-Version to 3.7.2 (no changes).
+  * Add start/stop options to /etc/init.d/module-init-tools
   * Add LSB section to /etc/init.d/module-init-tools
-  * Add start/stop options to /etc/init.d/module-init-tools
+  * Add start/stop options to /etc/init.d/kbdcontrol
+  * Add LSB section to /etc/init.d/kbdcontrol
+  * Use debhelper code to call /etc/init.d/kbdcontrol
   * Drop/adjust dependencies on non-official version of the glibc. 
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sat,  4 Nov 2006 16:24:54 +0100

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-11-07 14:37:07 UTC (rev 1704)
+++ trunk/freebsd-utils/debian/control	2006-11-07 15:05:06 UTC (rev 1705)
@@ -17,7 +17,7 @@
 Depends: ${shlibs:Depends}, net-tools | freebsd-hackedutils
 Replaces: freebsd-hackedutils (<= 5.2.1-29)
 Description: FreeBSD utilities needed for GNU/kFreeBSD.
- FreeBSD utilities needed for GNU/kFreeBSD.
+ This package contains FreeBSD utilities needed for GNU/kFreeBSD.
 
 Package: module-init-tools
 Architecture: kfreebsd-i386 kfreebsd-amd64

Modified: trunk/freebsd-utils/debian/kbdcontrol.init.d
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.init.d	2006-11-07 14:37:07 UTC (rev 1704)
+++ trunk/freebsd-utils/debian/kbdcontrol.init.d	2006-11-07 15:05:06 UTC (rev 1705)
@@ -1,4 +1,13 @@
 #! /bin/sh
+### BEGIN INIT INFO
+# Provides:             keymap
+# Required-Start:       
+# Required-Stop:
+# Default-Start:        S
+# Default-Stop:
+# Short-Description:    Set keymap
+# Description:          Set the Console keymap
+### END INIT INFO
 #
 # skeleton	example file to build /etc/init.d/ scripts.
 #		This file should be used to construct scripts for /etc/init.d.
@@ -15,10 +24,29 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 which kbdcontrol >/dev/null
 
-if test -e /etc/kbdcontrol.conf ; then
-  echo -n "Loading console keymap..."
-  kbdcontrol -l `grep -v ^# /etc/kbdcontrol.conf` < /dev/console
-  echo "done."
-fi
+do_start() {
+	if test -e /etc/kbdcontrol.conf ; then
+		echo -n "Loading console keymap..."
+		kbdcontrol -l `grep -v ^# /etc/kbdcontrol.conf` < /dev/console
+		echo "done."
+	fi
+}
 
+case "$1" in
+  start|"")
+	do_start
+	;;
+  restart|reload|force-reload)
+	echo "Error: argument '$1' not supported" >&2
+	exit 3
+	;;
+  stop)
+	# No-op
+	;;
+  *)
+	echo "Usage: mountall.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
 exit 0

Modified: trunk/freebsd-utils/debian/kbdcontrol.postinst
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.postinst	2006-11-07 14:37:07 UTC (rev 1704)
+++ trunk/freebsd-utils/debian/kbdcontrol.postinst	2006-11-07 15:05:06 UTC (rev 1705)
@@ -14,14 +14,12 @@
         rm -f /etc/kbdcontrol.conf
       else
         cat > /etc/kbdcontrol.conf << EOF
-# Do not edit this file!  It is automaticaly generated by kbdcontrol
+# Do not edit this file!  It is automatically generated by kbdcontrol
 # Use "dpkg-reconfigure kbdcontrol" instead.
 $RET
 EOF
       fi
 
-      # apply changes (if any)
-      /etc/init.d/kbdcontrol start
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-11-07 14:37:07 UTC (rev 1704)
+++ trunk/freebsd-utils/debian/rules	2006-11-07 15:05:06 UTC (rev 1705)
@@ -4,7 +4,7 @@
   
 DEB_TAR_SRCDIR                  := src
 DEB_AUTO_CLEANUP_RCS            := yes
-DEB_DH_INSTALLINIT_ARGS		:= --no-start --update-rcd-params="start 20 S ."
+DEB_DH_INSTALLINIT_ARGS		:= --update-rcd-params="start 20 S ."
 
 package=freebsd-utils