Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

T5901: Add DHCP base_path dir during first boot #2824

Merged
merged 1 commit into from
Jan 15, 2024
Merged

T5901: Add DHCP base_path dir during first boot #2824

merged 1 commit into from
Jan 15, 2024

Conversation

sever-sever
Copy link
Member

Change Summary

We should create dhclient base_path dir /run/dhclient during the first boot.

It fixes cloud-init boot issues

/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 33: /run/dhclient/dhclient_eth0.lease: No such file or directory

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

Component(s) name

dhcp-client hook

Proposed changes

How to test

Boot cloud-init image
before the fix we can see hook errors:

vyos@ci-router1:~$ cat /var/log/cloud-init-output.log 
Cloud-init v. 22.1-437-g3e026561-1~bddeb running 'init-local' at Fri, 05 Jan 2024 18:01:48 +0000. Up 17.13 seconds.
Cloud-init v. 22.1-437-g3e026561-1~bddeb running 'init' at Fri, 05 Jan 2024 18:01:52 +0000. Up 21.04 seconds.
ci-info: ++++++++++++++++++++++++++++++++Net device info++++++++++++++++++++++++++++++++
ci-info: +--------+------+----------------+---------------+--------+-------------------+
ci-info: | Device |  Up  |    Address     |      Mask     | Scope  |     Hw-Address    |
ci-info: +--------+------+----------------+---------------+--------+-------------------+
ci-info: |  eth0  | True | 192.168.122.43 | 255.255.255.0 | global | 52:54:00:82:e4:16 |
ci-info: |   lo   | True |   127.0.0.1    |   255.0.0.0   |  host  |         .         |
ci-info: |   lo   | True |    ::1/128     |       .       |  host  |         .         |
ci-info: +--------+------+----------------+---------------+--------+-------------------+
ci-info: +++++++++++++++++++++++++++++++Route IPv4 info+++++++++++++++++++++++++++++++
ci-info: +-------+---------------+---------------+---------------+-----------+-------+
ci-info: | Route |  Destination  |    Gateway    |    Genmask    | Interface | Flags |
ci-info: +-------+---------------+---------------+---------------+-----------+-------+
ci-info: |   0   |    0.0.0.0    | 192.168.122.1 |    0.0.0.0    |    eth0   |   UG  |
ci-info: |   1   | 192.168.122.0 |    0.0.0.0    | 255.255.255.0 |    eth0   |   U   |
ci-info: +-------+---------------+---------------+---------------+-----------+-------+
ci-info: +++++++++++++++++++Route IPv6 info+++++++++++++++++++
ci-info: +-------+-------------+---------+-----------+-------+
ci-info: | Route | Destination | Gateway | Interface | Flags |
ci-info: +-------+-------------+---------+-----------+-------+
ci-info: |   1   |  multicast  |    ::   |    eth0   |   U   |
ci-info: +-------+-------------+---------+-----------+-------+
Cloud-init v. 22.1-437-g3e026561-1~bddeb running 'modules:config' at Fri, 05 Jan 2024 18:01:53 +0000. Up 22.12 seconds.
Killed old client process
Internet Systems Consortium DHCP Client 4.4.3-P1
Copyright 2004-2022 Internet Systems Consortium.
All rights reserved.
For info, please visit https://www.isc.org/software/dhcp/

Listening on LPF/eth0/52:54:00:82:e4:16
Sending on   LPF/eth0/52:54:00:82:e4:16
Sending on   Socket/fallback
DHCPRELEASE of 192.168.122.43 on eth0 to 192.168.122.1 port 67
Status of zebra: FAILED
Status of mgmtd: FAILED
Status of staticd: FAILED
RTNETLINK answers: No such process
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 33: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 43: /run/dhclient/dhclient_eth0.lease: No such file or directory
Traceback (most recent call last):
  File "<stdin>", line 39, in <module>
NameError: name 'secrets_lines' is not defined
Cloud-init v. 22.1-437-g3e026561-1~bddeb running 'modules:final' at Fri, 05 Jan 2024 18:01:59 +0000. Up 28.41 seconds.
No 'final' modules to run under section 'cloud_final_modules'
vyos@ci-router1:~$

After the fix:

