From 6b801569adf20b97ee78cb341854df3db24e65c9 2018-11-23 13:39:56 From: Unknown Date: 2018-11-23 13:39:56 Subject: [PATCH] 0 --- diff --git a/bootstrap.d/12-locale.sh b/bootstrap.d/12-locale.sh index c469ec3..9817d7a 100644 --- a/bootstrap.d/12-locale.sh +++ b/bootstrap.d/12-locale.sh @@ -28,10 +28,10 @@ if [ "$(echo "$APT_INCLUDES" | grep ",locales")" ] ; then chroot_exec update-locale LANG="${DEFLOCAL}" # Install and setup default keyboard configuration - if [ "$XKB_MODEL" != "pc105" ] ; then + if [ "$XKB_MODEL" != "" ] ; then sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" "${ETC_DIR}/default/keyboard" fi - if [ "$XKB_LAYOUT" != "us" ] ; then + if [ "$XKB_LAYOUT" != "" ] ; then sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" "${ETC_DIR}/default/keyboard" fi if [ "$XKB_VARIANT" != "" ] ; then diff --git a/functions.sh b/functions.sh index 8f74bc3..38ac23a 100644 --- a/functions.sh +++ b/functions.sh @@ -85,7 +85,7 @@ set_kernel_config() { if grep -q "^${TGT}[^_]" .config; then sed -i "s/^\(${TGT}=.*\|# ${TGT} is not set\)/${TGT}=${REP}/" .config else - echo "${TGT}=${2}" >> .config + echo "${TGT}"="${2}" >> .config fi }