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

Proposed by Simon Fels
Status: Approved
Approved by: Simon Fels
Approved revision: 294eee4daebfdcebd17a03cc5017c926328a33e2
Proposed branch: ~morphis/aethercast/+git/aethercast:fix-dhclient-hook
Merge into: aethercast:master
Diff against target: 45 lines (+5/-3)
5 files modified
conf/CMakeLists.txt (+2/-1)
conf/dhclient-hook-p2p (+0/-0)
debian/aethercast.install (+1/-1)
debian/aethercast.maintscript (+1/-0)
debian/usr.sbin.aethercast (+1/-1)
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve
Review via email: mp+310189@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Jim Hodapp (jhodapp) wrote :

LGTM

5aa83f2... by Simon Fels

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

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) :
review: Approve
294eee4... by Simon Fels

Add maintainer script to get rid of unwanted configuration file

Unmerged commits

294eee4... by Simon Fels

Add maintainer script to get rid of unwanted configuration file

5aa83f2... by Simon Fels

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

Correctly install hook for dhclient

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
2index 2b346db..274a758 100644
3--- a/conf/CMakeLists.txt
4+++ b/conf/CMakeLists.txt
5@@ -10,4 +10,5 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dhcpd.conf
6 DESTINATION /etc/aethercast/)
7
8 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dhclient-hook-p2p
9- DESTINATION /etc/dhcp/dhclient-enter-hooks.d/aethercast-p2p)
10+ RENAME aethercast
11+ DESTINATION /etc/dhcp/dhclient-enter-hooks.d/)
12diff --git a/conf/dhclient-hook-p2p b/conf/dhclient-hook-p2p
13old mode 100644
14new mode 100755
15index 242336f..242336f
16--- a/conf/dhclient-hook-p2p
17+++ b/conf/dhclient-hook-p2p
18diff --git a/debian/aethercast.install b/debian/aethercast.install
19index 9f6e9b2..3fad47f 100644
20--- a/debian/aethercast.install
21+++ b/debian/aethercast.install
22@@ -4,4 +4,4 @@ usr/bin/aethercastctl
23 etc/init/aethercast.conf
24 etc/aethercast/dhcpd.conf
25 etc/dbus-1/system.d/aethercast-dbus.conf
26-etc/dhcp/dhclient-enter-hooks.d/aethercast-p2p
27+etc/dhcp/dhclient-enter-hooks.d/aethercast
28diff --git a/debian/aethercast.maintscript b/debian/aethercast.maintscript
29new file mode 100644
30index 0000000..589b6ef
31--- /dev/null
32+++ b/debian/aethercast.maintscript
33@@ -0,0 +1 @@
34+rm_conffile /etc/dhcp/dhclient-enter-hooks.d/aethercast-p2p/dhclient-hook-p2p
35diff --git a/debian/usr.sbin.aethercast b/debian/usr.sbin.aethercast
36index 69fe061..4005900 100644
37--- a/debian/usr.sbin.aethercast
38+++ b/debian/usr.sbin.aethercast
39@@ -11,5 +11,5 @@ capability dac_override,
40 /etc/aethercast/dhcpd.conf r,
41 # In addition aethercast will also point dhcpd to a private
42 # lease/pid file
43-/{,var/}run/aethercast/dhcpd*.leases lrw,
44+/{,var/}run/aethercast/dhcpd*.leases* lrw,
45 /{,var/}run/aethercast/dhcpd*.pid lrw,

Subscribers

People subscribed via source and target branches