From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: network@lists.ipfire.org
Subject: Re: [PATCH] dhcp: remove useless delay setting
Date: Fri, 14 Jul 2017 10:13:24 -0400
Message-ID: <1500041604.2276.2.camel@ipfire.org>
In-Reply-To: <1500039639-18239-1-git-send-email-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0320738688831274377=="
List-Id: <network.lists.ipfire.org>

--===============0320738688831274377==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

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(a)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"
>  				;;

--===============0320738688831274377==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlphTkdFQUFvSkVJQjU4UDl2a0FrSG5Oc1AvUmduUVhHOFFDbW9NTjJRTE9NZ3Q0ZVIK
Tnd6MGNYWFpYWml5QVY2VDhEWHZkOCtaMCtxY1hWYWlaQUNKL2ZjWmVRSGEzRThDR0prSHZkSk1W
YnpJelNwOApURWZpMVFKS2lPQjhiTXdDdWM5cEh1a2Z5cEUrRmdvaVc0SnBxR0J1RWdUdlNRTTBw
VG81S1Bjbk1NTFpqVHBOCkdCMmQxSGo1TVFteUFxMEFabDVmcWNJWGdKQlA2bHM1RTdmSG80bmNi
eEVaMFVDS2tpemtaL3FCOFRiWDZqUlQKYmUyL0phQ3pJS1JQSnNyNG5Na3ZDbWhJVFl2d3hEVFll
VlRlSjNBN3NKV3BkYWFQUUVNeXg4dzZ1MlAzMGl4WAp4WjgzYjR3a3B6S1FUQkZCeFFMNjFpWU5D
OTJhVDA1RStCM0xTSmt1a1F0YTdzd1gwd3RVbzI5RUFZK0lpVkpiCkF3U0NJYUhxaTdLZGJHVTl5
czJuaXVHU3pkUlFhQUduMHVkOWtoazBYYUdkMDFJV01uVENsMmJoWDFxbW0zRCsKU0FTR3ZIRzZH
KzVUYmh2RFBLUy9YSDVSZ2lCaUpiWWtxUkFLUlBSbEc4UGZrK2tBYUR4R1MrdXJuNXVPU3VWLwo5
eHZqU0Vpa3lqVG9LSU5pWDNMM2NGb3FtVlg1OVUwQ1AxbkM4SFd3M2NzN1RlMlJ2a3NGd0VucHBt
S2ZmRDFqCk1va2FUZVB4VW42U041TVZ1ak5GbWFaZnJBZU5nM0VaZnlLclVQcG1SVjZCNXBZQXJS
UzRlaEc2NzBYREEzcjIKL2NNYjJhQlQvbTlYd3M3T0M4VzZqVDRsK1lUaXcvdUtwU2VPdTBWRWRw
OVhpMmtBbitPT0lDYytoYk5oUGFiSwpWWVB1RmFwVWxHb3pGK0xQK0tLaAo9SWYyUgotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============0320738688831274377==--