Skip to content
This repository
Browse code

Merge pull request #452 from ergonlogic/debian7

Update Debian 7 templates to Beta4, and fix readline package name.
  • Loading branch information...
commit 977f494b2a54c44a52eb6df99003cc5d2511fbe1 2 parents 73d050f + 74c582d
Mike Fiedler miketheman authored

Showing 22 changed files with 8 additions and 8 deletions. Show diff stats Hide diff stats

  1. +1 1  templates/{Debian-7.0-b3-amd64-netboot → Debian-7.0-b4-amd64-netboot}/base.sh
  2. 0  templates/{Debian-7.0-b2-i386-netboot → Debian-7.0-b4-amd64-netboot}/chef.sh
  3. 0  templates/{Debian-7.0-b2-i386-netboot → Debian-7.0-b4-amd64-netboot}/cleanup-virtualbox.sh
  4. 0  templates/{Debian-7.0-b2-i386-netboot → Debian-7.0-b4-amd64-netboot}/cleanup.sh
  5. +3 3 templates/{Debian-7.0-b3-amd64-netboot → Debian-7.0-b4-amd64-netboot}/definition.rb
  6. 0  templates/{Debian-7.0-b3-amd64-netboot → Debian-7.0-b4-amd64-netboot}/preseed.cfg
  7. 0  templates/{Debian-7.0-b2-i386-netboot → Debian-7.0-b4-amd64-netboot}/puppet.sh
  8. 0  templates/{Debian-7.0-b2-i386-netboot → Debian-7.0-b4-amd64-netboot}/ruby.sh
  9. 0  templates/{Debian-7.0-b2-i386-netboot → Debian-7.0-b4-amd64-netboot}/vagrant.sh
  10. 0  templates/{Debian-7.0-b2-i386-netboot → Debian-7.0-b4-amd64-netboot}/virtualbox.sh
  11. 0  templates/{Debian-7.0-b2-i386-netboot → Debian-7.0-b4-amd64-netboot}/zerodisk.sh
  12. +1 1  templates/{Debian-7.0-b2-i386-netboot → Debian-7.0-b4-i386-netboot}/base.sh
  13. 0  templates/{Debian-7.0-b3-amd64-netboot → Debian-7.0-b4-i386-netboot}/chef.sh
  14. 0  templates/{Debian-7.0-b3-amd64-netboot → Debian-7.0-b4-i386-netboot}/cleanup-virtualbox.sh
  15. 0  templates/{Debian-7.0-b3-amd64-netboot → Debian-7.0-b4-i386-netboot}/cleanup.sh
  16. +3 3 templates/{Debian-7.0-b2-i386-netboot → Debian-7.0-b4-i386-netboot}/definition.rb
  17. 0  templates/{Debian-7.0-b2-i386-netboot → Debian-7.0-b4-i386-netboot}/preseed.cfg
  18. 0  templates/{Debian-7.0-b3-amd64-netboot → Debian-7.0-b4-i386-netboot}/puppet.sh
  19. 0  templates/{Debian-7.0-b3-amd64-netboot → Debian-7.0-b4-i386-netboot}/ruby.sh
  20. 0  templates/{Debian-7.0-b3-amd64-netboot → Debian-7.0-b4-i386-netboot}/vagrant.sh
  21. 0  templates/{Debian-7.0-b3-amd64-netboot → Debian-7.0-b4-i386-netboot}/virtualbox.sh
  22. 0  templates/{Debian-7.0-b3-amd64-netboot → Debian-7.0-b4-i386-netboot}/zerodisk.sh
2  templates/Debian-7.0-b3-amd64-netboot/base.sh → templates/Debian-7.0-b4-amd64-netboot/base.sh
... ... @@ -1,7 +1,7 @@
1 1 # Update the box
2 2 apt-get -y update
3 3 apt-get -y install linux-headers-$(uname -r) build-essential
4   -apt-get -y install zlib1g-dev libssl-dev libreadline5-dev
  4 +apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev
5 5 apt-get -y install curl unzip
6 6 apt-get clean
7 7
0  templates/Debian-7.0-b2-i386-netboot/chef.sh → templates/Debian-7.0-b4-amd64-netboot/chef.sh
File renamed without changes
0  .../Debian-7.0-b2-i386-netboot/cleanup-virtualbox.sh → ...Debian-7.0-b4-amd64-netboot/cleanup-virtualbox.sh
File renamed without changes
0  templates/Debian-7.0-b2-i386-netboot/cleanup.sh → templates/Debian-7.0-b4-amd64-netboot/cleanup.sh
File renamed without changes
6 templates/Debian-7.0-b3-amd64-netboot/definition.rb → templates/Debian-7.0-b4-amd64-netboot/definition.rb
@@ -5,9 +5,9 @@
5 5 :memory_size=> '256',
6 6 :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
7 7 :os_type_id => 'Debian',
8   - :iso_file => "debian-wheezy-DI-b3-amd64-netinst.iso",
9   - :iso_src => "http://cdimage.debian.org/cdimage/wheezy_di_beta3/amd64/iso-cd/debian-wheezy-DI-b3-amd64-netinst.iso",
10   - :iso_md5 => "e9f2479c43a623dd8b9c0bc95d8460ce",
  8 + :iso_file => "debian-wheezy-DI-b4-amd64-netinst.iso",
  9 + :iso_src => "http://cdimage.debian.org/cdimage/wheezy_di_beta4/amd64/iso-cd/debian-wheezy-DI-b4-amd64-netinst.iso",
  10 + :iso_md5 => "9fcd2bb541f9b6b32f2a17116d606bed",
