Control: tags -1 patch
Hi.
On Thu, 24 Dec 2015 18:08:54 -0300 Felipe Sateler <fsate...@debian.org> wrote:
> On Sat, 22 Aug 2015 21:41:32 -0300 fsate...@debian.org wrote:
> > Your package console-common has an initscript that is enabled in
> > runlevel S, but it does not provide a corresponding systemd service
> > unit.
>
> I think this init script can go. It does nothing when setupcon from
> console-setup is installed. The changelog indicates this change was
> made back in 2006. Given the prevalence of console-setup[1], I think
> it is now time to retire the init script as it has been superseded by
> console-setup.
>
Please find attached a patch that implements dropping the keymap.sh script.
Saludos
diff -Nru console-common-0.7.88/debian/changelog
console-common-0.7.88+nmu1/debian/changelog
--- console-common-0.7.88/debian/changelog 2013-12-16 06:30:51.000000000
-0300
+++ console-common-0.7.88+nmu1/debian/changelog 2015-12-25 13:36:23.000000000
-0300
@@ -1,3 +1,10 @@
+console-common (0.7.88+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop keymap.sh script, superseded in favor of console-setup
+
+ -- Felipe Sateler <fsate...@debian.org> Fri, 25 Dec 2015 13:34:51 -0300
+
console-common (0.7.88) unstable; urgency=medium
* Remove optional dependency on console-tools, which has been removed.
diff -Nru console-common-0.7.88/debian/console-common.maintscript
console-common-0.7.88+nmu1/debian/console-common.maintscript
--- console-common-0.7.88/debian/console-common.maintscript 1969-12-31
21:00:00.000000000 -0300
+++ console-common-0.7.88+nmu1/debian/console-common.maintscript
2015-12-25 13:38:05.000000000 -0300
@@ -0,0 +1 @@
+rm_conffile /etc/init.d/keymap.sh 0.7.88+nmu1~
diff -Nru console-common-0.7.88/debian/console-common.postinst
console-common-0.7.88+nmu1/debian/console-common.postinst
--- console-common-0.7.88/debian/console-common.postinst 2013-12-16
06:12:55.000000000 -0300
+++ console-common-0.7.88+nmu1/debian/console-common.postinst 2015-12-25
17:43:18.000000000 -0300
@@ -2,4 +2,9 @@
set -e
+# remove stale keymap.sh links
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt "0.7.88+nmu1~" ;
then
+ update-rc.d -f keymap.sh remove > /dev/null || true
+fi
+
#DEBHELPER#
diff -Nru console-common-0.7.88/debian/keymap.sh
console-common-0.7.88+nmu1/debian/keymap.sh
--- console-common-0.7.88/debian/keymap.sh 2013-12-16 06:27:02.000000000
-0300
+++ console-common-0.7.88+nmu1/debian/keymap.sh 1969-12-31 21:00:00.000000000
-0300
@@ -1,139 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: keymap
-# Required-Start: mountdevsubfs
-# Required-Stop:
-# Default-Start: S
-# Default-Stop:
-# X-Interactive: true
-# Short-Description: Set keymap
-# Description: Set the Console keymap
-### END INIT INFO
-
-# If setupcon is present, then we've been superseded by console-setup.
-if type setupcon >/dev/null 2>&1; then
- exit 0
-fi
-
-. /lib/lsb/init-functions
-
-#
-# Load the keymaps *as soon as possible*
-#
-
-# Don't fail on error
-CONSOLE_TYPE=`fgconsole 2>/dev/null` || CONSOLE_TYPE="unknown"
-
-# Don't fail on serial consoles
-
-QUIT=0
-# fail silently if loadkeys not present (yet).
-command -v loadkeys >/dev/null 2>&1 || QUIT=1
-
-CONFDIR=/etc/console
-CONFFILEROOT=boottime
-EXT=kmap
-CONFFILE=${CONFDIR}/${CONFFILEROOT}.${EXT}.gz
-
-reset_kernel()
-{
- # On Mac PPC machines, we may need to set kernel vars first
- # We need to mount /proc to do that; not optimal, as its going to
- # be mounted in S10checkroot, but we need it set up before sulogin
- # may be run in checkroot, which will need the keyboard to log in...
- [ -x /sbin/sysctl ] || return
- [ -r /etc/sysctl.conf ] || return
- grep -v '^\#' /etc/sysctl.conf | grep -q keycodes
- if [ "$?" = "0" ] ; then
- grep keycodes /etc/sysctl.conf | grep -v "^#" | while read d ; do
- /sbin/sysctl -w $d 2> /dev/null || true
- done
- fi
-}
-
-unicode_start_stop()
-{
- # Switch unicode mode by checking the locale.
- # This will be needed before loading the keymap.
- command -v unicode_start > /dev/null || return
- command -v unicode_stop > /dev/null || return
-
- ENV_FILE=""
- [ -r /etc/environment ] && ENV_FILE="/etc/environment"
- [ -r /etc/default/locale ] && ENV_FILE="/etc/default/locale"
- [ "$ENV_FILE" ] && CHARMAP=$(set -a && . "$ENV_FILE" && locale charmap)
- if [ "$CHARMAP" = "UTF-8" ]; then
- unicode_start 2> /dev/null || true
- else
- unicode_stop 2> /dev/null || true
- fi
-}
-
-if [ ! $QUIT = '1' ] ; then
-
- case "$1" in
- start | restart | force-reload | reload)
-
- # Set kernel variables if required
- reset_kernel
-
- # First mount /proc if necessary...and if it is there (#392798)
- unmount_proc="no"
- if [ -d /proc ]; then
- if [ ! -x /proc/$$ ]; then
- unmount_proc="yes"
- mount -n /proc
- fi
-
-
- if [ -f /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ] ;
then
- linux_keycodes=`cat
/proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes`
- else
- linux_keycodes=1;
- fi
- else
- linux_keycodes=1;
- fi
-
- # load new map
- if [ $linux_keycodes -gt 0 ] ; then
- if [ -r ${CONFFILE} ] ; then
-
- # Switch console mode to UTF-8 or ASCII as necessary
- unicode_start_stop
-
- if [ $CONSOLE_TYPE = "serial" ] ; then
- loadkeys -q ${CONFFILE} 2>&1 > /dev/null
- else
- loadkeys -q ${CONFFILE}
- fi
- if [ $? -gt 0 ]
- then
- # if we've a serial console, we may not have a keyboard, so
don't
- # complain if we fail.
- if [ ! $CONSOLE_TYPE = "serial" ]; then
- log_warning_msg "Problem when loading
${CONFDIR}/${CONFFILEROOT}.${EXT}.gz, use install-keymap"
- sleep 10
- fi
- fi
- fi
- fi
-
- # unmount /proc if we mounted it
- [ "$unmount_proc" = "no" ] || umount -n /proc
-
- ;;
-
- stop)
- ;;
-
- status)
- exit 0
- ;;
-
- *)
- log_warning_msg "Usage: $0
{start|stop|restart|reload|force-reload|status}"
- ;;
- esac
-
-fi
diff -Nru console-common-0.7.88/debian/rules
console-common-0.7.88+nmu1/debian/rules
--- console-common-0.7.88/debian/rules 2011-12-04 13:54:19.000000000 -0300
+++ console-common-0.7.88+nmu1/debian/rules 2015-12-25 13:35:59.000000000
-0300
@@ -57,7 +57,6 @@
dh_installdebconf
dh_install
dh_installdocs TODO
- DH_OPTIONS= dh_installinit -pconsole-common --init-script=keymap.sh -r
-u"start 05 S ."
dh_installchangelogs
dh_compress
dh_fixperms
