diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-12-27 10:15:03 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2016-01-02 11:41:26 +0100 |
| commit | a21ab6367e8a7726df1480eab8115fda81431477 (patch) | |
| tree | 167b2b7ca73d42a2442459d2a82d6225552903ac | |
| parent | check-reqs.eclass: Fix typo (diff) | |
| download | gentoo-a21ab6367e8a7726df1480eab8115fda81431477.tar.gz gentoo-a21ab6367e8a7726df1480eab8115fda81431477.tar.bz2 gentoo-a21ab6367e8a7726df1480eab8115fda81431477.zip | |
check-reqs.eclass: Replace obsolete df option -m with -k
Using KiB as base unit for calculation as linux and bsd only have -k as
common option
Signed-off-by: Justin Lecher <jlec@gentoo.org>
| -rw-r--r-- | eclass/check-reqs.eclass | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 138bfec4aac0..204bcc357492 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -159,12 +159,12 @@ check-reqs_run() { fi } -# @FUNCTION: check-reqs_get_mebibytes +# @FUNCTION: check-reqs_get_kibibytes # @INTERNAL # @DESCRIPTION: -# Internal function that returns number in mebibytes. -# Returns 1024 for 1G or 1048576 for 1T. -check-reqs_get_mebibytes() { +# Internal function that returns number in KiB. +# Returns 1024**2 for 1G or 1024**3 for 1T. +check-reqs_get_kibibytes() { debug-print-function ${FUNCNAME} "$@" [[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]" @@ -173,9 +173,10 @@ check-reqs_get_mebibytes() { local size=${1%[GMT]} case ${unit} in - G) echo $((1024 * size)) ;; - [M0-9]) echo ${size} ;; - T) echo $((1024 * 1024 * size)) ;; + G) echo $((1024 * 1024 * size)) ;; + M) echo $((1024 * size)) ;; + T) echo $((1024 * 1024 * 1024 * size)) ;; + [0-9]) echo $((1024 * size)) ;; *) die "${FUNCNAME}: Unknown unit: ${unit}" ;; @@ -275,7 +276,7 @@ check-reqs_memory() { actual_memory=$(echo $actual_memory | sed -e 's/^[^:=]*[:=]//' ) fi if [[ -n ${actual_memory} ]] ; then - if [[ ${actual_memory} -lt $((1024 * $(check-reqs_get_mebibytes ${size}))) ]] ; then + if [[ ${actual_memory} -lt $(check-reqs_get_kibibytes ${size}) ]] ; then eend 1 check-reqs_unsatisfied \ ${size} \ @@ -300,16 +301,16 @@ check-reqs_disk() { local path=${1} local size=${2} - local space_megs + local space_kbi check-reqs_start_phase \ ${size} \ "disk space at \"${path}\"" - space_megs=$(df -Pm "${1}" 2>/dev/null | awk 'FNR == 2 {print $4}') + space_kbi=$(df -Pk "${1}" 2>/dev/null | awk 'FNR == 2 {print $4}') - if [[ $? == 0 && -n ${space_megs} ]] ; then - if [[ ${space_megs} -lt $(check-reqs_get_mebibytes ${size}) ]] ; then + if [[ $? == 0 && -n ${space_kbi} ]] ; then + if [[ ${space_kbi} -lt $(check-reqs_get_kibibytes ${size}) ]] ; then eend 1 check-reqs_unsatisfied \ ${size} \ |