if [ -x /usr/sbin/grml-setlang ] ; then
# if bootoption lang is used update /etc/default/locale accordingly
if [ -n "$BOOT_LANGUAGE" ] ; then
- checkgrmlsmall && /usr/sbin/grml-setlang "POSIX" || /usr/sbin/grml-setlang "$LANGUAGE"
+ /usr/sbin/grml-setlang "$LANGUAGE"
# otherwise default to lang=en
else
- checkgrmlsmall && /usr/sbin/grml-setlang "POSIX" || /usr/sbin/grml-setlang "en"
+ /usr/sbin/grml-setlang "en"
fi
fi
fi
# export it now, so error messages get translated, too
- if checkgrmlsmall ; then
- export LANG='C' # grml-small does not provide any further locales
- else
- [ -r /etc/default/locale ] && . /etc/default/locale
- export LANG LANGUAGE
- fi
+ [ -r /etc/default/locale ] && . /etc/default/locale
+ export LANG LANGUAGE
# configure keyboard layout, read in already set values first:
[ -r /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard
echo "root:$SSH_PASSWD" | chpasswd $chpass_options
fi
- einfo "Starting secure shell server in background for user $localuser"
+ einfo "Starting secure shell server in background for root and user $localuser"
/etc/init.d/rmnologin start >>$DEBUG 2>>$DEBUG
/etc/init.d/ssh start >>$DEBUG 2>>$DEBUG &
eend $?
eindent
- ewarn "Warning: please change the password for user $localuser as soon as possible!"
+ ewarn "Warning: please change the password for root and user $localuser as soon as possible!"
eoutdent
fi
}
config_userlocal
cat>|/etc/init.d/xstartup<<EOF
#!/bin/sh
-su $localuser -c "/usr/bin/grml-x"
+su $localuser -c "/usr/bin/grml-x ${WINDOWMANAGER}"
EOF
chmod 755 /etc/init.d/xstartup