summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorKlemens Nanni <kn@cvs.openbsd.org>2022-10-04 19:34:45 +0000
committerKlemens Nanni <kn@cvs.openbsd.org>2022-10-04 19:34:45 +0000
commitab70a396274ae7f362601c5afcfea03ba51f6da3 (patch)
tree3f2823716e2c2eed1d06c8cc90ad511bad5e3819 /distrib
parentff9ddf9653f44e8ba48546116f0851097183e0ba (diff)
sh(1) is not make(1), use newlines inside double quotes
sh(1) happily accepts newlines inside double quotes just like in scripts: $ sh -c "echo foo echo bar" foo bar So no need to squash things into a single line as usually done inside make targets where each makefile line is considered its own script unless continued with trailing backslashes. OK millert
Diffstat (limited to 'distrib')
-rw-r--r--distrib/miniroot/install.sub10
1 files changed, 5 insertions, 5 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 651eae478d1..8af91b509c0 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sub,v 1.1207 2022/09/27 12:28:25 kn Exp $
+# $OpenBSD: install.sub,v 1.1208 2022/10/04 19:34:44 kn Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -2927,10 +2927,10 @@ __EOT
mkdir -m 700 -p $_kernel_dir
tar -C $_kernel_dir -xzf $_kernel_dir.tgz $_kernel
rm -f $_kernel_dir.tgz
- chroot /mnt /bin/ksh -e -c "cd ${_kernel_dir#/mnt}/$_kernel; \
- make newbsd; \
- [ -f /etc/bsd.re-config ] && \
- config -e -c /etc/bsd.re-config -f bsd; \
+ chroot /mnt /bin/ksh -e -c "cd ${_kernel_dir#/mnt}/$_kernel
+ make newbsd
+ [ -f /etc/bsd.re-config ] &&
+ config -e -c /etc/bsd.re-config -f bsd
make newinstall"
) >/dev/null 2>&1 && echo " done." || echo " failed."
fi