diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-09-01 16:35:50 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-09-01 16:35:50 -0300 |
commit | 45a60a8fdfdade381c78e1791d65a389d620f2a8 (patch) | |
tree | 4376831e9a33b4694b3b761c0c467c98013e28e7 /pcr/networkmanager-consolekit/dnsmasq-path.patch | |
parent | 48c7bc490b2dc9f41478d44557dd60c6ae2d241d (diff) | |
parent | 026395c1523a751fd6b1fa5f76e234a990276b84 (diff) |
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
Diffstat (limited to 'pcr/networkmanager-consolekit/dnsmasq-path.patch')
-rw-r--r-- | pcr/networkmanager-consolekit/dnsmasq-path.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/pcr/networkmanager-consolekit/dnsmasq-path.patch b/pcr/networkmanager-consolekit/dnsmasq-path.patch new file mode 100644 index 000000000..c0e713266 --- /dev/null +++ b/pcr/networkmanager-consolekit/dnsmasq-path.patch @@ -0,0 +1,30 @@ +diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c +--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100 +@@ -52,8 +52,11 @@ + find_dnsmasq (void) + { + static const char *paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; +diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c +--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100 +@@ -170,8 +170,11 @@ + nm_find_dnsmasq (void) + { + static const char *dnsmasq_binary_paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; |