diff options
author | Gianfranco Costamagna <costamagna.gianfranco@gmail.com> | 2019-03-29 10:32:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-04 22:57:32 +0100 |
commit | b495e757da270e42cfff3c34496d935ebe53762c (patch) | |
tree | ca64f1054af1ee4840858289a2ec956ac56ed750 | |
parent | ffa5a1bda6741f5dc9f1b8db1bb37b0c6f103c99 (diff) | |
download | poky-b495e757da270e42cfff3c34496d935ebe53762c.tar.gz |
toolchain-shar-extract/init-install-efi-testfs: Unify question spaces
unify the spacing for questions in various places e.g. before the [Y/n]
there should be a space, and before "?" there should be none. Unify the
questions where the system expect an answer from the end user.
(From OE-Core rev: 7a3f128b19e55b751e81bc676e5946544b0c8735)
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/files/toolchain-shar-extract.sh | 4 | ||||
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 9eabd62630..156085b500 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh | |||
@@ -185,11 +185,11 @@ fi | |||
185 | 185 | ||
186 | if [ -e "$target_sdk_dir/environment-setup-@REAL_MULTIMACH_TARGET_SYS@" ]; then | 186 | if [ -e "$target_sdk_dir/environment-setup-@REAL_MULTIMACH_TARGET_SYS@" ]; then |
187 | echo "The directory \"$target_sdk_dir\" already contains a SDK for this architecture." | 187 | echo "The directory \"$target_sdk_dir\" already contains a SDK for this architecture." |
188 | printf "If you continue, existing files will be overwritten! Proceed[y/N]? " | 188 | printf "If you continue, existing files will be overwritten! Proceed [y/N]? " |
189 | 189 | ||
190 | default_answer="n" | 190 | default_answer="n" |
191 | else | 191 | else |
192 | printf "You are about to install the SDK to \"$target_sdk_dir\". Proceed[Y/n]? " | 192 | printf "You are about to install the SDK to \"$target_sdk_dir\". Proceed [Y/n]? " |
193 | 193 | ||
194 | default_answer="y" | 194 | default_answer="y" |
195 | fi | 195 | fi |
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh index 9c4b263d54..b351985a61 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh | |||
@@ -27,7 +27,7 @@ do | |||
27 | # Try sleeping here to avoid getting kernel messages | 27 | # Try sleeping here to avoid getting kernel messages |
28 | # obscuring/confusing user | 28 | # obscuring/confusing user |
29 | sleep 5 | 29 | sleep 5 |
30 | echo "Found drive at /dev/${device}. Do you want to install this image there ? [y/n]" | 30 | echo "Found drive at /dev/${device}. Do you want to install this image there? [y/n]" |
31 | read answer | 31 | read answer |
32 | if [ "$answer" = "y" ] ; then | 32 | if [ "$answer" = "y" ] ; then |
33 | break | 33 | break |