aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--LICENSE (renamed from License.md)0
-rwxr-xr-xREADME.md4
-rwxr-xr-xbuild-docker.sh1
-rw-r--r--depends2
-rw-r--r--export-image/00-allow-rerun/files/policy-rc.d1
-rwxr-xr-xexport-image/02-network/01-run.sh2
-rwxr-xr-xexport-image/03-set-partuuid/00-run.sh1
-rwxr-xr-xexport-image/prerun.sh1
-rw-r--r--scripts/dependencies_check4
-rwxr-xr-xstage0/prerun.sh1
-rwxr-xr-xstage1/01-sys-tweaks/files/policy-rc.d1
-rwxr-xr-xstage1/prerun.sh1
-rwxr-xr-xstage2/prerun.sh1
-rwxr-xr-xstage3/00-install-packages/01-run.sh1
-rwxr-xr-xstage3/prerun.sh1
-rwxr-xr-xstage4/prerun.sh1
-rwxr-xr-xstage5/prerun.sh1
17 files changed, 17 insertions, 7 deletions
diff --git a/License.md b/LICENSE
index a50089f..a50089f 100644
--- a/License.md
+++ b/LICENSE
diff --git a/README.md b/README.md
index 2b0f439..385f1a9 100755
--- a/README.md
+++ b/README.md
@@ -132,11 +132,11 @@ maintenance and allows for more easy customization.
standard console hardware permission groups.
There are a few tools that may not make a whole lot of sense here for
- development purposes on a minimal system such as basic python and lua
+ development purposes on a minimal system such as basic Python and Lua
packages as well as the `build-essential` package. They are lumped right
in with more essential packages presently, though they need not be with
pi-gen. These are understandable for Raspbian's target audience, but if
- you were looking for something between truly minimal and Raspbian-lite,
+ you were looking for something between truly minimal and Raspbian-Lite,
here's where you start trimming.
- **Stage 3** - desktop system. Here's where you get the full desktop system
diff --git a/build-docker.sh b/build-docker.sh
index 5e3c5ff..c5db00f 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -1,4 +1,5 @@
#!/bin/bash -e
+
DOCKER="docker"
set +e
$DOCKER ps >/dev/null 2>&1
diff --git a/depends b/depends
index c453281..fa2110b 100644
--- a/depends
+++ b/depends
@@ -9,4 +9,4 @@ mkdosfs:dosfstools
capsh:libcap2-bin
bsdtar
grep
-rsync \ No newline at end of file
+rsync
diff --git a/export-image/00-allow-rerun/files/policy-rc.d b/export-image/00-allow-rerun/files/policy-rc.d
index 0b1556d..1924710 100644
--- a/export-image/00-allow-rerun/files/policy-rc.d
+++ b/export-image/00-allow-rerun/files/policy-rc.d
@@ -1,2 +1,3 @@
#!/bin/sh
+
exit 101
diff --git a/export-image/02-network/01-run.sh b/export-image/02-network/01-run.sh
index 9026a1f..e21b791 100755
--- a/export-image/02-network/01-run.sh
+++ b/export-image/02-network/01-run.sh
@@ -1,3 +1,3 @@
-#/bin/bash -e
+#!/bin/bash -e
install -m 644 files/resolv.conf ${ROOTFS_DIR}/etc/
diff --git a/export-image/03-set-partuuid/00-run.sh b/export-image/03-set-partuuid/00-run.sh
index f19884e..dccc55e 100755
--- a/export-image/03-set-partuuid/00-run.sh
+++ b/export-image/03-set-partuuid/00-run.sh
@@ -1,4 +1,5 @@
#!/bin/bash -e
+
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
IMGID="$(fdisk -l ${IMG_FILE} | sed -n 's/Disk identifier: 0x\([^ ]*\)/\1/p')"
diff --git a/export-image/prerun.sh b/export-image/prerun.sh
index 67da3da..7acfedc 100755
--- a/export-image/prerun.sh
+++ b/export-image/prerun.sh
@@ -1,4 +1,5 @@
#!/bin/bash -e
+
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
unmount_image ${IMG_FILE}
diff --git a/scripts/dependencies_check b/scripts/dependencies_check
index 4817561..d649f0c 100644
--- a/scripts/dependencies_check
+++ b/scripts/dependencies_check
@@ -1,5 +1,5 @@
# dependencies_check
-# $@ Dependnecy files to check
+# $@ Dependency files to check
#
# Each dependency is in the form of a tool to test for, optionally followed by
# a : and the name of a package if the package on a Debian-ish system is not
@@ -21,7 +21,7 @@ dependencies_check()
done
if [[ "$missing" ]]; then
- echo "Reqired dependencies not installed"
+ echo "Required dependencies not installed"
echo
echo "This can be resolved on Debian/Raspbian systems by installing:"
echo "$missing"
diff --git a/stage0/prerun.sh b/stage0/prerun.sh
index d2bce14..74ec2a0 100755
--- a/stage0/prerun.sh
+++ b/stage0/prerun.sh
@@ -1,4 +1,5 @@
#!/bin/bash -e
+
if [ ! -d ${ROOTFS_DIR} ]; then
bootstrap jessie ${ROOTFS_DIR} http://mirrordirector.raspbian.org/raspbian/
fi
diff --git a/stage1/01-sys-tweaks/files/policy-rc.d b/stage1/01-sys-tweaks/files/policy-rc.d
index 0b1556d..1924710 100755
--- a/stage1/01-sys-tweaks/files/policy-rc.d
+++ b/stage1/01-sys-tweaks/files/policy-rc.d
@@ -1,2 +1,3 @@
#!/bin/sh
+
exit 101
diff --git a/stage1/prerun.sh b/stage1/prerun.sh
index a5ea5f4..ebb5d35 100755
--- a/stage1/prerun.sh
+++ b/stage1/prerun.sh
@@ -1,4 +1,5 @@
#!/bin/bash -e
+
if [ ! -d ${ROOTFS_DIR} ]; then
copy_previous
fi
diff --git a/stage2/prerun.sh b/stage2/prerun.sh
index a5ea5f4..ebb5d35 100755
--- a/stage2/prerun.sh
+++ b/stage2/prerun.sh
@@ -1,4 +1,5 @@
#!/bin/bash -e
+
if [ ! -d ${ROOTFS_DIR} ]; then
copy_previous
fi
diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh
index 871f4bc..d768747 100755
--- a/stage3/00-install-packages/01-run.sh
+++ b/stage3/00-install-packages/01-run.sh
@@ -6,4 +6,3 @@ update-alternatives --install /usr/bin/x-www-browser \
update-alternatives --install /usr/bin/gnome-www-browser \
gnome-www-browser /usr/bin/chromium-browser 86
EOF
-
diff --git a/stage3/prerun.sh b/stage3/prerun.sh
index a5ea5f4..ebb5d35 100755
--- a/stage3/prerun.sh
+++ b/stage3/prerun.sh
@@ -1,4 +1,5 @@
#!/bin/bash -e
+
if [ ! -d ${ROOTFS_DIR} ]; then
copy_previous
fi
diff --git a/stage4/prerun.sh b/stage4/prerun.sh
index a5ea5f4..ebb5d35 100755
--- a/stage4/prerun.sh
+++ b/stage4/prerun.sh
@@ -1,4 +1,5 @@
#!/bin/bash -e
+
if [ ! -d ${ROOTFS_DIR} ]; then
copy_previous
fi
diff --git a/stage5/prerun.sh b/stage5/prerun.sh
index a5ea5f4..ebb5d35 100755
--- a/stage5/prerun.sh
+++ b/stage5/prerun.sh
@@ -1,4 +1,5 @@
#!/bin/bash -e
+
if [ ! -d ${ROOTFS_DIR} ]; then
copy_previous
fi