Download as
Browse Code »

Commit 6fbe381c3048e644b7432de42e81ec40ef2a2714

Authored by Antonio Terceiro
Committed by Victor Costa
1 parent 093d5f22
Exists in theme-brasil-digital-from-staging and in 4 other branches angular_poc, backup-7-jan-2016, login-captcha, staging

util/debian-install: fix installing wheezy

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
util/debian-install/Vagrantfile
  Diff comments   View file @6fbe381
@@ -27,7 +27,7 @@ else @@ -27,7 +27,7 @@ else
27 end 27 end
28 28
29 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| 29 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
30 - config.vm.box = "debian-wheezy" 30 + config.vm.box = "debian/wheezy64"
31 config.vm.provision :shell, path: 'install', args: [ENV['REPOSITORY']].compact 31 config.vm.provision :shell, path: 'install', args: [ENV['REPOSITORY']].compact
32 config.vm.provision :shell, path: 'test' 32 config.vm.provision :shell, path: 'test'
33 end 33 end
util/debian-install/install
  Diff comments   View file @6fbe381
@@ -8,7 +8,7 @@ if [ -n "$1" ]; then @@ -8,7 +8,7 @@ if [ -n "$1" ]; then
8 fi 8 fi
9 9
10 set -e 10 set -e
11 -sudo apt-get install -qy netcat-traditional shunit2 11 +sudo apt-get install -qy netcat-traditional shunit2 curl
12 12
13 # apt-cacher-ng running on the host 13 # apt-cacher-ng running on the host
14 # 10.0.2.2 = host ip on virtualbox/qemu 14 # 10.0.2.2 = host ip on virtualbox/qemu
@@ -68,7 +68,7 @@ deb http://download.noosfero.org/debian/$REPOSITORY ./ @@ -68,7 +68,7 @@ deb http://download.noosfero.org/debian/$REPOSITORY ./
68 deb-src http://download.noosfero.org/debian/$REPOSITORY ./ 68 deb-src http://download.noosfero.org/debian/$REPOSITORY ./
69 EOF 69 EOF
70 70
71 -sed -e "s/$DISTRO/&-backports/" \ 71 +sed -e "/security/d; s/$DISTRO/&-backports/" \
72 /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list 72 /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list
73 73
74 export DEBIAN_FRONTEND=noninteractive 74 export DEBIAN_FRONTEND=noninteractive