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.

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

fix(distrib): Updated installer script to write all interface names to snapshot file #5522

Merged
merged 1 commit into from
Nov 7, 2024

Conversation

pierantoniomerlino
Copy link
Contributor

This PR updates the installer script to add all the interface names detected on the system during installation to the net.interfaces property of the snapshot_0 file.

Comment on lines +93 to 94
for i, eth_name in enumerate(eth_names):
snapshot_content = snapshot_content.replace('ETH_INTERFACE_' + str(i), eth_name)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would try to keep this more explicit since, in the future, we don't know whether the template will change. Therefore I would suggest something like:

Suggested change
for i, eth_name in enumerate(eth_names):
snapshot_content = snapshot_content.replace('ETH_INTERFACE_' + str(i), eth_name)
for i, eth_name in enumerate(eth_names):
if i < 2: # only replace the template content with the first two network interfaces
snapshot_content = snapshot_content.replace('ETH_INTERFACE_' + str(i), eth_name)

Comment on lines +98 to 99
for i, wlan_name in enumerate(wlan_names):
snapshot_content = snapshot_content.replace('WIFI_INTERFACE_' + str(i), wlan_name)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same thing here:

Suggested change
for i, wlan_name in enumerate(wlan_names):
snapshot_content = snapshot_content.replace('WIFI_INTERFACE_' + str(i), wlan_name)
for i, wlan_name in enumerate(wlan_names):
if i < 1: # only replace the template content with the first network interface
snapshot_content = snapshot_content.replace('WIFI_INTERFACE_' + str(i), wlan_name)

@mattdibi mattdibi merged commit c2ea2ff into develop Nov 7, 2024
5 checks passed
@mattdibi mattdibi deleted the fix_installer_net_interfaces branch November 7, 2024 14:25
eclipse-kura-bot pushed a commit that referenced this pull request Nov 7, 2024
…o snapshot file (#5522)

Updated installer script to write all interface names to snapshot file

Signed-off-by: pierantoniomerlino <[email protected]>
(cherry picked from commit c2ea2ff)
MMaiero pushed a commit that referenced this pull request Nov 8, 2024
…o snapshot file [backport release-5.6.0] (#5528)

fix(distrib): Updated installer script to write all interface names to snapshot file (#5522)

Updated installer script to write all interface names to snapshot file

Signed-off-by: pierantoniomerlino <[email protected]>
(cherry picked from commit c2ea2ff)

Co-authored-by: Pierantonio Merlino <[email protected]>
mattdibi added a commit that referenced this pull request Nov 8, 2024
pierantoniomerlino pushed a commit that referenced this pull request Nov 11, 2024
Revert "fix(distrib): Updated installer script to write all interface names to snapshot file (#5522)"

This reverts commit c2ea2ff.
eclipse-kura-bot pushed a commit that referenced this pull request Nov 11, 2024
Revert "fix(distrib): Updated installer script to write all interface names to snapshot file (#5522)"

This reverts commit c2ea2ff.

(cherry picked from commit a659d6e)
mattdibi added a commit that referenced this pull request Nov 12, 2024
fix(distrib): revert #5522 (#5533)

Revert "fix(distrib): Updated installer script to write all interface names to snapshot file (#5522)"

This reverts commit c2ea2ff.

(cherry picked from commit a659d6e)

Co-authored-by: Mattia Dal Ben <[email protected]>
MMaiero pushed a commit that referenced this pull request Dec 20, 2024
…o snapshot file (#5522)

Updated installer script to write all interface names to snapshot file

Signed-off-by: pierantoniomerlino <[email protected]>
MMaiero pushed a commit that referenced this pull request Dec 20, 2024
Revert "fix(distrib): Updated installer script to write all interface names to snapshot file (#5522)"

This reverts commit c2ea2ff.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants