[kernel] r6734 - dists/trunk/firmware-nonfree/debian/templates

[Bastian Blank]

Author: waldi
Date: Sun May 28 21:44:45 2006
New Revision: 6734

Added:
   dists/trunk/firmware-nonfree/debian/templates/hook.initramfs-tools.in   (contents, props changed)
      - copied, changed from r6724, /dists/trunk/firmware-nonfree/debian/templates/firmware.hook.initramfs-tools.in
   dists/trunk/firmware-nonfree/debian/templates/postinst.initramfs-tools.in
      - copied unchanged from r6724, /dists/trunk/firmware-nonfree/debian/templates/firmware.postinst.initramfs-tools.in
Removed:
   dists/trunk/firmware-nonfree/debian/templates/firmware.hook.initramfs-tools.in
   dists/trunk/firmware-nonfree/debian/templates/firmware.postinst.initramfs-tools.in

Log:
* debian/templates/hook.initramfs-tools.in
  - Move from debian/templates/firmware.hook.initramfs-tools.in.
  - Use correct substitution.
  - Don't check if /lib/firmware is available.
* debian/templates/postinst.initramfs-tools.in:
  Move from debian/templates/firmware.postinst.initramfs-tools.in.


Copied: dists/trunk/firmware-nonfree/debian/templates/hook.initramfs-tools.in (from r6724, /dists/trunk/firmware-nonfree/debian/templates/firmware.hook.initramfs-tools.in)
==============================================================================
--- /dists/trunk/firmware-nonfree/debian/templates/firmware.hook.initramfs-tools.in	(original)
+++ dists/trunk/firmware-nonfree/debian/templates/hook.initramfs-tools.in	Sun May 28 21:44:45 2006
@@ -16,11 +16,8 @@
 
 . /usr/share/initramfs-tools/hook-functions
 
-if [ -d /lib/firmware/ ] ; then
+copy_exec /lib/udev/firmware.agent /lib/udev/
 
-	copy_exec /lib/udev/firmware.agent /lib/udev/
-
-	mkdir -p $DESTDIR/lib/firmware
-	copy_exec /lib/firmware/@firmware@ /lib/firmware/
-fi
+mkdir -p $DESTDIR/lib/firmware
+cp @files_real@ $DESTDIR/lib/firmware