Skip to content

Commit

Permalink
Update to 14.04
Browse files Browse the repository at this point in the history
  • Loading branch information
zimbatm committed Aug 3, 2014
1 parent b4d9e96 commit 37c1478
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 15 deletions.
19 changes: 13 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@

ISO_URL_32=http://releases.nixos.org/nixos/13.10/nixos-13.10.35723.15586a1/nixos-minimal-13.10.35723.15586a1-i686-linux.iso
ISO_MD5_32=7b7996150b9d2b239d82f7526db29140
ISO_URL_32=http://releases.nixos.org/nixos/14.04/nixos-14.04.393.6593a98/nixos-minimal-14.04.393.6593a98-i686-linux.iso
ISO_MD5_32=dc14e90e601991a69ae23ff8bafdefb2
GUEST_OS_32=Linux

ISO_URL_64=http://releases.nixos.org/nixos/13.10/nixos-13.10.35723.15586a1/nixos-minimal-13.10.35723.15586a1-x86_64-linux.iso
ISO_MD5_64=73465988b04cdb611d26503bf968e2de
ISO_URL_64=http://releases.nixos.org/nixos/14.04/nixos-14.04.393.6593a98/nixos-minimal-14.04.393.6593a98-x86_64-linux.iso
ISO_MD5_64=13f5f51897ebf491c2b8db5274bafe1d
GUEST_OS_64=Linux_64

all: nixbox32-template.json nixbox64-template.json

nixbox32-template.json: nixbox-template.json.orig
nixbox32-virtualbox.box: nixbox32-template.json
packer build $<

nixbox64-virtualbox.box: nixbox64-template.json
packer build $<

nixbox32-template.json: nixbox-template.json.orig Makefile
cat $< | sed -e 's|ISO_URL|$(ISO_URL_32)|g' -e 's|ISO_MD5|$(ISO_MD5_32)|g' -e 's|GUEST_OS|$(GUEST_OS_32)|g' -e 's|NIXBOX|nixbox32|g' > $@

nixbox64-template.json: nixbox-template.json.orig
nixbox64-template.json: nixbox-template.json.orig Makefile
cat $< | sed -e 's|ISO_URL|$(ISO_URL_64)|g' -e 's|ISO_MD5|$(ISO_MD5_64)|g' -e 's|GUEST_OS|$(GUEST_OS_64)|g' -e 's|NIXBOX|nixbox64|g' > $@

.PHONY: all
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Install
-------

```
vagrant init zimbat/nixbox32
vagrant init zimbatm/nixbox32
# or
vagrant init zimbatm/nixbox64
```
Expand Down
6 changes: 3 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# vi: set ft=ruby :

Vagrant.configure("2") do |config|
config.vm.box = 'nixos32'
config.vm.box = 'nixbox32'
config.vm.box_url = 'http://zimbatm.s3.amazonaws.com/nixbox/nixbox32-virtualbox.box'
#config.vm.box = 'nixos64'
#config.vm.box_url = 'http://zimbatm.s3.amazonaws.com/nixbox/nixbox64-virtualbox.box'
# config.vm.box = 'nixbox64'
# config.vm.box_url = 'http://zimbatm.s3.amazonaws.com/nixbox/nixbox64-virtualbox.box'
end
4 changes: 2 additions & 2 deletions nixbox32-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"guest_additions_mode": "disable",
"guest_os_type": "Linux",
"http_directory": "http",
"iso_checksum": "7b7996150b9d2b239d82f7526db29140",
"iso_checksum": "dc14e90e601991a69ae23ff8bafdefb2",
"iso_checksum_type": "md5",
"iso_url": "http://releases.nixos.org/nixos/13.10/nixos-13.10.35723.15586a1/nixos-minimal-13.10.35723.15586a1-i686-linux.iso",
"iso_url": "http://releases.nixos.org/nixos/14.04/nixos-14.04.393.6593a98/nixos-minimal-14.04.393.6593a98-i686-linux.iso",
"shutdown_command": "sudo shutdown -h now",
"ssh_password": "vagrant",
"ssh_port": 22,
Expand Down
4 changes: 2 additions & 2 deletions nixbox64-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"guest_additions_mode": "disable",
"guest_os_type": "Linux_64",
"http_directory": "http",
"iso_checksum": "73465988b04cdb611d26503bf968e2de",
"iso_checksum": "13f5f51897ebf491c2b8db5274bafe1d",
"iso_checksum_type": "md5",
"iso_url": "http://releases.nixos.org/nixos/13.10/nixos-13.10.35723.15586a1/nixos-minimal-13.10.35723.15586a1-x86_64-linux.iso",
"iso_url": "http://releases.nixos.org/nixos/14.04/nixos-14.04.393.6593a98/nixos-minimal-14.04.393.6593a98-x86_64-linux.iso",
"shutdown_command": "sudo shutdown -h now",
"ssh_password": "vagrant",
"ssh_port": 22,
Expand Down
2 changes: 1 addition & 1 deletion scripts/postinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Make sure we are totally up to date

nix-channel --add http://nixos.org/channels/nixos-13.10 nixos
nix-channel --add http://nixos.org/channels/nixos-14.04 nixos
nixos-rebuild switch --upgrade

# Cleanup any previous generations and delete old packages that can be
Expand Down

0 comments on commit 37c1478

Please sign in to comment.