summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2015-12-05 16:28:14 +0000
committerimp <imp@FreeBSD.org>2015-12-05 16:28:14 +0000
commit4019e88aeea6550f16ee2d9a1751f2f69ad622f0 (patch)
tree378c252baa2844857bebc915ae8b77791becd095 /tools
parente42fe0394612e3d7f52ab73516e112ab7b2f84be (diff)
downloadFreeBSD-src-4019e88aeea6550f16ee2d9a1751f2f69ad622f0.zip
FreeBSD-src-4019e88aeea6550f16ee2d9a1751f2f69ad622f0.tar.gz
Stupid last minute changes: Add missing } and fi
Pointed out by: Howard Su
Diffstat (limited to 'tools')
-rwxr-xr-xtools/tools/nanobsd/defaults.sh2
-rw-r--r--tools/tools/nanobsd/embedded/common1
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
index cd4d921..fdb2360 100755
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -961,7 +961,7 @@ set_defaults_and_export ( ) {
[ ! -d "${NANO_TOOLS}" ] && [ -d "${NANO_SRC}/${NANO_TOOLS}" ] && \
NANO_TOOLS="${NANO_SRC}/${NANO_TOOLS}" || true
- [ ! -z "${NANO_NOPRIV_BUILD" ] && [ -z "${NANO_METALOG}"] && \
+ [ ! -z "${NANO_NOPRIV_BUILD}" ] && [ -z "${NANO_METALOG}"] && \
NANO_METALOG=${NANO_OBJ}/_.metalog || true
NANO_STARTTIME=`date +%s`
diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common
index 0a15833..2d88456 100644
--- a/tools/tools/nanobsd/embedded/common
+++ b/tools/tools/nanobsd/embedded/common
@@ -359,6 +359,7 @@ create_diskimage ( ) (
mkimg -s mbr -p ${s1}:=${NANO_OBJ}/_.s1 \
-p ${s2}:=${NANO_OBJ}/_.s2
-o ${NANO_OBJ}/_.disk.image.${NANO_NAME}
+ fi
) > ${NANO_OBJ}/_.di 2>&1
)
OpenPOWER on IntegriCloud