Commit ce3ee419 authored by Michael Pöhn's avatar Michael Pöhn

Revert "Merge branch 'master' into 'master'"

This reverts merge request !17
parent df93bcd3
Pipeline #30801751 passed with stage
in 2 minutes and 34 seconds
......@@ -79,7 +79,6 @@ def init_params(provider, debver, workdir='.', verbose=False, dry_run=False):
params['deb_packages'] += ('perl',
'git',
'git-man',
'locales',
'libcurl3-gnutls',
'liberror-perl',
'libexpat1',
......
......@@ -17,14 +17,8 @@ echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4
chmod 600 $USERHOME/.ssh/authorized_keys
chown $VGRNT_UID:$VGRNT_GID $USERHOME/.ssh/authorized_keys
echo "en_GB.UTF-8 UTF-8" >> /etc/locale.gen
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen # the old default, as a failsafe
locale-gen
echo 'LANG=en_US.UTF-8' > $VMROOT/etc/default/locale
echo 'LANGUAGE="en_US:en"' >> $VMROOT/etc/default/locale
echo "Etc/UTC" > /etc/timezone
dpkg-reconfigure -f noninteractive tzdata
echo 'LANG=C.UTF-8' >> $VMROOT/etc/default/locale
echo 'LC_ALL=C.UTF-8' >> $VMROOT/etc/default/locale
if [ $DEB_DISTRO = 'stretch' ]; then
echo 'deb http://deb.debian.org/debian stretch-backports main contrib' > $VMROOT/etc/apt/sources.list.d/stretch-backports.list
......
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