git: 98bac6fb064c - stable/14 - nanobsd: Fix the fix to a typo
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 02 Jan 2024 19:05:22 UTC
The branch stable/14 has been updated by glebius:
URL: https://cgit.FreeBSD.org/src/commit/?id=98bac6fb064ca7536ddb67b845c653b926b699a5
commit 98bac6fb064ca7536ddb67b845c653b926b699a5
Author: Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2023-12-21 18:13:44 +0000
Commit: Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2024-01-02 19:05:08 +0000
nanobsd: Fix the fix to a typo
Submitted by: jlduran@gmail.com
Reviewed by: imp, glebius, emaste
PR: 275691
Differential Revision: https://reviews.freebsd.org/D43035
Fixes: d8c70d6dfb65218dd3272b34512083621d3ed46d
(cherry picked from commit 330089470f56d502c629352b85e11522691e3368)
---
tools/tools/nanobsd/defaults.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
index d9de03fe72da..55314d7ef78d 100755
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -884,7 +884,7 @@ export_var ( ) { # Don't wawnt a subshell
# Call this function to set defaults _after_ parsing options.
# dont want a subshell otherwise variable setting is thrown away.
set_defaults_and_export ( ) {
- : ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}${NANO_LAYOUT}:+.${NANO_LAYOUT}}
+ : ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}${NANO_LAYOUT:+.${NANO_LAYOUT}}}
: ${MAKEOBJDIRPREFIX:=${NANO_OBJ}}
: ${NANO_DISKIMGDIR:=${NANO_OBJ}}
: ${NANO_WORLDDIR:=${NANO_OBJ}/_.w}