← Back to branch summary

~ubuntu-branches/ubuntu/raring/udisks/raring-proposed

« back to all changes in this revision

Viewing changes to debian/patches/06-test-for-mdadm.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl, Martin Pitt, Michael Biebl
  • Date: 2011-10-21 08:54:35 UTC
  • mfrom: (25.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20111021085435-wy0dj5tsx0jhm3gy
Tags: 1.0.4-2
http://bugs.debian.org/646078
http://bugs.debian.org/640322
http://bugs.debian.org/631420
http://bugs.debian.org/628502
[ Martin Pitt ]
* debian/control: Mark udisks Multi-Arch: foreign. Thanks Steve Langasek.
  (Closes: #646078)

[ Michael Biebl ]
* debian/patches/06-test-for-mdadm.patch: Update 80-udisks.rules to test for
  mdadm before using it. (Closes: #640322)
* debian/patches/07-fix-typos-udisks-man-page.patch: Fix a few typos in the
  udisks man page spotted by A. Costa. (Closes: #631420)
* debian/patches/10-po-pt_BR.patch: Add Brazilian Portuguese translation by
  Sérgio Cipolla. (Closes: #628502)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06-test-for-mdadm.patch
 
1
Index: udisks/data/80-udisks.rules
 
2
===================================================================
 
3
--- udisks.orig/data/80-udisks.rules    2011-08-30 00:39:55.772873612 +0200
 
4
+++ udisks/data/80-udisks.rules 2011-10-21 08:28:05.308180232 +0200
 
5
@@ -99,7 +99,7 @@
 
6
 # avoid probing if it has already been done earlier
 
7
 #
 
8
 ENV{MD_LEVEL}!="", GOTO="md_end"
 
9
-IMPORT{program}="/sbin/mdadm --examine --export $tempnode"
 
10
+TEST=="/sbin/mdadm", IMPORT{program}="/sbin/mdadm --examine --export $tempnode"
 
11
 
 
12
 LABEL="md_end"
 
13