DistriLab/clic-rpi-image
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Strip trailing spaces

Browse source
This commit is contained in:
Serge Schneider 2022-02-02 14:01:30 +00:00
parent 0b4874f75a
commit c393ef105e
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -328,7 +328,7 @@ maintenance and allows for more easy customization.
- **Stage 5** - The Raspbian Full image. More development - **Stage 5** - The Raspbian Full image. More development
tools, an email client, learning tools like Scratch, specialized packages tools, an email client, learning tools like Scratch, specialized packages
like sonic-pi, office productivity, etc. like sonic-pi, office productivity, etc.
### Stage specification ### Stage specification
@ -380,8 +380,8 @@ Example:
```bash ```bash
root@build-machine:~/$ lsblk | grep nbd root@build-machine:~/$ lsblk | grep nbd
nbd1 43:32 0 10G 0 disk nbd1 43:32 0 10G 0 disk
├─nbd1p1 43:33 0 10G 0 part ├─nbd1p1 43:33 0 10G 0 part
└─nbd1p1 253:0 0 10G 0 part └─nbd1p1 253:0 0 10G 0 part
root@build-machine:~/$ ps xa | grep qemu-nbd 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: 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 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 or
sudo ./imagetool.sh --cleanup 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. 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 # Troubleshooting

2
build-docker.sh
View file

@ -48,7 +48,7 @@ fi
CONTAINER_NAME=${CONTAINER_NAME:-pigen_work} CONTAINER_NAME=${CONTAINER_NAME:-pigen_work}
CONTINUE=${CONTINUE:-0} CONTINUE=${CONTINUE:-0}
PRESERVE_CONTAINER=${PRESERVE_CONTAINER:-0} PRESERVE_CONTAINER=${PRESERVE_CONTAINER:-0}
PIGEN_DOCKER_OPTS=${PIGEN_DOCKER_OPTS:-""} PIGEN_DOCKER_OPTS=${PIGEN_DOCKER_OPTS:-""}
if [ -z "${IMG_NAME}" ]; then if [ -z "${IMG_NAME}" ]; then
echo "IMG_NAME not set in 'config'" 1>&2 echo "IMG_NAME not set in 'config'" 1>&2

4
build.sh
View file

@ -133,7 +133,7 @@ run_stage(){
done done
fi fi
if [ "${USE_QCOW2}" = "1" ]; then if [ "${USE_QCOW2}" = "1" ]; then
unload_qimage unload_qimage
else else
# make sure we are not umounting during export-image stage # make sure we are not umounting during export-image stage
@ -369,7 +369,7 @@ for EXPORT_DIR in ${EXPORT_DIRS}; do
else else
run_stage run_stage
fi fi
if [ "${USE_QEMU}" != "1" ]; then if [ "${USE_QEMU}" != "1" ]; then
if [ -e "${EXPORT_DIR}/EXPORT_NOOBS" ]; then if [ -e "${EXPORT_DIR}/EXPORT_NOOBS" ]; then
# shellcheck source=/dev/null # shellcheck source=/dev/null