From 67c0c1847bdbec743d17bc236da2293437cfd4c6 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 29 Oct 2010 14:07:56 +0200 Subject: [PATCH] i18n/install: if hostonly install fails, install all files --- modules.d/10i18n/install | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules.d/10i18n/install b/modules.d/10i18n/install index f57956b..d8647c0 100755 --- a/modules.d/10i18n/install +++ b/modules.d/10i18n/install @@ -112,7 +112,7 @@ install_local_i18n() { # original redhat-i18n module. Anyway it won't hurt. EXT_KEYMAPS+=\ ${UNIKEYMAP}\ ${GRP_TOGGLE} - [[ ${KEYMAP} ]] || derror 'No KEYMAP.' || return 1 + [[ ${KEYMAP} ]] || dwarning 'No KEYMAP.' || return 1 findkeymap ${KEYMAP} for map in ${EXT_KEYMAPS} @@ -160,6 +160,7 @@ install_local_i18n() { mksubdirs ${initdir}${VCONFIG_CONF} print_vars LC_ALL LANG >> ${initdir}${I18N_CONF} print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> ${initdir}${VCONFIG_CONF} + return 0 } checks() { @@ -183,6 +184,7 @@ checks() { [[ ! ${hostonly} || ${i18n_vars} ]] || { dwarning 'Please set up i18n_vars in configuration file.' } + return 0 } @@ -192,7 +194,7 @@ then if [[ ${hostonly} ]] then - install_local_i18n + install_local_i18n || install_all_kbd else install_all_kbd fi -- 2.7.4