11 11 :iso_download_timeout => "1000",
12 12 :boot_wait => "10", :boot_cmd_sequence => [
13 13 '<Esc>',
0  templates/Debian-7.0-b3-amd64-netboot/preseed.cfg → templates/Debian-7.0-b4-amd64-netboot/preseed.cfg
File renamed without changes
0  templates/Debian-7.0-b2-i386-netboot/puppet.sh → templates/Debian-7.0-b4-amd64-netboot/puppet.sh
File renamed without changes
0  templates/Debian-7.0-b2-i386-netboot/ruby.sh → templates/Debian-7.0-b4-amd64-netboot/ruby.sh
File renamed without changes
0  templates/Debian-7.0-b2-i386-netboot/vagrant.sh → templates/Debian-7.0-b4-amd64-netboot/vagrant.sh
File renamed without changes
0  templates/Debian-7.0-b2-i386-netboot/virtualbox.sh → templates/Debian-7.0-b4-amd64-netboot/virtualbox.sh
File renamed without changes
0  templates/Debian-7.0-b2-i386-netboot/zerodisk.sh → templates/Debian-7.0-b4-amd64-netboot/zerodisk.sh
File renamed without changes
2  templates/Debian-7.0-b2-i386-netboot/base.sh → templates/Debian-7.0-b4-i386-netboot/base.sh
... ... @@ -1,7 +1,7 @@
1 1 # Update the box
2 2 apt-get -y update
3 3 apt-get -y install linux-headers-$(uname -r) build-essential
4   -apt-get -y install zlib1g-dev libssl-dev libreadline5-dev
  4 +apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev
5 5 apt-get -y install curl unzip
6 6 apt-get clean
7 7
0  templates/Debian-7.0-b3-amd64-netboot/chef.sh → templates/Debian-7.0-b4-i386-netboot/chef.sh
File renamed without changes
0  ...Debian-7.0-b3-amd64-netboot/cleanup-virtualbox.sh → .../Debian-7.0-b4-i386-netboot/cleanup-virtualbox.sh
File renamed without changes
0  templates/Debian-7.0-b3-amd64-netboot/cleanup.sh → templates/Debian-7.0-b4-i386-netboot/cleanup.sh
File renamed without changes
6 templates/Debian-7.0-b2-i386-netboot/definition.rb → templates/Debian-7.0-b4-i386-netboot/definition.rb
@@ -5,9 +5,9 @@
5 5 :memory_size=> '256',
6 6 :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
7 7 :os_type_id => 'Debian',
8   - :iso_file => "debian-wheezy-DI-b2-i386-netinst.iso",
9   - :iso_src => "http://cdimage.debian.org/cdimage/wheezy_di_beta2/i386/iso-cd/debian-wheezy-DI-b2-i386-netinst.iso",
10   - :iso_md5 => "a2be1f5efd0fd64c3036ae894f4eed0e",
  8 + :iso_file => "debian-wheezy-DI-b4-i386-netinst.iso",
  9 + :iso_src => "http://cdimage.debian.org/cdimage/wheezy_di_beta4/i386/iso-cd/debian-wheezy-DI-b4-i386-netinst.iso",
  10 + :iso_md5 => "34d0ae973715c7a31646281c70839809",
11 11 :iso_download_timeout => "1000",
12 12 :boot_wait => "10", :boot_cmd_sequence => [
13 13 '<Esc>',
0  templates/Debian-7.0-b2-i386-netboot/preseed.cfg → templates/Debian-7.0-b4-i386-netboot/preseed.cfg
File renamed without changes
0  templates/Debian-7.0-b3-amd64-netboot/puppet.sh → templates/Debian-7.0-b4-i386-netboot/puppet.sh
File renamed without changes
0  templates/Debian-7.0-b3-amd64-netboot/ruby.sh → templates/Debian-7.0-b4-i386-netboot/ruby.sh
File renamed without changes
0  templates/Debian-7.0-b3-amd64-netboot/vagrant.sh → templates/Debian-7.0-b4-i386-netboot/vagrant.sh
File renamed without changes
0  templates/Debian-7.0-b3-amd64-netboot/virtualbox.sh → templates/Debian-7.0-b4-i386-netboot/virtualbox.sh
File renamed without changes
0  templates/Debian-7.0-b3-amd64-netboot/zerodisk.sh → templates/Debian-7.0-b4-i386-netboot/zerodisk.sh
File renamed without changes

0 comments on commit 977f494

Please sign in to comment.
Something went wrong with that request. Please try again.