initscripts: run dhcpcd without -q, drop sysklogd, use metalog.
Bump revision. --HG-- extra : convert_revision : 92395e9344284f2cfea1ee983d26b191fcfd77d8
This commit is contained in:
@@ -21,33 +21,29 @@ locale_start()
|
||||
# Check if requested locale was already created
|
||||
if ! $(locale -a|grep -q $LOCALE.utf8); then
|
||||
[ ! -d /usr/lib/locale ] && mkdir -p /usr/lib/locale
|
||||
echo -n "Building locale: $LOCALE... "
|
||||
echo "Building locale: $LOCALE."
|
||||
localedef -i ${LOCALE} -f UTF-8 ${LOCALE}
|
||||
show_rval
|
||||
fi
|
||||
|
||||
# Set user defined locale
|
||||
[ -z "$LOCALE" ] && LOCALE="en_US"
|
||||
echo -n "Setting locale: $LOCALE... "
|
||||
echo "Setting locale: $LOCALE."
|
||||
echo "export LANG=$LOCALE" >> /etc/profile.d/locale.sh
|
||||
show_rval
|
||||
|
||||
if echo "$LOCALE" | grep -qi utf ; then
|
||||
if [ -n "$KEYMAP" ]; then
|
||||
echo -n "Loading keyboard map: $KEYMAP... "
|
||||
echo "Loading keyboard map: $KEYMAP."
|
||||
loadkeys -q -u $KEYMAP
|
||||
show_rval
|
||||
fi
|
||||
else
|
||||
if [ -n "$KEYMAP" ]; then
|
||||
echo -n "Loading keyboard map: $KEYMAP... "
|
||||
echo "Loading keyboard map: $KEYMAP."
|
||||
loadkeys -q $KEYMAP
|
||||
show_rval
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -n "$CONSOLEFONT" ]; then
|
||||
echo -n "Loading console font: $CONSOLEFONT... "
|
||||
echo "Loading console font: $CONSOLEFONT."
|
||||
# CONSOLEMAP in UTF-8 shouldn't be used
|
||||
if [ -n "$CONSOLEMAP" ] && echo "$LOCALE" | grep -qi utf ; then
|
||||
CONSOLEMAP=""
|
||||
@@ -62,7 +58,6 @@ locale_start()
|
||||
>/dev/null 2>&1
|
||||
fi
|
||||
done
|
||||
show_rval
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user