From c393ef105eae82448d31194c28f54b71e1f83da7 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 2 Feb 2022 14:01:30 +0000 Subject: [PATCH] Strip trailing spaces --- README.md | 12 ++++++------ build-docker.sh | 2 +- build.sh | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 08b2c13..e1676bb 100644 --- a/README.md +++ b/README.md @@ -328,7 +328,7 @@ maintenance and allows for more easy customization. - **Stage 5** - The Raspbian Full image. More development tools, an email client, learning tools like Scratch, specialized packages - like sonic-pi, office productivity, etc. + like sonic-pi, office productivity, etc. ### Stage specification @@ -380,8 +380,8 @@ Example: ```bash root@build-machine:~/$ lsblk | grep nbd -nbd1 43:32 0 10G 0 disk -├─nbd1p1 43:33 0 10G 0 part +nbd1 43:32 0 10G 0 disk +├─nbd1p1 43:33 0 10G 0 part └─nbd1p1 253:0 0 10G 0 part root@build-machine:~/$ ps xa | grep qemu-nbd @@ -405,7 +405,7 @@ It can happen, that your build stops in case of an error. Normally `./build.sh` A typical message indicating that there are some orphaned device mapper entries is this: ``` -Failed to set NBD socket +Failed to set NBD socket Disconnect client, due to: Unexpected end-of-file before all bytes were read ``` @@ -428,10 +428,10 @@ If that happens go through the following steps: or sudo ./imagetool.sh --cleanup ``` - + Note: The `imagetool.sh` command will cleanup any /dev/nbdX that is not connected to a running `qemu-nbd` daemon. Be careful if you use network block devices for other tasks utilizing NBDs on your build machine as well. -Now you should be able to start a new build without running into troubles again. Most of the time, especially when using Docker build, you will only need no. 3 to get everything up and running again. +Now you should be able to start a new build without running into troubles again. Most of the time, especially when using Docker build, you will only need no. 3 to get everything up and running again. # Troubleshooting diff --git a/build-docker.sh b/build-docker.sh index 2dc55c1..a7f18f1 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -48,7 +48,7 @@ fi CONTAINER_NAME=${CONTAINER_NAME:-pigen_work} CONTINUE=${CONTINUE:-0} PRESERVE_CONTAINER=${PRESERVE_CONTAINER:-0} -PIGEN_DOCKER_OPTS=${PIGEN_DOCKER_OPTS:-""} +PIGEN_DOCKER_OPTS=${PIGEN_DOCKER_OPTS:-""} if [ -z "${IMG_NAME}" ]; then echo "IMG_NAME not set in 'config'" 1>&2 diff --git a/build.sh b/build.sh index bcfdeb6..6f6a0d2 100755 --- a/build.sh +++ b/build.sh @@ -133,7 +133,7 @@ run_stage(){ done fi - if [ "${USE_QCOW2}" = "1" ]; then + if [ "${USE_QCOW2}" = "1" ]; then unload_qimage else # make sure we are not umounting during export-image stage @@ -369,7 +369,7 @@ for EXPORT_DIR in ${EXPORT_DIRS}; do else run_stage - fi + fi if [ "${USE_QEMU}" != "1" ]; then if [ -e "${EXPORT_DIR}/EXPORT_NOOBS" ]; then # shellcheck source=/dev/null