[Debian-live-changes] r1328 - in dists/trunk/live-initramfs: doc hooks

[Daniel Baumann]

Author: daniel
Date: 2007-05-06 16:17:31 +0000 (Sun, 06 May 2007)
New Revision: 1328

Modified:
   dists/trunk/live-initramfs/doc/ChangeLog
   dists/trunk/live-initramfs/hooks/live
Log:


Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 15:33:33 UTC (rev 1327)
+++ dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 16:17:31 UTC (rev 1328)
@@ -9,6 +9,10 @@
 	  - Added patch to add missing and new stuff.
 	* conf/live.conf, scripts/live, scripts/live-bottom/18hostname:
 	  - Added patch to rename $HOST to $HOSTNAME.
+	* hooks/live:
+	  - Added patch to allow custom keymap when using encryption.
+	  - Added patch to make ubuntu specific calls conditional.
+	  - Added patch to read configuration earlier.
 
 2007-05-06  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/hooks/live
===================================================================
--- dists/trunk/live-initramfs/hooks/live	2007-05-06 15:33:33 UTC (rev 1327)
+++ dists/trunk/live-initramfs/hooks/live	2007-05-06 16:17:31 UTC (rev 1328)
@@ -18,6 +18,11 @@
 
 . /usr/share/initramfs-tools/hook-functions
 
+if [ -e /etc/live.conf ]; then
+    mkdir -p ${DESTDIR}/etc
+    cp /etc/live.conf ${DESTDIR}/etc
+fi
+
 manual_add_modules unionfs
 
 # We need losetup
@@ -28,12 +33,14 @@
 copy_exec /usr/share/live-initramfs/live-reconfigure /bin
 copy_exec /usr/share/live-initramfs/live-preseed /bin
 
-mkdir -p ${DESTDIR}/lib/udev
-copy_exec /lib/udev/cdrom_id /lib/udev
-copy_exec /lib/udev/vol_id /lib/udev
-copy_exec /lib/udev/path_id /lib/udev
-copy_exec /usr/bin/udevinfo /bin
-copy_exec /usr/bin/eject /bin
+if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
+	mkdir -p ${DESTDIR}/lib/udev
+	copy_exec /lib/udev/cdrom_id /lib/udev
+	copy_exec /lib/udev/vol_id /lib/udev
+	copy_exec /lib/udev/path_id /lib/udev
+	copy_exec /usr/bin/udevinfo /bin
+	copy_exec /usr/bin/eject /bin
+fi
 
 # cifs boot
 if [ -x /sbin/mount.cifs ]; then
@@ -64,12 +71,13 @@
 # integrity check
 copy_exec /usr/lib/live-initramfs/live-md5check /bin
 
+# allow to load custom keymap for using encryption
+if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]; then
+	copy_exec /bin/loadkeys /bin
+	cp /etc/console/boottime.kmap.gz $DESTDIR/etc/
+fi
+
 cp /usr/share/initramfs-tools/scripts/live-functions $DESTDIR/scripts
 cp /usr/share/initramfs-tools/scripts/live-helpers $DESTDIR/scripts
 
 auto_add_modules net
-
-if [ -e /etc/live.conf ]; then
-    mkdir -p ${DESTDIR}/etc
-    cp /etc/live.conf ${DESTDIR}/etc
-fi