diff mbox

[v3,04/13] package/dhcp: systemd: support extra options

Message ID 1445734779-7212-4-git-send-email-benoit.thebaudeau.dev@gmail.com
State Accepted
Headers show

Commit Message

Benoît Thébaudeau Oct. 25, 2015, 12:59 a.m. UTC
Add an OPTIONS configuration variable in order to make it possible to
pass custom extra options to dhcpd. This keeps the systemd support
consistent with the SysV init script.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>

---
Changes v2 -> v3: new patch.
---
 package/dhcp/dhcpd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Maxime Hadjinlian Nov. 4, 2015, 10:09 a.m. UTC | #1
On Sun, Oct 25, 2015 at 2:59 AM, Benoît Thébaudeau <
benoit.thebaudeau.dev@gmail.com> wrote:

> Add an OPTIONS configuration variable in order to make it possible to
> pass custom extra options to dhcpd. This keeps the systemd support
> consistent with the SysV init script.
>
> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
>
> ---
> Changes v2 -> v3: new patch.
> ---
>  package/dhcp/dhcpd.service | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/dhcp/dhcpd.service b/package/dhcp/dhcpd.service
> index 5989506..ad1300c 100644
> --- a/package/dhcp/dhcpd.service
> +++ b/package/dhcp/dhcpd.service
> @@ -5,7 +5,7 @@ After=network.target
>  [Service]
>  Type=forking
>  PIDFile=/run/dhcpd.pid
> -ExecStart=/usr/sbin/dhcpd -q -pf /run/dhcpd.pid $INTERFACES
> +ExecStart=/usr/sbin/dhcpd -q -pf /run/dhcpd.pid $OPTIONS $INTERFACES
>  KillSignal=SIGINT
>  EnvironmentFile=/etc/default/dhcpd
>

Reviewed-by:  "Maxime Hadjinlian" <maxime.hadjinlian@gmail.com>

>
> --
> 2.1.4
>
>
Thomas Petazzoni Dec. 24, 2015, 2:01 p.m. UTC | #2
Dear Benoît Thébaudeau,

On Sun, 25 Oct 2015 02:59:30 +0200, Benoît Thébaudeau wrote:
> Add an OPTIONS configuration variable in order to make it possible to
> pass custom extra options to dhcpd. This keeps the systemd support
> consistent with the SysV init script.
> 
> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
> 
> ---
> Changes v2 -> v3: new patch.
> ---
>  package/dhcp/dhcpd.service | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Thomas
diff mbox

Patch

diff --git a/package/dhcp/dhcpd.service b/package/dhcp/dhcpd.service
index 5989506..ad1300c 100644
--- a/package/dhcp/dhcpd.service
+++ b/package/dhcp/dhcpd.service
@@ -5,7 +5,7 @@  After=network.target
 [Service]
 Type=forking
 PIDFile=/run/dhcpd.pid
-ExecStart=/usr/sbin/dhcpd -q -pf /run/dhcpd.pid $INTERFACES
+ExecStart=/usr/sbin/dhcpd -q -pf /run/dhcpd.pid $OPTIONS $INTERFACES
 KillSignal=SIGINT
 EnvironmentFile=/etc/default/dhcpd