|
@@ -579,17 +579,22 @@ function interactive_configuration {
|
579
|
579
|
save_configuration_file
|
580
|
580
|
fi
|
581
|
581
|
|
582
|
|
- data=$(tempfile 2>/dev/null)
|
583
|
|
- trap "rm -f $data" 0 1 2 5 15
|
584
|
|
- dialog --title "Select the user account to install as" \
|
585
|
|
- --backtitle "Freedombone Configuration" \
|
586
|
|
- --dselect "/home/$(grep 'MY_USERNAME' temp.cfg | awk -F '=' '{print $2}')" 14 40 2> $data
|
587
|
|
- sel=$?
|
588
|
|
- case $sel in
|
589
|
|
- 0) MY_USERNAME=$(cat $data | awk -F '/' '{print $3}');;
|
590
|
|
- 1) exit 1;;
|
591
|
|
- 255) exit 1;;
|
592
|
|
- esac
|
|
582
|
+ if [[ $SYSTEM_TYPE == "$VARIANT_MESH" && $DEFAULT_DOMAIN_NAME && -d /home/$DEFAULT_DOMAIN_NAME ]]; then
|
|
583
|
+ MY_USERNAME=$DEFAULT_DOMAIN_NAME
|
|
584
|
+ else
|
|
585
|
+ data=$(tempfile 2>/dev/null)
|
|
586
|
+ trap "rm -f $data" 0 1 2 5 15
|
|
587
|
+ dialog --title "Select the user account to install as" \
|
|
588
|
+ --backtitle "Freedombone Configuration" \
|
|
589
|
+ --dselect "/home/$(grep 'MY_USERNAME' temp.cfg | awk -F '=' '{print $2}')" 14 40 2> $data
|
|
590
|
+ sel=$?
|
|
591
|
+ case $sel in
|
|
592
|
+ 0) MY_USERNAME=$(cat $data | awk -F '/' '{print $3}');;
|
|
593
|
+ 1) exit 1;;
|
|
594
|
+ 255) exit 1;;
|
|
595
|
+ esac
|
|
596
|
+ fi
|
|
597
|
+
|
593
|
598
|
if [ ! $MY_USERNAME ]; then
|
594
|
599
|
echo 'No user account was selected'
|
595
|
600
|
exit 64398
|
|
@@ -948,7 +953,7 @@ function interactive_configuration {
|
948
|
953
|
save_configuration_file
|
949
|
954
|
fi
|
950
|
955
|
|
951
|
|
- if [[ $SYSTEM_TYPE != $VARIANT_MESH ]]; then
|
|
956
|
+ if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
|
952
|
957
|
while [ ! $MY_NAME ]
|
953
|
958
|
do
|
954
|
959
|
data=$(tempfile 2>/dev/null)
|