Convert dhcp-relay docker to buster #4671
Conversation
Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>
src/isc-dhcp/patch/series
Outdated
| @@ -11,3 +11,4 @@ | |||
| 0010-CVE-2018-5732.patch | |||
| 0008-interface-name-maxlen-crash.patch | |||
| 0012-Don-t-skip-down-interfaces-when-discovering-interfac.patch | |||
| 0013-buster-build.patch | |||
There was a problem hiding this comment.
Rather than patching isc-dhcp source to forward-port 4.3.5-2 to Buster, I think it is better to upgrade the isc-dhcp source to the version available in buster (4.4.1-2). However, this may require more extensive rework of existing patches, and thus more extensive testing.
@lguohan: What is your opinion here? Should we do that here, or go with this approach temporarily and upgrade isc-dhcp in a future PR?
There was a problem hiding this comment.
we did the same thing for snmp to upgrade to buster. @joyas-joseph, can you do the upgrade in this pr?
There was a problem hiding this comment.
Let me take a look.
There was a problem hiding this comment.
Quick update - of the 12 patches, only 3 (patches 1,6 and 12) applied cleanly.
There was a problem hiding this comment.
any further update on this one?
There was a problem hiding this comment.
The remaining 9 patches need to be manually reworked and also extensively tested. This is going to take time.
For SNMP case; since it was only a minor version update, we didnt have to rework any of the patches.
There was a problem hiding this comment.
I have reworked the patches and pushed the changes.
I haven't tested option-82 though.
I would like @jleveque to look at the patches, especially the changes to common/discover.c
Update libevent dependency for dhcpmon to 2.1-6 Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>
src/isc-dhcp/patch/0002-Customizable-Option-82-circuit-ID-and-remote-ID-fiel.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0002-Customizable-Option-82-circuit-ID-and-remote-ID-fiel.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0007-If-destination-of-BOOTREQUEST-is-directed-broadcast-.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0007-If-destination-of-BOOTREQUEST-is-directed-broadcast-.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0007-If-destination-of-BOOTREQUEST-is-directed-broadcast-.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0007-If-destination-of-BOOTREQUEST-is-directed-broadcast-.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0007-If-destination-of-BOOTREQUEST-is-directed-broadcast-.patch
Outdated
Show resolved
Hide resolved
Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>
Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>
src/isc-dhcp/patch/0002-Customizable-Option-82-circuit-ID-and-remote-ID-fiel.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0002-Customizable-Option-82-circuit-ID-and-remote-ID-fiel.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0004-Support-for-loading-port-alias-map-file-to-replace-p.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0007-If-destination-of-BOOTREQUEST-is-directed-broadcast-.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0007-If-destination-of-BOOTREQUEST-is-directed-broadcast-.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0007-If-destination-of-BOOTREQUEST-is-directed-broadcast-.patch
Outdated
Show resolved
Hide resolved
src/isc-dhcp/patch/0007-If-destination-of-BOOTREQUEST-is-directed-broadcast-.patch
Outdated
Show resolved
Hide resolved
Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>
src/isc-dhcp/patch/0004-Support-for-loading-port-alias-map-file-to-replace-p.patch
Outdated
Show resolved
Hide resolved
Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>
|
retest vsimage please |
|
retest mellanox please |
1 similar comment
|
retest mellanox please |
|
retest vsimage please |
|
retest vsimage please |
Remove the patch as it is no longer required. Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>
src/isc-dhcp/patch/series
Outdated
| 0008-interface-name-maxlen-crash.patch | ||
| 0012-Don-t-skip-down-interfaces-when-discovering-interfac.patch |
There was a problem hiding this comment.
Now that you've removed four patches, can you please rename 0012-Don-t-skip-down-interfaces-when-discovering-interfac.patch to 0008-Don-t-skip-down-interfaces-when-discovering-interfac.patch?
Signed-off-by: Joyas Joseph <joyas_joseph@dell.com>
|
retest vsimage please |
Signed-off-by: Joyas Joseph joyas_joseph@dell.com
- Why I did it
This is an enhancement.
- How I did it
Code change.
Added a small patch to get the compilation work under buster environment.
- How to verify it
Build the docker: BLDENV=buster make -f Makefile.work target/docker-dhcp-relay.gz
docker exec dhcp_relay cat /etc/apt/sources.list
I have verified that the DHCP request are being relayed to the server. I haven't tested with a real DHCP server.
- Description for the changelog
Convert dhcp-relay docker to buster
- A picture of a cute animal (not mandatory but encouraged)