summaryrefslogtreecommitdiff
path: root/configs/releng/root-image
diff options
context:
space:
mode:
Diffstat (limited to 'configs/releng/root-image')
-rw-r--r--configs/releng/root-image/etc/locale.gen2
-rwxr-xr-xconfigs/releng/root-image/etc/rc.d/archiso10
2 files changed, 7 insertions, 5 deletions
diff --git a/configs/releng/root-image/etc/locale.gen b/configs/releng/root-image/etc/locale.gen
index ee50b2b..7e4e293 100644
--- a/configs/releng/root-image/etc/locale.gen
+++ b/configs/releng/root-image/etc/locale.gen
@@ -153,7 +153,7 @@
#en_PH ISO-8859-1
#en_SG.UTF-8 UTF-8
#en_SG ISO-8859-1
-#en_US.UTF-8 UTF-8
+en_US.UTF-8 UTF-8
#en_US ISO-8859-1
#en_ZA.UTF-8 UTF-8
#en_ZA ISO-8859-1
diff --git a/configs/releng/root-image/etc/rc.d/archiso b/configs/releng/root-image/etc/rc.d/archiso
index 1429516..1bd315d 100755
--- a/configs/releng/root-image/etc/rc.d/archiso
+++ b/configs/releng/root-image/etc/rc.d/archiso
@@ -12,10 +12,12 @@ do_makeuser ()
do_locale_gen ()
{
- stat_busy "Generating locales..."
- sed -i "s/#\(${LOCALE/[@.]*}\)/\1/" /etc/locale.gen
- /usr/sbin/locale-gen > /dev/null
- stat_done
+ if [[ ${LOCALE} != "en_US.UTF-8" ]]; then
+ stat_busy "Generating locales..."
+ sed -i "s/#\(${LOCALE/[@.]*}\)/\1/" /etc/locale.gen
+ /usr/sbin/locale-gen > /dev/null
+ stat_done
+ fi
}
# If an alternate console was specified on the kernel command line,