[Debian-live-changes] r1593 - in dists/trunk/live-initramfs: docs hooks

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-22 12:19:53 +0000 (Tue, 22 May 2007)
New Revision: 1593

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


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-05-22 11:51:09 UTC (rev 1592)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-05-22 12:19:53 UTC (rev 1593)
@@ -15,6 +15,7 @@
 	    terminal login.
 	* bin/live-snapshot, scripts/live, scripts/live-helpers:
 	  - Also recognize ext3, but treat it like ext2.
+	* Uploaded 1.87.4-1.
 
 2007-06-12  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/hooks/live
===================================================================
--- dists/trunk/live-initramfs/hooks/live	2007-05-22 11:51:09 UTC (rev 1592)
+++ dists/trunk/live-initramfs/hooks/live	2007-05-22 12:19:53 UTC (rev 1593)
@@ -47,39 +47,21 @@
 cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
 cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
 
-# Handling binaries
+# Handling other stuff
 
-# losetup
-copy_exec /sbin/losetup /sbin
-
-# mount.cifs
-if [ -x /sbin/mount.cifs ]
+# Configuration: keymap (usefull when using encryption)
+if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
 then
-	copy_exec /sbin/mount.cifs /sbin
-fi
+	copy_exec /bin/loadkeys /bin
 
-# eject
-copy_exec /usr/bin/eject /bin
-
-# udev
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-then
-	mkdir -p "${DESTDIR}"/lib/udev
-
-	copy_exec /lib/udev/cdrom_id /lib/udev
-	copy_exec /lib/udev/path_id /lib/udev
-	copy_exec /lib/udev/vol_id /lib/udev
+	mkdir -p "${DESTDIR}"/etc
+	cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
 fi
 
-copy_exec /sbin/udevtrigger /sbin
-copy_exec /sbin/udevsettle /sbin
-copy_exec /usr/bin/udevinfo /bin
-
-# Handling kernel modules
-
 # Filesystem: cifs
 if [ -x /sbin/mount.cifs ]
 then
+	copy_exec /sbin/mount.cifs /sbin
         manual_add_modules cifs
 fi
 
@@ -87,6 +69,7 @@
 manual_add_modules ext3
 
 # Filesystem: squashfs
+copy_exec /sbin/losetup /sbin
 manual_add_modules loop
 manual_add_modules squashfs
 
@@ -108,11 +91,19 @@
 # Hardware: network
 auto_add_modules net
 
-# Custom keymap (usefull when using encryption)
-if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
+# Program: eject
+copy_exec /usr/bin/eject /bin
+
+# Program: udev
+if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
 then
-	copy_exec /bin/loadkeys /bin
+	mkdir -p "${DESTDIR}"/lib/udev
 
-	mkdir -p "${DESTDIR}"/etc
-	cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
+	copy_exec /lib/udev/cdrom_id /lib/udev
+	copy_exec /lib/udev/path_id /lib/udev
+	copy_exec /lib/udev/vol_id /lib/udev
 fi
+
+copy_exec /sbin/udevtrigger /sbin
+copy_exec /sbin/udevsettle /sbin
+copy_exec /usr/bin/udevinfo /bin