[Pkg-loop-aes-commits] r1413 - in /trunk/loop-aes-utils: ./ debian/initramfs-tools-hook debian/initramfs-tools-script

[xam at users.alioth.debian.org]

Author: xam
Date: Sat Aug 11 14:21:24 2007
New Revision: 1413

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1413
Log:
initramfs-tools >= 0.87 includes support for loading the keymap

Modified:
    trunk/loop-aes-utils/   (props changed)
    trunk/loop-aes-utils/debian/initramfs-tools-hook
    trunk/loop-aes-utils/debian/initramfs-tools-script

Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Aug 11 14:21:24 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9900
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9901
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-alternative:120
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-dpatch:196
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/trunk/current:338

Modified: trunk/loop-aes-utils/debian/initramfs-tools-hook
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/initramfs-tools-hook?rev=1413&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/initramfs-tools-hook (original)
+++ trunk/loop-aes-utils/debian/initramfs-tools-hook Sat Aug 11 14:21:24 2007
@@ -212,12 +212,6 @@
 
 copy_exec /sbin/losetup /sbin/
 
-# Allow the correct keymap to be loaded if possible
-if [ -e /bin/loadkeys -a -r /etc/console/boottime.kmap.gz ]; then
-	copy_exec /bin/loadkeys /bin/
-	cp /etc/console/boottime.kmap.gz $DESTDIR/etc/
-fi
-
 manual_add_modules loop
 if [ "${forced}" = no ]; then
     iterate_cipher_module "manual_add_modules" "$rootencryption"

Modified: trunk/loop-aes-utils/debian/initramfs-tools-script
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/initramfs-tools-script?rev=1413&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/initramfs-tools-script (original)
+++ trunk/loop-aes-utils/debian/initramfs-tools-script Sat Aug 11 14:21:24 2007
@@ -124,13 +124,6 @@
     done
 }
 
-load_keymap()
-{
-	if [ -x /bin/loadkeys -a -r /etc/boottime.kmap.gz ]; then
-		loadkeys -q /etc/boottime.kmap.gz
-	fi
-}
-
 #
 # Begin real processing
 #
@@ -154,9 +147,6 @@
       sleep 1
 done
 
-# If possible, load the keymap so that the user can input non-en characters
-load_keymap
-
 # Use /sbin/losetup to make sure that we get the loopaes modified one,
 # not the busybox one.
 /sbin/losetup ${losetup_opts} "${rootloop}" "$ROOT"