Removes the errexit shell option from generate_network_config.sh #276
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The script runs a loop that checks for a files that may not exist. With -e set, if it tries to list the files and they don't exist then the script exits. This commit simply removes the -e shell option. There is likely some other workaround, but this is pretty simple.
The file /sys/class/net/ethN/carrier is what the generate-network-config script uses, and is probably more appropriate to the intention, and it was just an oversight that this file didn't previously get changed too.
stephen-soltesz
approved these changes
Oct 30, 2024
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1.
Reviewable status:complete! 1 of 1 approvals obtained
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The script runs a loop waiting for /sys/class/netc/ethN directories to exist. With errexit enabled, the script would terminate when those directories did not exist, which is counterproductive in this case. I'm sure there is some other way to get around this while still leaving the errexit option enabled, but this seemed pretty simple. Indeed, this script never had any shell options set until I added them just a week or two ago while doing other work.
This PR also modifies the configure_tc_fq.sh script to operate on the /sys/class/net/ethN/carrier file instead of "operstate", which is generate_network_config.sh already does, and was just an oversight on my part to not change it earlier, too.
Also, add
set -uxto generate_network_config.sh, just to make debugging easier in the future if we have any issues with the script.This change is