dhcp: remove useless delay setting
Message ID | 1500039639-18239-1-git-send-email-jonatan.schlag@ipfire.org |
---|---|
State | Superseded |
Headers |
Return-Path: <network-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id 191EC60366 for <patchwork@ipfire.org>; Fri, 14 Jul 2017 15:40:44 +0200 (CEST) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id C8C5C2599; Fri, 14 Jul 2017 15:40:43 +0200 (CEST) Received: from ipfire.localdomain (dslb-088-073-208-102.088.073.pools.vodafone-ip.de [88.73.208.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 39E6324A9; Fri, 14 Jul 2017 15:40:42 +0200 (CEST) From: Jonatan Schlag <jonatan.schlag@ipfire.org> To: network@lists.ipfire.org Subject: [PATCH] dhcp: remove useless delay setting Date: Fri, 14 Jul 2017 15:40:39 +0200 Message-Id: <1500039639-18239-1-git-send-email-jonatan.schlag@ipfire.org> X-Mailer: git-send-email 2.6.3 X-BeenThere: network@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List for the network package <network.lists.ipfire.org> List-Unsubscribe: <http://lists.ipfire.org/mailman/options/network>, <mailto:network-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/network/> List-Post: <mailto:network@lists.ipfire.org> List-Help: <mailto:network-request@lists.ipfire.org?subject=help> List-Subscribe: <http://lists.ipfire.org/mailman/listinfo/network>, <mailto:network-request@lists.ipfire.org?subject=subscribe> Errors-To: network-bounces@lists.ipfire.org Sender: "network" <network-bounces@lists.ipfire.org> |
Message
Jonatan Schlag
July 14, 2017, 11:40 p.m. UTC
Fixes: #11420
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
src/hooks/configs/dhcp | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
Comments
Hi, merged. I also removed the lines that actually used this from the dhclient-script. However, it didn't do anything since the hook config was never read. Best, -Michael On Fri, 2017-07-14 at 15:40 +0200, Jonatan Schlag wrote: > Fixes: #11420 > > Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org> > --- > src/hooks/configs/dhcp | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/src/hooks/configs/dhcp b/src/hooks/configs/dhcp > index 5ac01b6..8bb6aa9 100644 > --- a/src/hooks/configs/dhcp > +++ b/src/hooks/configs/dhcp > @@ -21,16 +21,13 @@ > > . /usr/lib/network/header-config > > -HOOK_CONFIG_SETTINGS="HOOK DELAY ENABLE_IPV6 ENABLE_IPV4" > +HOOK_CONFIG_SETTINGS="HOOK ENABLE_IPV6 ENABLE_IPV4" > > # Default settings. > -DELAY=0 > ENABLE_IPV6="on" > ENABLE_IPV4="on" > > hook_check_config_settings() { > - assert isset DELAY > - assert isinteger DELAY > assert isset ENABLE_IPV6 > assert isbool ENABLE_IPV6 > assert isset ENABLE_IPV4 > @@ -40,9 +37,6 @@ hook_check_config_settings() { > hook_parse_cmdline() { > while [ $# -gt 0 ]; do > case "${1}" in > - --delay=*) > - DELAY="$(cli_get_val "${1}")" > - ;; > --enable-ipv6) > ENABLE_IPV6="on" > ;;