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

first attempt at adding TIMEZONE and LOCALE variables

This commit is contained in:
Strit 2018-12-26 21:09:53 +01:00
parent da49ea0ee3
commit e6b6e4acdb
No known key found for this signature in database
GPG Key ID: 084A7FC0035B1D49
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
manjaro-arm-installer
View File

@ -12,6 +12,8 @@ USER=""
PASSWORD="" PASSWORD=""
ROOTPASSWORD="" ROOTPASSWORD=""
SDCARD="" SDCARD=""
TIMEZONE=""
LOCALE=""
# Sanity checks for dependencies # Sanity checks for dependencies
if [ ! -f /usr/bin/sudo ] if [ ! -f /usr/bin/sudo ]
@ -142,6 +144,8 @@ create_install() {
#system setup #system setup
sudo systemd-nspawn -D $TMPDIR/root chmod u+s /usr/bin/ping 1> /dev/null 2>&1 sudo systemd-nspawn -D $TMPDIR/root chmod u+s /usr/bin/ping 1> /dev/null 2>&1
sudo systemd-nspawn -D $TMPDIR/root update-ca-trust 1> /dev/null 2>&1 sudo systemd-nspawn -D $TMPDIR/root update-ca-trust 1> /dev/null 2>&1
sudo systemd-nspawn -D $TMPDIR/root timedatectl set-timezone "$TIMEZONE"
sudo systemd-nspawn -D $TMPDIR/root localectl set-locale "$LOCALE"
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
@ -391,6 +395,29 @@ else
fi fi
if [ ! -z "$SDCARD" ]
then
TIMEZONE=$(dialog --clear --title "Manjaro ARM Installer" \
--inputbox "Enter timezone (example Europe/London):" 8 50 \
3>&1 1>&2 2>&3 3>&- \
)
else
clear
exit 1
fi
if [ ! -z "$TIMEZONE" ]
then
LOCALE=$(dialog --clear --title "Manjaro ARM Installer" \
--inputbox "Enter locale (example en_US-utf8):" 8 50 \
3>&1 1>&2 2>&3 3>&- \
)
else
clear
exit 1
fi
# List all the responses upon completion to be verified # List all the responses upon completion to be verified
clear clear
echo "Device = $DEVICE" echo "Device = $DEVICE"
@ -399,6 +426,8 @@ echo "User name = $USER"
echo "Password for $USER = ($PASSWORD)" echo "Password for $USER = ($PASSWORD)"
echo "Root Password = ($ROOTPASSWORD)" echo "Root Password = ($ROOTPASSWORD)"
echo "SDCard = $SDCARD" echo "SDCard = $SDCARD"
echo "Timezone = $TIMEZONE"
echo "Locale = $LOCALE"
echo "Are the above settings correct?" echo "Are the above settings correct?"
select yn in "Yes" "No"; do select yn in "Yes" "No"; do