[Dmraid-debian-commits] r27 - in /trunk/debian: changelog initramfs/dmraid.initramfs-hook/dmraid

[derevko-guest at users.alioth.debian.org]

Author: derevko-guest
Date: Mon Dec  8 08:25:18 2008
New Revision: 27

URL: http://svn.debian.org/wsvn/dmraid-debian/?sc=1&rev=27
Log:
* debian/initramfs/dmraid.initramfs-hook/dmraid:
  + check if 85_dmraid.rules or 85-dmraid.rules exists, and then copy it
   (LP: #306114)

Modified:
    trunk/debian/changelog
    trunk/debian/initramfs/dmraid.initramfs-hook/dmraid

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/changelog?rev=27&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Mon Dec  8 08:25:18 2008
@@ -4,8 +4,10 @@
   * debian/control: 
     + Made the long description for the udeb shorter
     + Added initramfs-tools to dmraid Depends
-  * debian/initramfs/dmraid.initramfs-hook/dmraid: Removed blank line added
-    before the 'fi' in the dmraid initramfs-hook.
+  * debian/initramfs/dmraid.initramfs-hook/dmraid: 
+    + Removed blank line added before the 'fi' in the dmraid initramfs-hook.
+    + check if 85_dmraid.rules or 85-dmraid.rules exists, and then copy it
+      (LP: #306114)
   * debian/patches/02_raid45_to_raid4-5.dpatch: Removed
   * debian/dmraid.postinst: initramfs-tools is in Depends, do not check for
     update-initramfs (fixed command-with-path-in-maintainer-script lintian
@@ -14,7 +16,7 @@
   * debian/patches/02_scsi_serial_remove_ws.dpatch: remove whitespace from
     serial id (LP: #305011)
 
- -- Giuseppe Iuculano <giuseppe at iuculano.it>  Fri, 05 Dec 2008 19:26:41 +0100
+ -- Giuseppe Iuculano <giuseppe at iuculano.it>  Mon, 08 Dec 2008 09:19:15 +0100
 
 dmraid (1.0.0.rc15-1~exp1) experimental; urgency=low
 

Modified: trunk/debian/initramfs/dmraid.initramfs-hook/dmraid
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/initramfs/dmraid.initramfs-hook/dmraid?rev=27&op=diff
==============================================================================
--- trunk/debian/initramfs/dmraid.initramfs-hook/dmraid (original)
+++ trunk/debian/initramfs/dmraid.initramfs-hook/dmraid Mon Dec  8 08:25:18 2008
@@ -24,7 +24,12 @@
 	copy_exec /sbin/dmraid sbin
 	copy_exec /sbin/dmraid-activate sbin
 	mkdir -p ${DESTDIR}/etc/udev/rules.d
-	cp -p /etc/udev/rules.d/85_dmraid.rules ${DESTDIR}/etc/udev/rules.d
+	if [ -f /etc/udev/rules.d/85_dmraid.rules ]; then
+		cp -p /etc/udev/rules.d/85_dmraid.rules ${DESTDIR}/etc/udev/rules.d
+	fi
+	if [ -f /etc/udev/rules.d/85-dmraid.rules ]; then
+		cp -p /etc/udev/rules.d/85-dmraid.rules ${DESTDIR}/etc/udev/rules.d
+	fi
 fi
 
 exit 0