mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-01 22:25:22 +00:00
Use { } instead of ( ) for grouping shell commands so that
variable assignments are retained ( () creates a subshell) Reported-by: Michael Bretterklieber <mbretter@inode.at>
This commit is contained in:
parent
dfd7dc61b9
commit
99d1dbfdb0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=90659
|
@ -327,14 +327,14 @@ main_dialog() {
|
|||
fi
|
||||
done
|
||||
log $l
|
||||
(dialog --menu "Setup the type of configuration" 12 70 5 $l \
|
||||
2> ${c_reply} && set_type "`cat ${c_reply}`" ${SITE} ) || true
|
||||
{ dialog --menu "Setup the type of configuration" 12 70 5 $l \
|
||||
2> ${c_reply} && set_type "`cat ${c_reply}`" ${SITE} ; } || true
|
||||
;;
|
||||
I)
|
||||
(dialog --menu "Choose your init(8) program" \
|
||||
{ dialog --menu "Choose your init(8) program" \
|
||||
10 70 2 init "Standard init (requires getty)" \
|
||||
oinit "small init from TinyWare" 2> ${c_reply} \
|
||||
&& init_name=`cat ${c_reply}` ) || true
|
||||
&& init_name=`cat ${c_reply}` ; } || true
|
||||
;;
|
||||
|
||||
K) ${EDITOR} ${MY_TREE}/PICOBSD ;;
|
||||
|
@ -342,23 +342,23 @@ main_dialog() {
|
|||
E) ${EDITOR} ${MY_TREE}/crunch.conf ;;
|
||||
|
||||
S)
|
||||
( dialog --title "MFS Size setup" --inputbox \
|
||||
{ dialog --title "MFS Size setup" --inputbox \
|
||||
"MFS size depends on what you need to put on the MFS image. Typically \
|
||||
ranges between 820kB (for very small bridge/router images) to \
|
||||
as much as 2500kB kB for a densely packed image. \
|
||||
Keep in mind that this memory is \
|
||||
totally lost to other programs. Usually you want to keep \
|
||||
this as small as possible. " 10 70 2> ${c_reply} \
|
||||
&& MFS_SIZE=`cat ${c_reply}` ) || true
|
||||
&& MFS_SIZE=`cat ${c_reply}` ; } || true
|
||||
;;
|
||||
|
||||
\$)
|
||||
(dialog --title "Site info setup" --inputbox \
|
||||
{ dialog --title "Site info setup" --inputbox \
|
||||
"Please enter the full path to the directory \
|
||||
containing site-specific setup. \
|
||||
This directory tree must contain files that replace \
|
||||
standard ones in floppy.tree/ and mfs.tree/ . " \
|
||||
10 70 2> ${c_reply} && SITE=`cat ${c_reply}` ) || true
|
||||
10 70 2> ${c_reply} && SITE=`cat ${c_reply}` ; } || true
|
||||
;;
|
||||
|
||||
F)
|
||||
|
|
Loading…
Reference in a new issue