#739: Cambios en entornos Vagrant: incluir teclado adecuado y solucionar algunas dependencias en el entorno para OGAgent.

git-svn-id: https://opengnsys.es/svn/branches/version1.1@4874 a21b9725-9963-47de-94b9-378ad31fedc9

4 files changed, 9 insertions, 1 deletions

diff --git a/installer/vagrant/Vagrantfile-boottools-vbox b/installer/vagrant/Vagrantfile-boottools-vbox
index f37d8cd0..3746e3ea 100644
--- a/installer/vagrant/Vagrantfile-boottools-vbox
+++ b/installer/vagrant/Vagrantfile-boottools-vbox
@@ -13,7 +13,9 @@ SCRIPT = <<EOT
 # Set language.
 export LANG="#{LANGUAGE}.UTF-8"
 echo "LANG=\"$LANG\"" > /etc/default/locale
+echo "LANG=\"$LANG\"" >> /etc/environment
 locale-gen --lang #{LANGUAGE}
+dpkg-reconfigure -fnoninteractive console-setup
 # Install dependencies.
 apt-get update -y
 apt-get install -y subversion
diff --git a/installer/vagrant/Vagrantfile-devel-vbox b/installer/vagrant/Vagrantfile-devel-vbox
index 8b4f50fe..60086da4 100644
--- a/installer/vagrant/Vagrantfile-devel-vbox
+++ b/installer/vagrant/Vagrantfile-devel-vbox
@@ -40,7 +40,9 @@ service isc-dhcp-server restart
 # Set language.
 export LANG="#{LANGUAGE}.UTF-8"
 echo "LANG=\"$LANG\"" > /etc/default/locale
+echo "LANG=\"$LANG\"" >> /etc/environment
 locale-gen --lang #{LANGUAGE}
+dpkg-reconfigure -fnoninteractive console-setup
 # Unmcomment next lines for automatic data insertion.
 #SQL="INSERT INTO aulas (nombreaula, idcentro, urlfoto, grupoid, ubicacion, puestos, modomul, ipmul, pormul, velmul, router, netmask, ntp, dns, proxy, modp2p, timep2p) VALUES  ('Aula virtual', 1, 'aula.jpg', 0, 'Despliegue virtual con Vagrant.', 5, 2, '239.194.2.11', 9000, 70, '#{NETPREFIX}1', '255.255.255.0', '', '', '', 'peer', 30); INSERT INTO ordenadores (nombreordenador, ip, mac, idaula, idrepositorio, idperfilhard, idmenu, idproautoexec, grupoid, router, mascara, arranque, netiface, netdriver, fotoord) VALUES"
 #for ((i=1; i<=#{NCLIENTS}; i++)); do
diff --git a/installer/vagrant/Vagrantfile-ogagent-vbox b/installer/vagrant/Vagrantfile-ogagent-vbox
index b41bc487..0e418b3e 100644
--- a/installer/vagrant/Vagrantfile-ogagent-vbox
+++ b/installer/vagrant/Vagrantfile-ogagent-vbox
@@ -20,6 +20,7 @@ echo "LC_ALL=\"$LANG\"" >> /etc/environment
 echo "LC_CTYPE=\"$LANG\"" >> /etc/environment
 locale-gen --lang #{LANGUAGE}
 sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"${LANG%_*}\"/" /etc/default/keyboard
+dpkg-reconfigure -fnoninteractive console-setup
 # Update repositories.
 add-apt-repository -y ppa:webupd8team/java
 add-apt-repository -y ppa:ubuntu-wine
@@ -27,7 +28,8 @@ dpkg --add-architecture i386
 apt-get update
 apt-get -y upgrade
 # Install main dependencies.
-apt-get install -y aspell-${LANG%_*} debhelper dpkg-dev pyqt4-dev-tools realpath rpm subversion winbind wine1.8-i386
+echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections
+apt-get install -y aspell-${LANG%_*} debhelper dpkg-dev pyqt4-dev-tools realpath rpm subversion winbind wine1.8-i386 wine-gecko2.40:i386 wine-mono4.5.6
 # Install desktop (XFCE) and GUI utils.
 apt-get install -y xfce4 gnome-icon-theme-full tango-icon-theme firefox virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11
 echo "allowed_users=anybody" > /etc/X11/Xwrapper.config
diff --git a/installer/vagrant/Vagrantfile-trunk-vbox b/installer/vagrant/Vagrantfile-trunk-vbox
index 50386811..98ff59d2 100644
--- a/installer/vagrant/Vagrantfile-trunk-vbox
+++ b/installer/vagrant/Vagrantfile-trunk-vbox
@@ -40,7 +40,9 @@ service isc-dhcp-server restart
 # Set language.
 export LANG="#{LANGUAGE}.UTF-8"
 echo "LANG=\"$LANG\"" > /etc/default/locale
+echo "LANG=\"$LANG\"" >> /etc/environment
 locale-gen --lang #{LANGUAGE}
+dpkg-reconfigure -fnoninteractive console-setup
 # Unmcomment next lines for automatic data insertion.
 #SQL="INSERT INTO aulas (nombreaula, idcentro, urlfoto, grupoid, ubicacion, puestos, modomul, ipmul, pormul, velmul, router, netmask, dns, proxy, modp2p, timep2p) VALUES  ('Aula virtual', 1, 'aula.jpg', 0, 'Despliegue virtual con Vagrant.', 5, 2, '239.194.2.11', 9000, 70, '#{NETPREFIX}1', '255.255.255.0', '', '', 'peer', 30); INSERT INTO ordenadores (nombreordenador, ip, mac, idaula, idrepositorio, idperfilhard, idmenu, idproautoexec, grupoid, router, mascara, arranque, netiface, netdriver, fotoord) VALUES"
 #for ((i=1; i<=#{NCLIENTS}; i++)); do