about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-09-30 05:24:03 +0200
committerMichael Biebl <biebl@debian.org>2014-09-30 05:24:10 +0200
commitef5c1d362ac9bc243ec1cdaf97c312762deaba84 (patch)
tree3f7d3fa2c4ed7a670ccd84a84982a7c2fe7a4383
parent1c8d5eb51b05ec4d1e4ead76d83cbd534917d426 (diff)
Use the correct path when calling dnssec-trigger-script
Closes: #763023
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/0008-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch23
-rw-r--r--debian/patches/series1
3 files changed, 27 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index dede3c89..6b842e79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ network-manager (0.9.10.0-3) UNRELEASED; urgency=medium
 
   * Acknowledge NMU, thanks Micah Anderson.
 
+  [ Arto Jantunen ]
+  * Use the correct path when calling dnssec-trigger-script. (Closes: #763023)
+
  -- Michael Biebl <biebl@debian.org>  Tue, 30 Sep 2014 05:08:49 +0200
 
 network-manager (0.9.10.0-2.1) unstable; urgency=medium
diff --git a/debian/patches/0008-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch b/debian/patches/0008-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch
new file mode 100644
index 00000000..32f9c2d8
--- /dev/null
+++ b/debian/patches/0008-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch
@@ -0,0 +1,23 @@
+From: Arto Jantunen <viiru@debian.org>
+Date: Sat, 27 Sep 2014 11:13:32 +0300
+Subject: Use the correct path when calling dnssec-trigger-script
+
+Debian systems don't have /usr/libexec, so the script is installed in
+a different path.
+---
+ src/dns-manager/nm-dns-unbound.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dns-manager/nm-dns-unbound.c b/src/dns-manager/nm-dns-unbound.c
+index 137fd20..439a36d 100644
+--- a/src/dns-manager/nm-dns-unbound.c
++++ b/src/dns-manager/nm-dns-unbound.c
+@@ -40,7 +40,7 @@ update (NMDnsPlugin *plugin,
+ 	 * without calling custom scripts. The dnssec-trigger functionality
+ 	 * may be eventually merged into NetworkManager.
+ 	 */
+-	return nm_spawn_process ("/usr/libexec/dnssec-trigger-script --async --update") == 0;
++	return nm_spawn_process ("/usr/lib/dnssec-trigger/dnssec-trigger-script --async --update") == 0;
+ }
+ 
+ static gboolean
diff --git a/debian/patches/series b/debian/patches/series
index 17c48f2f..2b7cbfb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Mark-virtual-ethernet-interfaces-as-unmanaged.patch
 0006-tui-fix-Wi-Fi-section-of-nmtui-connect-list-in-non-U.patch
 0007-core-fix-checks-for-default-routes-by-comparing-the-.patch
+0008-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch