Add keyboard layout switch to d-i

  * control: Make hurd-udeb depend on xkb-data-udeb. Make hurd
    conflict/replace console-driver-xkb.
  * rules: Add empty compose file for hurd-udeb.
  * hurd.install: Do not install empty compose file.
  * local/runsystem: Read keyboard layout from console-setup, restart the
  console automatically.

5 files changed, 35 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index fe7a39eb..4cc4ee84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+hurd (20120710-2) UNRELEASED; urgency=low
+
+  * control: Make hurd-udeb depend on xkb-data-udeb. Make hurd
+    conflict/replace console-driver-xkb.
+  * rules: Add empty compose file for hurd-udeb.
+  * hurd.install: Do not install empty compose file.
+  * local/runsystem: Read keyboard layout from console-setup, restart the
+  console automatically.
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 11 Jul 2012 12:32:57 +0000
+
 hurd (20120710-1) unstable; urgency=low
 
   * New upstream snapshot.
diff --git a/debian/control b/debian/control
index b3165d1e..cdf31430 100644
--- a/debian/control
+++ b/debian/control
@@ -20,9 +20,9 @@ Depends: ${misc:Depends}, sysv-rc, netdde (>= 0.0.20120518~), libc0.3 (>= 2.13-3
 Breaks: gnumach (<< 2:1.3.99.dfsg.cvs20070526-1), libc0.3 (<< 2.11.2-12)
 Suggests: hurd-doc
 Recommends: bf-utf-source
-Provides: makedev, login
-Replaces: makedev, login, random-egd
-Conflicts: makedev, login
+Provides: makedev, login, console-driver-xkb
+Replaces: makedev, login, random-egd, console-driver-xkb
+Conflicts: makedev, login, console-driver-xkb
 Architecture: hurd-any
 Description: GNU Hurd
  This is the GNU Hurd package. It contains essential system software and
@@ -62,7 +62,7 @@ Priority: optional
 Section: debian-installer
 Architecture: hurd-any
 XC-Package-Type: udeb
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, xkb-data-udeb
 Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules, loop-modules, mouse-modules, nfs-modules, socket-modules, ufs-modules
 Description: GNU Hurd - udeb
  This is the GNU Hurd udeb package. It contains essential system software and
diff --git a/debian/hurd.install b/debian/hurd.install
index 247bb69f..f7e07063 100644
--- a/debian/hurd.install
+++ b/debian/hurd.install
@@ -67,4 +67,4 @@ debian/tmp/etc/login/README
 debian/tmp/etc/ttys
 debian/tmp/dev/MAKEDEV
 debian/tmp/share/msgids/hurd.msgids usr/share/msgids
-debian/tmp/usr/share/X11
+debian/tmp/usr/share/X11/xkb
diff --git a/debian/local/runsystem b/debian/local/runsystem
index 198c0f84..b35131af 100755
--- a/debian/local/runsystem
+++ b/debian/local/runsystem
@@ -55,13 +55,25 @@ then
         touch /dev/tty1
 
         echo -n "Starting the Hurd console..."
-        console -d vga -g -d pc_mouse --repeat=mouse -d pc_kbd --repeat=kbd -c /dev/vcs &
-        sleep 1
+	while true
+	do
+		LAYOUT=""
+		if [ -f /etc/default/keyboard ]
+		then
+			. /etc/default/keyboard
+			[ -z "$XKBLAYOUT" ] || LAYOUT="--keymap $XKBLAYOUT"
+		fi
+        	console -d vga -g -d pc_mouse --repeat=mouse -d pc_kbd --repeat=kbd $LAYOUT -c /dev/vcs &
+		echo $! > /var/run/hurd-console.pid
+		wait
+		echo
+		echo -n "Restarting the Hurd console..."
+	done &
 
         # Switch over
         envvars="$envvars TERM=hurd"
         exec < /dev/tty1 > /dev/tty1 2>&1
-        echo "Console started, initializing installer environment, please wait..."
+        echo "Console started"
 
         # Set the console device used by /sbin/reopen-console
         echo /dev/tty1 >/var/run/console-device
diff --git a/debian/rules b/debian/rules
index a2c77a78..2a9c2e6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,10 @@ install/hurd::
 
 	$(MAKE) -C libdde_linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install
 
+	mkdir -p debian/tmp/usr/share/X11/locale
+	echo Compose C > debian/tmp/usr/share/X11/compose.dir
+	touch debian/tmp/usr/share/X11/Compose
+
 install/hurd-dev::
 	install -m644 debian/local/soundcard.h debian/tmp/include/sys
 	install -m644 debian/local/cdrom.h debian/tmp/include/sys