vyos@ci-router1:~$ cat /var/log/clo
cloud-init.log         cloud-init-output.log  
vyos@ci-router1:~$ cat /var/log/cloud-init-output.log 
Cloud-init v. 22.1-437-g3e026561-1~bddeb running 'init-local' at Mon, 15 Jan 2024 00:51:09 +0000. Up 18.04 seconds.
Cloud-init v. 22.1-437-g3e026561-1~bddeb running 'init' at Mon, 15 Jan 2024 00:51:13 +0000. Up 22.05 seconds.
ci-info: ++++++++++++++++++++++++++++++++Net device info++++++++++++++++++++++++++++++++
ci-info: +--------+------+----------------+---------------+--------+-------------------+
ci-info: | Device |  Up  |    Address     |      Mask     | Scope  |     Hw-Address    |
ci-info: +--------+------+----------------+---------------+--------+-------------------+
ci-info: |  eth0  | True | 192.168.122.41 | 255.255.255.0 | global | 52:54:00:b0:bb:eb |
ci-info: |   lo   | True |   127.0.0.1    |   255.0.0.0   |  host  |         .         |
ci-info: |   lo   | True |    ::1/128     |       .       |  host  |         .         |
ci-info: +--------+------+----------------+---------------+--------+-------------------+
ci-info: +++++++++++++++++++++++++++++++Route IPv4 info+++++++++++++++++++++++++++++++
ci-info: +-------+---------------+---------------+---------------+-----------+-------+
ci-info: | Route |  Destination  |    Gateway    |    Genmask    | Interface | Flags |
ci-info: +-------+---------------+---------------+---------------+-----------+-------+
ci-info: |   0   |    0.0.0.0    | 192.168.122.1 |    0.0.0.0    |    eth0   |   UG  |
ci-info: |   1   | 192.168.122.0 |    0.0.0.0    | 255.255.255.0 |    eth0   |   U   |
ci-info: +-------+---------------+---------------+---------------+-----------+-------+
ci-info: +++++++++++++++++++Route IPv6 info+++++++++++++++++++
ci-info: +-------+-------------+---------+-----------+-------+
ci-info: | Route | Destination | Gateway | Interface | Flags |
ci-info: +-------+-------------+---------+-----------+-------+
ci-info: |   1   |  multicast  |    ::   |    eth0   |   U   |
ci-info: +-------+-------------+---------+-----------+-------+
Cloud-init v. 22.1-437-g3e026561-1~bddeb running 'modules:config' at Mon, 15 Jan 2024 00:51:14 +0000. Up 23.40 seconds.
Killed old client process
Internet Systems Consortium DHCP Client 4.4.3-P1
Copyright 2004-2022 Internet Systems Consortium.
All rights reserved.
For info, please visit https://www.isc.org/software/dhcp/

Listening on LPF/eth0/52:54:00:b0:bb:eb
Sending on   LPF/eth0/52:54:00:b0:bb:eb
Sending on   Socket/fallback
DHCPRELEASE of 192.168.122.41 on eth0 to 192.168.122.1 port 67
Status of zebra: FAILED
Status of mgmtd: FAILED
Status of staticd: FAILED
RTNETLINK answers: No such process
Traceback (most recent call last):
  File "<stdin>", line 39, in <module>
NameError: name 'secrets_lines' is not defined
Cloud-init v. 22.1-437-g3e026561-1~bddeb running 'modules:final' at Mon, 15 Jan 2024 00:51:21 +0000. Up 30.78 seconds.
No 'final' modules to run under section 'cloud_final_modules'
vyos@ci-router1:~$

Smoketest result

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

@sever-sever
T5901: Add DHCP base_path dir during first boot
e613983 
We should create dhclient base_path dir `/run/dhclient` during the
first boot.

It fixes cloud-init boot issues
```
/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook: line 33: /run/dhclient/dhclient_eth0.lease: No such file or directory
```
@vyosbot vyosbot requested review from a team, dmbaturin, sarthurdev, zdc, jestabro and c-po and removed request for a team January 15, 2024 01:05
@c-po c-po merged commit c4b881e into vyos:current Jan 15, 2024
8 checks passed
@sever-sever
Copy link
Member Author

@Mergifyio backport sagitta

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 15, 2024 •
edited
Loading

backport sagitta

✅ Backports have been created

@mergify mergify bot mentioned this pull request Jan 15, 2024
Merged
c-po added a commit that referenced this pull request Jan 15, 2024
@c-po
Merge pull request #2828 from vyos/mergify/bp/sagitta/pr-2824
10bcf51 
T5901: Add DHCP base_path dir during first boot (backport #2824)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@c-po c-po c-po approved these changes

@dmbaturin dmbaturin Awaiting requested review from dmbaturin dmbaturin is a code owner automatically assigned from vyos/reviewers

@sarthurdev sarthurdev Awaiting requested review from sarthurdev sarthurdev is a code owner automatically assigned from vyos/reviewers

@zdc zdc Awaiting requested review from zdc zdc is a code owner automatically assigned from vyos/reviewers

@jestabro jestabro Awaiting requested review from jestabro jestabro is a code owner automatically assigned from vyos/reviewers

Assignees

@sever-sever sever-sever

Labels
current
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sever-sever @c-po