Skip to content

M
mkimage-profiles
Commit c9917ec0 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

grub: do not copy locale, if not used gfxterm

No need to hope that will add package grub-common to stage1 only together with branding. With terminal_output=console, non-ASCII characters are not displayed.
parent 1f066d54
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
features.in/grub/stage1/scripts.d/01-grub
View file @ c9917ec0
...@@ -41,11 +41,6 @@ sed -i "s/@default_id@/$DEFAULT/" "$CFG" ...@@ -41,11 +41,6 @@ sed -i "s/@default_id@/$DEFAULT/" "$CFG"
default_change "$CFG" default_change "$CFG"
# snippets are not going into the actual image
if [ "$DEBUG" != 2 ]; then
rm -r .in/
fi
# change kernels version for multiple kernels only # change kernels version for multiple kernels only
if [ $(echo "$GLOBAL_KFLAVOURS" | wc -w) -gt 1 ]; then if [ $(echo "$GLOBAL_KFLAVOURS" | wc -w) -gt 1 ]; then
kver= kver=
...@@ -76,7 +71,7 @@ fi ...@@ -76,7 +71,7 @@ fi
# copy grub locale # copy grub locale
mkdir -p locale mkdir -p locale
if [ ! -e "$boot/locale" -a -f "$CFG" ]; then if [ ! -e "$boot/locale" -a -f "$CFG" -a -f .in/01gfxterm.cfg ]; then
langs=$(grep -oP "([a-z]{2})(?=_[A-Z]{2})" "$CFG" | sort | uniq) langs=$(grep -oP "([a-z]{2})(?=_[A-Z]{2})" "$CFG" | sort | uniq)
for i in $langs; do for i in $langs; do
fp="/usr/share/locale/$i/LC_MESSAGES/grub.mo" fp="/usr/share/locale/$i/LC_MESSAGES/grub.mo"
...@@ -84,6 +79,11 @@ if [ ! -e "$boot/locale" -a -f "$CFG" ]; then ...@@ -84,6 +79,11 @@ if [ ! -e "$boot/locale" -a -f "$CFG" ]; then
done done
fi fi
# snippets are not going into the actual image
if [ "$DEBUG" != 2 ]; then
rm -r .in/
fi
exit 0 exit 0
# NB: there will be final macro expansion based on actual image sizes # NB: there will be final macro expansion based on actual image sizes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment