Backport upstream fixes to 059 #308
Merged
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
Since the introduction of the `dracut-util` binary to parse kernel command line arguments, if the user inputs multiple `rd.break=` options, dracut only stops the boot process at the last one. ``` [ 0.985362] localhost dracut-cmdline[245]: /bin/dracut-cmdline@18(): info 'Using kernel command line parameters:' ' ... rd.debug rd.break=cmdline rd.break=pre-pivot' ... [ 1.044979] localhost dracut-cmdline[245]: /bin/dracut-cmdline@48(): getarg rd.break=cmdline -d rdbreak=cmdline [ 1.044979] localhost dracut-cmdline[245]: /lib/dracut-lib.sh@155(getarg): debug_off [ 1.044979] localhost dracut-cmdline[245]: /lib/dracut-lib.sh@23(debug_off): set +x [ 1.044979] localhost dracut-cmdline[245]: /lib/dracut-lib.sh@218(getarg): return 1 ``` For options that can be specified multiple times, `getargs` should be used instead. ``` master> export CMDLINE="rd.break=cmdline rd.break=pre-udev rd.break=pre-pivot" master> ./dracut-getarg rd.break=cmdline master> echo $? 1 master> ./dracut-getarg rd.break=pre-udev master> echo $? 1 master> ./dracut-getarg rd.break=pre-pivot master> echo $? 0 master> ./dracut-getargs rd.break=cmdline cmdline master> echo $? 0 master> ./dracut-getargs rd.break=pre-udev pre-udev master> echo $? 0 master> ./dracut-getargs rd.break=pre-pivot pre-pivot master> echo $? 0 ``` Fixes 501d82f
Some servers send `content-length` instead of `Content-Length`, so ignore the case. E.g.: ``` > curl -sIL https://pkg.adfinis.com/opensuse/tumbleweed/iso/openSUSE-Tumbleweed-DVD-x86_64-Snapshot20240118-Media.iso HTTP/2 200 server: nginx date: Fri, 19 Jan 2024 16:29:54 GMT content-type: application/octet-stream content-length: 4643094528 last-modified: Fri, 19 Jan 2024 03:34:00 GMT etag: "65a9eda8-114c00000" accept-ranges: bytes ```
…essage If `curl` fails to reach the URL of the live image, or if the header received does not provide `Content-Length`, the error message displayed is misleading. ``` [ 8.118432] dracut-initqueue[800]: /usr/sbin/livenetroot: line 21: / (1024 * 1024): syntax error: operand expected (error token is "/ (1024 * 1024)") ``` Therefore, split the calculation and provide proper error messages. Reported-by: Knut Anderssen <[email protected]>
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.
Upstream PRs:
rd.break=options dracutdevs/dracut#2607