mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
run locale.gen and mkinitcpio on action
This commit is contained in:
parent
ac30d95910
commit
d889a150c1
2 changed files with 4 additions and 6 deletions
|
@ -133,6 +133,7 @@ configure_system() {
|
||||||
break
|
break
|
||||||
elif [[ "${FILE}" = "/etc/mkinitcpio.conf" ]]; then # non-file
|
elif [[ "${FILE}" = "/etc/mkinitcpio.conf" ]]; then # non-file
|
||||||
set_mkinitcpio
|
set_mkinitcpio
|
||||||
|
run_mkinitcpio
|
||||||
elif [[ "${FILE}" = "/etc/locale.gen" ]]; then # non-file
|
elif [[ "${FILE}" = "/etc/locale.gen" ]]; then # non-file
|
||||||
set_locale
|
set_locale
|
||||||
${EDITOR} "${DESTDIR}""${FILE}"
|
${EDITOR} "${DESTDIR}""${FILE}"
|
||||||
|
@ -143,12 +144,6 @@ configure_system() {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
if [[ ${S_CONFIG} -eq 1 ]]; then
|
if [[ ${S_CONFIG} -eq 1 ]]; then
|
||||||
# only done on normal exit of configure menu
|
|
||||||
## POSTPROCESSING ##
|
|
||||||
# /etc/initcpio.conf
|
|
||||||
run_mkinitcpio
|
|
||||||
run_locale_gen
|
|
||||||
## END POSTPROCESSING ##
|
|
||||||
NEXTITEM="7"
|
NEXTITEM="7"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,8 @@ set_mkinitcpio() {
|
||||||
done
|
done
|
||||||
if [[ "${HOOK_ERROR}" = "1" ]]; then
|
if [[ "${HOOK_ERROR}" = "1" ]]; then
|
||||||
DIALOG --msgbox "ERROR: Detected error in 'HOOKS=' line, please correct HOOKS= in /etc/mkinitcpio.conf!" 18 70
|
DIALOG --msgbox "ERROR: Detected error in 'HOOKS=' line, please correct HOOKS= in /etc/mkinitcpio.conf!" 18 70
|
||||||
|
else
|
||||||
|
run_mkinitcpio
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,6 +56,7 @@ set_locale() {
|
||||||
sed -i -e "s/^#${i}/${i}/g" "${DESTDIR}"/etc/locale.gen
|
sed -i -e "s/^#${i}/${i}/g" "${DESTDIR}"/etc/locale.gen
|
||||||
done
|
done
|
||||||
sleep 2
|
sleep 2
|
||||||
|
run_locale_gen
|
||||||
}
|
}
|
||||||
|
|
||||||
set_password() {
|
set_password() {
|
||||||
|
|
Loading…
Reference in a new issue