summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2018-05-22 14:28:36 +0100
committerDimitri John Ledkov <xnox@ubuntu.com>2018-05-22 14:28:36 +0100
commitec9bfc63255cdf01a67171d1228f562c927c6d36 (patch)
treee29a4970231df8a57495542b1eea95919be5c703
parentf479c816f53ae74c4229361738a725f04c78f9e5 (diff)
Install identical udev rules into d-i installer udeb, as used in the installed system. Specifically, post-processed rules with full path to mdadm binary subsituted, instead of installing useless rules with the template variable BINDIR. LP: #1705215debian/4.1_rc1-2archive/debian/4.1_rc1-2
-rw-r--r--debian/changelog9
-rwxr-xr-xdebian/rules4
2 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 76ac7e9..d1a29be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mdadm (4.1~rc1-2) unstable; urgency=medium
+
+ * Install identical udev rules into d-i installer udeb, as used in the
+ installed system. Specifically, post-processed rules with full path to
+ mdadm binary subsituted, instead of installing useless rules with the
+ template variable BINDIR. LP: #1705215
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 22 May 2018 14:26:59 +0100
+
mdadm (4.1~rc1-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/rules b/debian/rules
index b13f218..22e8dad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,10 +66,10 @@ install-arch: build-arch
install -Dm0755 debian/bugscript $(DESTDIR)/usr/share/bug/mdadm/script
install -Dm0755 udeb/mdadm $(DESTDIR_UDEB)/sbin/mdadm
install -Dm0755 udeb/mdmon $(DESTDIR_UDEB)/sbin/mdmon
- install -Dm0644 udev-md-raid-arrays.rules $(DESTDIR_UDEB)/lib/udev/rules.d/63-md-raid-arrays.rules
+ install -Dm0644 $(DESTDIR)/lib/udev/rules.d/63-md-raid-arrays.rules $(DESTDIR_UDEB)/lib/udev/rules.d/63-md-raid-arrays.rules
install -Dm0644 debian/mdadm-shutdown.service $(DESTDIR)/lib/systemd/system/mdadm-shutdown.service
ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes), yes)
- install -Dm0644 udev-md-raid-assembly.rules $(DESTDIR_UDEB)/lib/udev/rules.d/64-md-raid-assembly.rules
+ install -Dm0644 $(DESTDIR)/lib/udev/rules.d/64-md-raid-assembly.rules $(DESTDIR_UDEB)/lib/udev/rules.d/64-md-raid-assembly.rules
install -Dm0644 debian/source_mdadm.py $(DESTDIR)/usr/share/apport/package-hooks/source_mdadm.py
endif