This repository was archived by the owner on Aug 2, 2022. It is now read-only.
Make /bin/df ignore $BLOCKSIZE - 2.0 #8963
Merged
Conversation
This file contains hidden or 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
When called without any parameter to override the block size, '/bin/df' uses the $BLOCKSIZE environment variable. That variable may contain units like K, M, G, etc. Before this commit, general.sh took the value of $BLOCKSIZE from the output of 'df' and used it in arithmetic expressions, which broke them because of the unit suffixes. This commit adds the higly portable '-k' option to the 'df' invocation to explicitly set the value of block size to 1024.
scottarnette
approved these changes
Apr 17, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is the 2.0 counterpart of #8959
Change Description
When called without any parameter to override the block size,
/bin/dfuses the$BLOCKSIZEenvironment variable. That variable may contain units like K, M, G, etc.Before this commit,
general.shtook the value of$BLOCKSIZEfrom the output ofdfand used it in arithmetic expressions, which broke them because of the unit suffixes.This commit adds the highly portable
-koption to thedfinvocation to explicitly set the value of block size to 1024.Consensus Changes
API Changes
Documentation Additions