Merge ~morphis/aethercast/+git/aethercast:fix-dhclient-hook into aethercast:master

[Simon Fels]

Fix dhclient hook installation

This was messed up before and is required to correctly not create a default route for DHCP leases gained over P2P for WiFi Display.

Fix dhclient hook installation

This was messed up before and is required to correctly not create a default route for DHCP leases gained over P2P for WiFi Display.

[Jim Hodapp (jhodapp)]

LGTM

5aa83f2... by Simon Fels on 2016-11-08

Allow dhcpd to write files which just include .lease in the name

dhcpd seems to write some temp files when its creating the lease file
and therefor needs wider access and just *.lease

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve

294eee4... by Simon Fels on 2016-11-16

Add maintainer script to get rid of unwanted configuration file

Unmerged commits

294eee4... by Simon Fels on 2016-11-16

Add maintainer script to get rid of unwanted configuration file

5aa83f2... by Simon Fels on 2016-11-08

Allow dhcpd to write files which just include .lease in the name

dhcpd seems to write some temp files when its creating the lease file
and therefor needs wider access and just *.lease

cf472e7... by Simon Fels on 2016-11-07

Correctly install hook for dhclient

diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
index 2b346db..274a758 100644
--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
@@ -10,4 +10,5 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dhcpd.conf
         DESTINATION /etc/aethercast/)
 
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dhclient-hook-p2p
-        DESTINATION /etc/dhcp/dhclient-enter-hooks.d/aethercast-p2p)
+        RENAME aethercast
+        DESTINATION /etc/dhcp/dhclient-enter-hooks.d/)
diff --git a/conf/dhclient-hook-p2p b/conf/dhclient-hook-p2p
 old mode 100644
 new mode 100755
index 242336f..242336f
--- a/conf/dhclient-hook-p2p
+++ b/conf/dhclient-hook-p2p
diff --git a/debian/aethercast.install b/debian/aethercast.install
index 9f6e9b2..3fad47f 100644
--- a/debian/aethercast.install
+++ b/debian/aethercast.install
@@ -4,4 +4,4 @@ usr/bin/aethercastctl
 etc/init/aethercast.conf
 etc/aethercast/dhcpd.conf
 etc/dbus-1/system.d/aethercast-dbus.conf
-etc/dhcp/dhclient-enter-hooks.d/aethercast-p2p
+etc/dhcp/dhclient-enter-hooks.d/aethercast
diff --git a/debian/aethercast.maintscript b/debian/aethercast.maintscript
 new file mode 100644
index 0000000..589b6ef
--- /dev/null
+++ b/debian/aethercast.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/dhcp/dhclient-enter-hooks.d/aethercast-p2p/dhclient-hook-p2p
diff --git a/debian/usr.sbin.aethercast b/debian/usr.sbin.aethercast
index 69fe061..4005900 100644
--- a/debian/usr.sbin.aethercast
+++ b/debian/usr.sbin.aethercast
@@ -11,5 +11,5 @@ capability dac_override,
 /etc/aethercast/dhcpd.conf r,
 # In addition aethercast will also point dhcpd to a private
 # lease/pid file
-/{,var/}run/aethercast/dhcpd*.leases lrw,
+/{,var/}run/aethercast/dhcpd*.leases* lrw,
 /{,var/}run/aethercast/dhcpd*.pid lrw,