Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: void-linux/void-mklive
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fdd3c950f1434257538b3cd26e15c9b59a0e8e9d
Choose a base ref
..
head repository: void-linux/void-mklive
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 518b9260171f15a4a05fd81cb9151b51ea0413cd
Choose a head ref
Showing with 8 additions and 1 deletion.
  1. +4 −0 dracut/autoinstaller/autoinstall.cfg
  2. +4 −1 dracut/autoinstaller/install.sh
4 changes: 4 additions & 0 deletions dracut/autoinstaller/autoinstall.cfg
View file
Original file line number Diff line number Diff line change
@@ -38,6 +38,10 @@
# ===
# Misc. Options
# ===
# timezone: Timezone in TZ format
# default: America/Chicago
#timezone="America/Chicago"

# keymap: Keymap to use by default
# default: us
#keymap="us"
5 changes: 4 additions & 1 deletion dracut/autoinstaller/install.sh
View file
Original file line number Diff line number Diff line change
@@ -129,10 +129,12 @@ VAI_configure_hostname() {
}

VAI_configure_rc_conf() {
# Set the value of various tokens
if [ "${keymap}" != "us" ] ; then
sed -i "s:\"es\":\"${keymap}\":" "${target}/etc/rc.conf"
sed -i "s:#KEYMAP:KEYMAP:" "${target}/etc/rc.conf"
fi

ln -s "/usr/share/zoneinfo/${timezone}" /etc/localtime
}

VAI_add_user() {
@@ -221,6 +223,7 @@ VAI_configure_autoinstall() {
hostname_expr='[.[]|select(.operstate=="UP").addr_info.[]|select(.scope=="global").local].[0]'
hostname="$(ip --json -r a | jq -r "$hostname_expr")"
target="/mnt"
timezone="America/Chicago"
keymap="us"
libclocale="en_US.UTF-8"
username="voidlinux"