From 7ff8c08416e6372f1642d29aa9bb2df2c269dbb9 Mon Sep 17 00:00:00 2001
From: kyounger <kyounger@gmail.com>
Date: Mon, 30 May 2022 10:14:33 -0500
Subject: [PATCH] Allow -b arg override in badblocks run

---
 README.md      |  5 +++--
 disk-burnin.sh | 15 +++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 446d3df..406a1d0 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ The script extracts the drive model and serial number and creates a log filename
 
 `badblocks` is invoked with the following options:
 
-* `-b 8192` : Use a block size of 8192
+* `-b 8192` : Use a block size of 8192 (override this setting with the `-b` option below)
 * `-e 1` : Abort the `badblocks` test immediately if an error is found (override this setting with the `-x` option below)
 * `-c 64` : Number of concurrent blocks to check. (override this setting with the `-c` option below, but beware of memory use with high values)
 * `-v` : Verbose mode
@@ -51,12 +51,13 @@ The script extracts the drive model and serial number and creates a log filename
 
 ## Usage
 
-`./disk-burnin.sh [-h] [-e] [-c <num_blocks>] [-f] [-o <directory>] [-x] <disk>`
+`./disk-burnin.sh [-h] [-e] [-b <block_size>] [-c <num_blocks>] [-f] [-o <directory>] [-x] <disk>`
 
 ### Options
 
 * `-h`: show help text
 * `-e`: show extended help text
+* `-b`: block size (default: 8192)
 * `-c`: number of concurrent blocks to check (default: 64). Higher values will use more memory.
 * `-f`: run a full, destructive test. Disables the default 'dry-run mode'. **ALL DATA ON THE DISK WILL BE LOST!**
 * `-o <directory>`: write log files to `<directory>` (default: working directory `$(pwd)`)
diff --git a/disk-burnin.sh b/disk-burnin.sh
index 89d96ac..9021e32 100755
--- a/disk-burnin.sh
+++ b/disk-burnin.sh
@@ -29,7 +29,7 @@ readonly USAGE=\
     $(basename "$0") -- disk burn-in program
 
 SYNOPSIS
-    $(basename "$0") [-h] [-c <num_blocks>] [-e] [-f] [-o <directory>] [-x] <disk>
+    $(basename "$0") [-h] [-b <block_size>] [-c <num_blocks>] [-e] [-f] [-o <directory>] [-x] <disk>
 
 DESCRIPTION
     A script to simplify the process of burning-in disks. Only intended for use
@@ -46,6 +46,7 @@ DESCRIPTION
 OPTIONS
     -h                Show help text
     -e                Show extended help text
+    -b <block_size>   Override block size (defaults to 8192)
     -c <num_blocks>   Override concurrent number of blocks tested
     -f                Force script to run in destructive mode
                       ALL DATA ON THE DISK WILL BE LOST!
@@ -222,16 +223,19 @@ VERSIONS
         Minor reformatting.
 
     KY, 30 May 2022
-        Added -c option to control the badblocks -c option."
+        Added -b & -c options to control respective badblocks options."
 
 # badblocks default -e option is 1, stop testing if a single error occurs
 BB_E_ARG=1
 
+# badblocks default -b option is 1024, but we default to 8192. This allows overriding if desired.
+BB_B_ARG=8192
+
 # badblocks default -c option is 64, and this allows overriding
 BB_C_ARG=64
 
 # parse options
-while getopts ':hefo:c:x' option; do
+while getopts ':hefo:b:c:x' option; do
   case "${option}" in
     h)  echo "${USAGE}"
         exit
@@ -244,6 +248,8 @@ while getopts ':hefo:c:x' option; do
         ;;
     o)  LOG_DIR="${OPTARG}"
         ;;
+    b)  BB_B_ARG="${OPTARG}"
+        ;;
     c)  BB_C_ARG="${OPTARG}"
         ;;
     x)  BB_E_ARG=0
@@ -271,6 +277,7 @@ fi
 ################################################################################
 
 readonly BB_E_ARG
+readonly BB_B_ARG
 readonly BB_C_ARG
 
 # Drive to burn-in
@@ -569,7 +576,7 @@ run_smart_test() {
 run_badblocks_test() {
   log_header "Running badblocks test"
   if [ "${DISK_TYPE}" != "SSD" ]; then
-    dry_run_wrapper "badblocks -b 8192 -wsv -c ${BB_C_ARG} -e ${BB_E_ARG} -o \"${BB_File}\" \"${DRIVE}\""
+    dry_run_wrapper "badblocks -b ${BB_B_ARG} -wsv -c ${BB_C_ARG} -e ${BB_E_ARG} -o \"${BB_File}\" \"${DRIVE}\""
   else
     log_info "SKIPPED: badblocks for ${DISK_TYPE} device"
   fi