diff --git a/nixos32-template.json b/nixos32-template.json index 7b0079a..22668d2 100644 --- a/nixos32-template.json +++ b/nixos32-template.json @@ -6,7 +6,7 @@ "", "root", "", - "stop sshd", + "stop sshd", "", "fdisk /dev/sda", "", @@ -24,55 +24,33 @@ "", "nixos-option --install", "", - "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/configuration.nix > /mnt/etc/nixos/configuration.nix \u0026\u0026", + "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/configuration.nix > /mnt/etc/nixos/configuration.nix &&", "", - "nixos-install \u0026\u0026", + "nixos-install &&", "", "reboot", "" ], - "boot_wait": "5s", - "disk_size": 20400, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Linux26", + "guest_additions_mode": "disable", + "guest_os_type": "Linux", "http_directory": "http", - "iso_checksum": "b1a78fc1b72ea1a19957cb1422817ab6", + "iso_checksum": "d0e0a64fe9a5f3f946e6f9fe0b846e70", "iso_checksum_type": "md5", - "iso_url": "http://nixos.org/releases/nixos/nixos-13.07pre4871_18de9f6-3c35dae/nixos-minimal-13.07pre4871_18de9f6-3c35dae-i686-linux.iso", + "iso_url": "http://nixos.org/releases/nixos/13.10/nixos-13.10.35445.be4e850/nixos-minimal-13.10.35445.be4e850-x86_64-linux.iso", "shutdown_command": "sudo shutdown -h now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "256" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], "virtualbox_version_file": ".vbox_version" } ], "provisioners": [ { - "override": { - "virtualbox": { - "execute_command": "sudo '{{.Path}}'" - } - }, - "scripts": [ - "scripts/postinstall.sh" - ], - "type": "shell" + "type": "shell", + "execute_command": "sudo '{{.Path}}'", + "script": "scripts/postinstall.sh" } ] } diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh index 57ad04b..7942f9a 100755 --- a/scripts/postinstall.sh +++ b/scripts/postinstall.sh @@ -1,17 +1,9 @@ #!/bin/sh -# Remove VirtualBox Guest Additions ISO that the Veewee put in our -# home dir - -rm -f ~/*.iso - -# Install chef & puppet - -#su - vagrant -c 'gem install chef puppet --user-install --bindir=$HOME/bin --no-rdoc --no-ri' - # Make sure we are totally up to date -nixos-rebuild --upgrade switch +nix-channel --add http://nixos.org/channels/nixos-13.10 nixos +nixos-rebuild switch --upgrade # Cleanup any previous generations and delete old packages that can be # pruned.