jess
/
manjaro-arm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix locale and add keymap and hostname selection

This commit is contained in:
Dan Johansen 2019-01-24 11:44:43 +01:00
parent c28ad0d6ed
commit cc091092c5
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
manjaro-arm-installer
View File

@ -142,8 +142,10 @@ create_install() {
$NSPAWN $TMPDIR/root update-ca-trust 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root update-ca-trust 1> /dev/null 2>&1
$NSPAWN $TMPDIR/root ln -sf /usr/share/zoneinfo/"$TIMEZONE" /etc/localtime 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root ln -sf /usr/share/zoneinfo/"$TIMEZONE" /etc/localtime 1> /dev/null 2>&1
$NSPAWN $TMPDIR/root sed -i s/"#$LOCALE"/"$LOCALE"/g /etc/locale.gen 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root sed -i s/"#$LOCALE"/"$LOCALE"/g /etc/locale.gen 1> /dev/null 2>&1
$NSPAWN $TMPDIR/root sed -i s/"LANG=en_US.utf8"/"LANG=$LOCALE"/g /etc/locale.conf 1> /dev/null 2>&1 echo "LANG=$LOCALE" | sudo tee --append $TMPDIR/root/etc/locale.conf 1> /dev/null 2>&1
$NSPAWN $TMPDIR/root locale-gen $NSPAWN $TMPDIR/root locale-gen
echo "KEYMAP=$KEYMAP" | sudo tee --append $TMPDIR/root/etc/vconsole.conf 1> /dev/null 2>&1
echo "$HOSTNAME" | sudo tee --append $TMPDIR/root/etc/hostname 1> /dev/null 2>&1
msg "Doing device specific setups for $DEVICE..." msg "Doing device specific setups for $DEVICE..."
if [[ "$DEVICE" = "rpi2" ]] || [[ "$DEVICE" = "rpi3" ]]; then if [[ "$DEVICE" = "rpi2" ]] || [[ "$DEVICE" = "rpi3" ]]; then
@ -407,7 +409,6 @@ TIMEZONE=$(dialog --clear --title "Manjaro ARM Installer" \
--menu "Chose your timezone!" 20 50 15 \ --menu "Chose your timezone!" 20 50 15 \
"${W[@]}" 3>&1 1>&2 2>&3 3>&- \ "${W[@]}" 3>&1 1>&2 2>&3 3>&- \
) )
# --inputbox "Enter timezone (example Europe/London):" 8 50 \
else else
clear clear
exit 1 exit 1
@ -426,7 +427,6 @@ LOCALE=$(dialog --clear --title "Manjaro ARM Installer" \
--menu "Chose your locale!" 20 50 15 \ --menu "Chose your locale!" 20 50 15 \
"${W[@]}" 3>&1 1>&2 2>&3 3>&- \ "${W[@]}" 3>&1 1>&2 2>&3 3>&- \
) )
# --inputbox "Enter locale (example en_US.UTF-8):" 8 50 \
else else
clear clear
exit 1 exit 1
@ -434,16 +434,44 @@ fi
if [ ! -z "$LOCALE" ] if [ ! -z "$LOCALE" ]
then then
let i=0
W=()
while read -r line; do
let i=$i+1
W+=($line "")
done < <( localectl list-keymaps )
KEYMAP=$(dialog --clear --title "Manjaro ARM Installer" \
--menu "Choose your locale!" 20 50 15 \
"${W[@]}" 3>&1 1>&2 2>&3 3>&- \
)
else
clear
exit 1
fi
if [ ! -z "$KEYMAP" ]
then
HOSTNAME=$(dialog --clear --title "Manjaro ARM Installer" \
--inputbox "Enter desired hostname for this system:" 8 50 \
3>&1 1>&2 2>&3 3>&- \
)
else
clear
exit 1
fi
if [ ! -z "$HOSTNAME" ]
then
dialog --clear --title "Manjaro ARM Installer" \ dialog --clear --title "Manjaro ARM Installer" \
--yesno "Is the below information correct: --yesno "Is the below information correct:
Device = $DEVICE
Edition = $EDITION
Username = $USER Username = $USER
Password for $USER = $PASSWORD Password for $USER = $PASSWORD
Password for root = $ROOTPASSWORD Password for root = $ROOTPASSWORD
SD/eMMC card = $SDCARD SD Card = $SDCARD
Timezone = $TIMEZONE Timezone = $TIMEZONE
Locale = $LOCALE" 20 50 \ Locale = $LOCALE
Keyboard layout = $KEYMAP
Hostname = $HOSTNAME" 20 50 \
3>&1 1>&2 2>&3 3>&- 3>&1 1>&2 2>&3 3>&-
else else
clear clear