From 83705c27f5e5485142a5de0aef501231eaf5ad10 Mon Sep 17 00:00:00 2001
From: gh0stshell <gh0stshell@users.noreply.github.com>
Date: Thu, 3 Oct 2019 16:19:47 -0700
Subject: [PATCH] Updated depends, bmaptool check update
Removed bmap-tools from depends as the check on line 96 looks for bmaptools and would use it if available if not continue to build, but have it as a depend check made the check null and if someone is on a kernel/file-system that does not support SEEK_HOLE and SEEK_DATA the script just fails.
Fixed bmap-tools check as the line which bmaptool >/dev/null 2>&1 does not return 0 so it kept ending at this line, if bmap-tools were not installed
The original code below looks for sparse to be 0 and if which bmaptool >/dev/null 2>&1 returns 0 to use bmap-tools, but I think its the reverse so swapped the last then and else sections as it would then look if sparse is 0 and which bmaptool >/dev/null 2>&1 is 0 to not use bmap-tools, but if it is 1 to use bmap-tools. If tool is available = 1 use bmap-tools, if tools is unavailable=0 do not use bmap-tools:
if [ "${OPT_SPARSE}" -eq 0 ];
then
which bmaptool >/dev/null 2>&1
if [ $? -eq 0 ];
then
echo "[+] Defaulting to sparse image generation as bmaptool is available"
OPT_SPARSE=1
---
scripts/create_sibling.sh | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/scripts/create_sibling.sh b/scripts/create_sibling.sh
index f2f5c5f..973e95e 100755
--- a/scripts/create_sibling.sh
+++ b/scripts/create_sibling.sh
@@ -5,7 +5,7 @@
set -eu
REQUIREMENTS=( wget gunzip git dd e2fsck resize2fs parted losetup qemu-system-x86_64 )
-DEBREQUIREMENTS=( wget gzip git parted qemu-system-x86 qemu-user-static bmap-tools )
+DEBREQUIREMENTS=( wget gzip git parted qemu-system-x86 qemu-user-static )
REPO_DIR="$(dirname "$(dirname "$(realpath "$0")")")"
TMP_DIR="${REPO_DIR}/tmp"
MNT_DIR="${TMP_DIR}/mnt"
@@ -93,11 +93,8 @@ function provide_raspbian() {
function setup_raspbian(){
# Detect the ability to create sparse files
- if [ "${OPT_SPARSE}" -eq 0 ];
- then
- which bmaptool >/dev/null 2>&1
- if [ $? -eq 0 ];
- then
+ if [ "${OPT_SPARSE}" -eq 0 ]; then
+ if [ which bmaptool -eq 0 ]; then
echo "[+] Defaulting to sparse image generation as bmaptool is available"
OPT_SPARSE=1
else