mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not offer locale option on musl

Browse Source 
fixes #152
This commit is contained in:
Enno Boland 2018-03-26 09:49:43 +02:00
parent c4e87c8d65
commit 62e850c614
1 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
installer.sh.in
View File

@ -1345,23 +1345,42 @@ menu() {
DEFITEM="Keyboard" DEFITEM="Keyboard"
fi fi
DIALOG --default-item $DEFITEM \ if xbps-uhelper arch | grep '-musl$'; then
--extra-button --extra-label "Settings" \ DIALOG --default-item $DEFITEM \
--title " Void Linux installation menu " \ --extra-button --extra-label "Settings" \
--menu "$MENULABEL" 10 70 0 \ --title " Void Linux installation menu " \
"Keyboard" "Set system keyboard" \ --menu "$MENULABEL" 10 70 0 \
"Network" "Set up the network" \ "Keyboard" "Set system keyboard" \
"Source" "Set source installation" \ "Network" "Set up the network" \
"Hostname" "Set system hostname" \ "Source" "Set source installation" \
"Locale" "Set system locale" \ "Hostname" "Set system hostname" \
"Timezone" "Set system time zone" \ "Timezone" "Set system time zone" \
"RootPassword" "Set system root password" \ "RootPassword" "Set system root password" \
"UserAccount" "Set primary user name and password" \ "UserAccount" "Set primary user name and password" \
"BootLoader" "Set disk to install bootloader" \ "BootLoader" "Set disk to install bootloader" \
"Partition" "Partition disk(s)" \ "Partition" "Partition disk(s)" \
"Filesystems" "Configure filesystems and mount points" \ "Filesystems" "Configure filesystems and mount points" \
"Install" "Start installation with saved settings" \ "Install" "Start installation with saved settings" \
"Exit" "Exit installation" "Exit" "Exit installation"
else
DIALOG --default-item $DEFITEM \
--extra-button --extra-label "Settings" \
--title " Void Linux installation menu " \
--menu "$MENULABEL" 10 70 0 \
"Keyboard" "Set system keyboard" \
"Network" "Set up the network" \
"Source" "Set source installation" \
"Hostname" "Set system hostname" \
"Locale" "Set system locale" \
"Timezone" "Set system time zone" \
"RootPassword" "Set system root password" \
"UserAccount" "Set primary user name and password" \
"BootLoader" "Set disk to install bootloader" \
"Partition" "Partition disk(s)" \
"Filesystems" "Configure filesystems and mount points" \
"Install" "Start installation with saved settings" \
"Exit" "Exit installation"
fi
if [ $? -eq 3 ]; then if [ $? -eq 3 ]; then
# Show settings # Show settings