aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/.aglsetup_genconfig.bash2
-rw-r--r--templates/base/01_setup_EULAfunc.sh5
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index 6be95d0fa..c6e5a36a1 100755
--- a/scripts/.aglsetup_genconfig.bash
+++ b/scripts/.aglsetup_genconfig.bash
@@ -340,7 +340,7 @@ EOF
append_fragment $BUILDDIR/conf/setup.sh "" "echo '--- end of setup script'"
infon " Executing setup script ... "
- execute_setup $BUILDDIR/conf/setup.sh >$BUILDDIR/conf/setup.log 2>&1 \
+ execute_setup $BUILDDIR/conf/setup.sh 2>&1 | tee $BUILDDIR/conf/setup.log \
&& {
info "OK"
[[ $VERBOSE == 1 ]] && dump_log $BUILDDIR/conf/setup.log
diff --git a/templates/base/01_setup_EULAfunc.sh b/templates/base/01_setup_EULAfunc.sh
index 7b1ca870d..28d7d926a 100644
--- a/templates/base/01_setup_EULAfunc.sh
+++ b/templates/base/01_setup_EULAfunc.sh
@@ -24,8 +24,7 @@ The BSP for $MACHINE depends on packages and firmware which are covered by an
End User License Agreement (EULA). To have the right to use these binaries
in your images, you need to read and accept the following...
-The firmware package can contains several types
-of firmware (depending on BSP):
+The firmware package can contains several types of firmware (depending on BSP):
* bootloaders: the first stage bootloaders are proprietary for this
board, they are included in this firmware package.
@@ -40,7 +39,7 @@ EOF
echo
REPLY=
while [ -z "$REPLY" ]; do
- echo -n "Do you read the EULA ? (y/n) "
+ echo -n "Do you want to read the EULA ? (y/n) "
read REPLY
case "$REPLY" in
y|Y)