Commit 063537f6 by 有张纸 Committed by Stéphane Graber

debian template: reconfigure locales

parent 659e807c
...@@ -97,22 +97,6 @@ $hostname ...@@ -97,22 +97,6 @@ $hostname
EOF EOF
# reconfigure some services # reconfigure some services
if [ -z "$LANG" ]; then
cat >> $rootfs/etc/locale.gen << EOF
en_US.UTF-8 UTF-8
EOF
chroot $rootfs locale-gen en_US.UTF-8 UTF-8
chroot $rootfs update-locale LANG=en_US.UTF-8
else
encoding=$(echo $LANG | cut -d. -f2)
chroot $rootfs sed -e "s/^# \(${LANG} ${encoding}\)/\1/" \
-i /etc/locale.gen 2> /dev/null
cat >> $rootfs/etc/locale.gen << EOF
$LANG $encoding
EOF
chroot $rootfs locale-gen $LANG $encoding
chroot $rootfs update-locale LANG=$LANG
fi
# remove pointless services in a container # remove pointless services in a container
chroot $rootfs /usr/sbin/update-rc.d -f checkroot.sh disable chroot $rootfs /usr/sbin/update-rc.d -f checkroot.sh disable
...@@ -409,6 +393,25 @@ EOF ...@@ -409,6 +393,25 @@ EOF
# Re-enable service startup # Re-enable service startup
rm ${rootfs}/usr/sbin/policy-rc.d rm ${rootfs}/usr/sbin/policy-rc.d
# reconfigure locales
if [ -z "$LANG" ]; then
cat >> $rootfs/etc/locale.gen << EOF
en_US.UTF-8 UTF-8
EOF
chroot $rootfs locale-gen en_US.UTF-8 UTF-8
chroot $rootfs update-locale LANG=en_US.UTF-8
else
encoding=$(echo $LANG | cut -d. -f2)
chroot $rootfs sed -e "s/^# \(${LANG} ${encoding}\)/\1/" \
-i /etc/locale.gen 2> /dev/null
cat >> $rootfs/etc/locale.gen << EOF
$LANG $encoding
EOF
chroot $rootfs locale-gen $LANG $encoding
chroot $rootfs update-locale LANG=$LANG
fi
# end
} }
clean() clean()
......
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