Skip to content

GitLab

M
manjaro-arm-installer
Commit 2ac3554d authored by Dan Johansen's avatar Dan Johansen
Browse files
Options

timezone and locale requires a bootes system, commented it out

parent 0f7a035c
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
manjaro-arm-installer
View file @ 2ac3554d
...@@ -12,8 +12,8 @@ USER="" ...@@ -12,8 +12,8 @@ USER=""
PASSWORD="" PASSWORD=""
ROOTPASSWORD="" ROOTPASSWORD=""
SDCARD="" SDCARD=""
TIMEZONE="" #TIMEZONE=""
LOCALE="" #LOCALE=""
# Sanity checks for dependencies # Sanity checks for dependencies
#if [ ! -f /usr/bin/sudo ] #if [ ! -f /usr/bin/sudo ]
...@@ -144,8 +144,8 @@ create_install() { ...@@ -144,8 +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 timedatectl set-timezone "$TIMEZONE"
sudo systemd-nspawn -D $TMPDIR/root localectl set-locale "$LOCALE" # 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
...@@ -395,28 +395,28 @@ else ...@@ -395,28 +395,28 @@ else
fi fi
if [ ! -z "$SDCARD" ] #if [ ! -z "$SDCARD" ]
then #then
TIMEZONE=$(dialog --clear --title "Manjaro ARM Installer" \ #TIMEZONE=$(dialog --clear --title "Manjaro ARM Installer" \
--inputbox "Enter timezone (example Europe/London):" 8 50 \ # --inputbox "Enter timezone (example Europe/London):" 8 50 \
3>&1 1>&2 2>&3 3>&- \ # 3>&1 1>&2 2>&3 3>&- \
) # )
else #else
clear # clear
exit 1 # exit 1
fi #fi
if [ ! -z "$TIMEZONE" ] #if [ ! -z "$TIMEZONE" ]
then #then
LOCALE=$(dialog --clear --title "Manjaro ARM Installer" \ #LOCALE=$(dialog --clear --title "Manjaro ARM Installer" \
--inputbox "Enter locale (example en_US.UTF-8):" 8 50 \ # --inputbox "Enter locale (example en_US.UTF-8):" 8 50 \
3>&1 1>&2 2>&3 3>&- \ # 3>&1 1>&2 2>&3 3>&- \
) # )
else #else
clear # clear
exit 1 # exit 1
fi #fi
# List all the responses upon completion to be verified # List all the responses upon completion to be verified
clear clear
...@@ -426,8 +426,8 @@ echo "User name = $USER" ...@@ -426,8 +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 "Timezone = $TIMEZONE"
echo "Locale = $LOCALE" #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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment