diff --git a/example_boxes/centos.json b/example_boxes/centos.json index 3ee6def..45d2e16 100644 --- a/example_boxes/centos.json +++ b/example_boxes/centos.json @@ -1,15 +1,15 @@ { - "name": "centos/7", + "name": "ghopp/centos7", "description": "The latest centos/7 LXD image.", "versions": [ { - "version": "0.0.1", + "version": "0.0.2", "providers": [ { "name": "lxd", - "url": "file:///home/hopp/projects/vagrant/test/centos_001_lxd.box", + "url": "https://github.com/georghopp/vagrant-lxd/raw/master/example_boxes/centos_002_lxd.box", "checksum_type": "sha1", - "checksum": "52c6717974bc76ecb9591e55d30baf90be9c68e4" + "checksum": "9b9e8e343c72b020ff21641bc18b6512df936047" } ] } diff --git a/example_boxes/centos_001_lxd.box b/example_boxes/centos_001_lxd.box deleted file mode 100644 index 014a436..0000000 Binary files a/example_boxes/centos_001_lxd.box and /dev/null differ diff --git a/example_boxes/centos_002_lxd.box b/example_boxes/centos_002_lxd.box new file mode 100644 index 0000000..723da17 Binary files /dev/null and b/example_boxes/centos_002_lxd.box differ diff --git a/example_boxes/centos_box/metadata.json b/example_boxes/centos_box/metadata.json index 967d0a9..dc1fc4b 100644 --- a/example_boxes/centos_box/metadata.json +++ b/example_boxes/centos_box/metadata.json @@ -1,5 +1,6 @@ { "provider": "lxd", + "image": "centos/7", "bootstrap": { "hostname": { "exec": [ diff --git a/example_boxes/gentoo.json b/example_boxes/gentoo.json index 1dcea3c..b22095d 100644 --- a/example_boxes/gentoo.json +++ b/example_boxes/gentoo.json @@ -1,15 +1,15 @@ { - "name": "lxd/gentoo", + "name": "ghopp/gentoo", "description": "The latest gentoo LXD image.", "versions": [ { - "version": "0.0.1", + "version": "0.0.2", "providers": [ { "name": "lxd", - "url": "file:///home/hopp/projects/vagrant/vagrant-lxd/gentoo_001_lxd.box", + "url": "https://github.com/georghopp/vagrant-lxd/raw/master/example_boxes/gentoo_002_lxd.box", "checksum_type": "sha1", - "checksum": "279b73b0a0f51368376a89283c842c5b474f9274" + "checksum": "32b92c1c5121b13cedb051739066a1f098666b17" } ] } diff --git a/example_boxes/gentoo_001_lxd.box b/example_boxes/gentoo_001_lxd.box deleted file mode 100644 index 0a09b26..0000000 Binary files a/example_boxes/gentoo_001_lxd.box and /dev/null differ diff --git a/example_boxes/gentoo_002_lxd.box b/example_boxes/gentoo_002_lxd.box new file mode 100644 index 0000000..49c40fc Binary files /dev/null and b/example_boxes/gentoo_002_lxd.box differ diff --git a/example_boxes/gentoo_box/metadata.json b/example_boxes/gentoo_box/metadata.json index a1abf21..e8b7a4e 100644 --- a/example_boxes/gentoo_box/metadata.json +++ b/example_boxes/gentoo_box/metadata.json @@ -1,5 +1,6 @@ { "provider": "lxd", + "image": "gentoo", "bootstrap": { "hostname": { "exec": [ diff --git a/example_boxes/sid.json b/example_boxes/sid.json index 9b6bb74..a9fe72f 100644 --- a/example_boxes/sid.json +++ b/example_boxes/sid.json @@ -1,15 +1,15 @@ { - "name": "debian/sid", + "name": "ghopp/sid", "description": "The latest debian/sid LXD image.", "versions": [ { - "version": "0.0.1", + "version": "0.0.2", "providers": [ { "name": "lxd", - "url": "file:///home/hopp/projects/vagrant/test/sid_001_lxd.box", + "url": "https://github.com/georghopp/vagrant-lxd/raw/master/example_boxes/sid_002_lxd.box", "checksum_type": "sha1", - "checksum": "21d7376327acdb7f36aa25ed89039248c6562415" + "checksum": "fc23c3fe375bd3383f076625f6904602482a9c34" } ] } diff --git a/example_boxes/sid_001_lxd.box b/example_boxes/sid_001_lxd.box deleted file mode 100644 index 99fec2d..0000000 Binary files a/example_boxes/sid_001_lxd.box and /dev/null differ diff --git a/example_boxes/sid_002_lxd.box b/example_boxes/sid_002_lxd.box new file mode 100644 index 0000000..cc69a59 Binary files /dev/null and b/example_boxes/sid_002_lxd.box differ diff --git a/example_boxes/sid_box/metadata.json b/example_boxes/sid_box/metadata.json index 519a71c..507a6e4 100644 --- a/example_boxes/sid_box/metadata.json +++ b/example_boxes/sid_box/metadata.json @@ -1,5 +1,6 @@ { "provider": "lxd", + "image": "debian/sid", "bootstrap": { "hostname": { "exec": [ diff --git a/lib/vagrant-lxd/driver.rb b/lib/vagrant-lxd/driver.rb index 6cfb9af..eacf3ef 100644 --- a/lib/vagrant-lxd/driver.rb +++ b/lib/vagrant-lxd/driver.rb @@ -90,7 +90,7 @@ module VagrantPlugins end def image - @machine.box.name if @machine.box + @machine.box.metadata["image"] if @machine.box end def image?