Bug#261073: on serial console installs, file descriptor error

[Recai Oktas]

* Recai Oktas [2004-07-24 04:26:56+0300]
[...]
> Either we should install S30kbd-chooser to /lib/debian-installer.d/
> (i.e. S31kbd-chooser) or we could completely move it to rootskel
> package.  I think the former sounds more reasonable as for the package
> maintainer convenience.

Attached is my proposal.  It also includes the proper handling of 
unicode mode. 

-- 
roktas

diff -ru kbd-chooser.orig/debian/dirs kbd-chooser/debian/dirs
--- kbd-chooser.orig/debian/dirs        2004-03-26 03:48:15.000000000 +0200
+++ kbd-chooser/debian/dirs     2004-07-24 05:51:50.000000000 +0300
@@ -1,4 +1,5 @@
 usr/bin
 etc/rcS.d
 usr/lib/prebaseconfig.d
+/lib/debian-installer.d
 
diff -ru kbd-chooser.orig/debian/rules kbd-chooser/debian/rules
--- kbd-chooser.orig/debian/rules       2004-03-26 07:50:32.000000000 +0200
+++ kbd-chooser/debian/rules    2004-07-24 05:52:41.000000000 +0300
@@ -37,7 +37,7 @@
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/kbd-chooser
        install -m0755 debian/prebaseconfig  
debian/$(PACKAGE)/usr/lib/prebaseconfig.d/70kbd-chooser
-       install -m0755 debian/S55kbd-chooser debian/$(PACKAGE)/etc/rcS.d/S55kbd-chooser
+       install -m0755 debian/S55kbd-chooser 
debian/$(PACKAGE)/lib/debian-installer.d/S55kbd-chooser
 
 # Build architecture-independent files here.
 binary-indep: 
@@ -54,7 +54,7 @@
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol -- -n$(FILENAME)
-       rm debian/$(PACKAGE)/DEBIAN/conffiles
+       rm -f debian/$(PACKAGE)/DEBIAN/conffiles
        dh_builddeb --filename=$(FILENAME)
 
 binary: binary-indep binary-arch
diff -ru kbd-chooser.orig/debian/S55kbd-chooser kbd-chooser/debian/S55kbd-chooser
--- kbd-chooser.orig/debian/S55kbd-chooser      2004-07-04 20:05:14.000000000 +0300
+++ kbd-chooser/debian/S55kbd-chooser   2004-07-24 05:51:50.000000000 +0300
@@ -1,15 +1,14 @@
-#!/bin/sh
 kbdchooser=/usr/bin/kbd-chooser
 kbdmode=/usr/bin/kbd-mode
 
-set -e
+if [ "$TERM_TYPE" = virtual ]; then
+       # Set console mode to unicode, if necessary.
+       if [ -n "$TERM_UTF8" ] && [ -x $kbdmode ]; then
+               $kbdmode -u
+       fi
 
-# Set console mode to unicode
-if [ -x "$kbdmode" ] ; then
-       $kbdmode -u || true
-fi
-
-# Set the kbd early, if necessary
-if [ -x "$kbdchooser" -a "$bootkbd" ] ; then
-       $kbdchooser $bootkbd
+       # Set the kbd early, if necessary.
+       if [ -n "$bootkbd" ] && [ -x $kbdchooser ]; then
+               $kbdchooser $bootkbd
+       fi
 fi

signature.asc
Description: Digital signature