diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 68a8ce34283..caef33b2b7d 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -201,7 +201,11 @@ then
   for package in *.deb
   do
     echo "$package" | cut -d '_' -f 1
-    dpkg-deb -c "$package" | awk '{print $1 " " $2 " " $6 " " $7 " " $8}' | sort -k 3
+    # shellcheck disable=SC2034
+    dpkg-deb -c "$package" | while IFS=" " read -r col1 col2 col3 col4 col5 col6 col7 col8
+    do
+        echo "$col1 $col2 $col6 $col7 $col8" | sort -k 3
+    done
     echo "------------------------------------------------"
   done
 fi
diff --git a/debian/mariadb-server.mariadb.init b/debian/mariadb-server.mariadb.init
index cc004179894..f4051d4b007 100644
--- a/debian/mariadb-server.mariadb.init
+++ b/debian/mariadb-server.mariadb.init
@@ -84,7 +84,10 @@ sanity_checks() {
 
   # check for diskspace shortage
   datadir=`mariadbd_get_param datadir`
-  if LC_ALL=C BLOCKSIZE= df --portability $datadir/. | tail -n 1 | awk '{ exit ($4>4096) }'; then
+  # As preset blocksize of GNU df is 1024 then available bytes is $df_available_blocks * 1024
+  # 4096 blocks is then lower than 4 MB
+  df_available_blocks=`LC_ALL=C BLOCKSIZE= df --output=avail "$datadir" | tail -n 1`
+  if [ "$df_available_blocks" -lt "4096" ]; then
     log_failure_msg "$0: ERROR: The partition with $datadir is too full!"
     echo                "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER
     exit 1
diff --git a/debian/mariadb-server.preinst b/debian/mariadb-server.preinst
index 755815eaeed..e2d8e670bbf 100644
--- a/debian/mariadb-server.preinst
+++ b/debian/mariadb-server.preinst
@@ -196,8 +196,10 @@ if [ ! -d $mysql_datadir ] && [ ! -L $mysql_datadir ]; then
   mkdir -Z $mysql_datadir
 fi
 
-# checking disc space
-if LC_ALL=C BLOCKSIZE= df --portability $mysql_datadir/. | tail -n 1 | awk '{ exit ($4>1000) }'; then
+# As preset blocksize of GNU df is 1024 then available bytes is $df_available_blocks * 1024
+# 4096 blocks is then lower than 4 MB
+df_available_blocks=`LC_ALL=C BLOCKSIZE= df --output=avail "$datadir" | tail -n 1`
+if [ "$df_available_blocks" -lt "4096" ]; then
   echo "ERROR: There's not enough space in $mysql_datadir/" 1>&2
   db_stop
   exit 1
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index eec985396c4..b28e533ecd8 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -476,7 +476,7 @@ fi
 
 if test "$ip_only" -eq 1
 then
-  hostname=`echo "$resolved" | awk '/ /{print $6}'`
+  hostname=`echo "$resolved" | while read a; do echo ${a##* }; done`
 fi
 
 # Create database directories