From ae02431bc9037502b4bd84995367a813a00b860d Mon Sep 17 00:00:00 2001
From: Georg Hopp <georg@steffers.org>
Date: Tue, 16 May 2017 12:48:26 +0200
Subject: [PATCH] change box handling and update boxes

---
 example_boxes/centos.json              |   8 ++++----
 example_boxes/centos_001_lxd.box       | Bin 806 -> 0 bytes
 example_boxes/centos_002_lxd.box       | Bin 0 -> 819 bytes
 example_boxes/centos_box/metadata.json |   1 +
 example_boxes/gentoo.json              |   8 ++++----
 example_boxes/gentoo_001_lxd.box       | Bin 826 -> 0 bytes
 example_boxes/gentoo_002_lxd.box       | Bin 0 -> 838 bytes
 example_boxes/gentoo_box/metadata.json |   1 +
 example_boxes/sid.json                 |   8 ++++----
 example_boxes/sid_001_lxd.box          | Bin 813 -> 0 bytes
 example_boxes/sid_002_lxd.box          | Bin 0 -> 828 bytes
 example_boxes/sid_box/metadata.json    |   1 +
 lib/vagrant-lxd/driver.rb              |   2 +-
 13 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 example_boxes/centos_001_lxd.box
 create mode 100644 example_boxes/centos_002_lxd.box
 delete mode 100644 example_boxes/gentoo_001_lxd.box
 create mode 100644 example_boxes/gentoo_002_lxd.box
 delete mode 100644 example_boxes/sid_001_lxd.box
 create mode 100644 example_boxes/sid_002_lxd.box

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 014a4360ff0d657f092923b33a656812369287e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmV+>1KIo^iwFRkpBh;J1MQXjZ`(Ey$MbXk3Qkyo4Q^veR%JU|1}L^=D}KqZ$VyWT
zG{so5o|b6U($N2Xq?34Qur?U5>;doti1Zx~Ums88>8u)J0v$-;*(Qsllh;6`sEWd7
zss3JkIy0miU6X2(sMcgzR-_YAlGVC;0>oFz<{7(;z!ZR!wHqhNH{xDe|DW>PDF8x}
z#<}O<R5%Ahuy=&F%(;qVl93c9)XSo%%Z)P<!4Mxk)Q9&NQTxM#4ZsH>!&CwY?>shU
z)t}#702D_AdJ#^+n_mu&M=55ruqq~~der~;_V1F*gpUtW_w(m_Wg&schija@u$5vL
zGC41zrz8jtX%vSvc24|dmS2mE6C7ok`!2(2PAmN9*&O7)naS}Ni^lh_=;&ajd1_a4
zxK3e2s;i&Ahqt%4(Sr@N!QkQtI{XMmV^f>WtoAwcv5+>tgS&ua=Z~@9rFgsZQcOtk
zOr6!1WsK8II4*o;W0~vx%C_#I7f(%*5ga0Ns2z^rD!_+IQ-x>e;b|bdz2uL$FOxWB
z&*#&B`;PsWIeR=SXUT5$O8@af|EGOlI`n@<R%JyMS^uxq>%9N}6R_5lW)NtU%i5@f
zEvZ0q=U^J2=s4+U>PT;Rw5jEj>qM5Vwm<ial;lYhTb8Od?CZ4Rm&$z8wQ+sjD~(T;
z$QuQu+tGVvyHUv{L$<Hfc!_gFBpc7fxY@fYM$)9YUANZdLMP6+Kgd-BJ4vvOO&^82
z2yIMc)9<w7+Ax@3B41yc##|egdc(Pz8G77oH+px@_*yhHXRnOwCh_)GKYCxt?r_u<
z%ZXVmFiMo9Y^lDNYld6g^}Ilzs?xMOsC3QcL>^i<mTs@K?xyhUt4Ir5W^FW{JK|<|
z(}~*tYLV~VVR&iJoX*^r(&;*^OqId7)E8aY+xFUn{$N?r4YQB*rs}3Uv@DTT3|7Xf
zv+gt-<6aP5+pTiy^c$OC8#V}b7pRGvmOHt)0FSMfel#%Jr5MmV7<dTyxZq8T!{Kl^
k91e%W;cz${4u`|xa5x+ehr{7;IDduT0eQbIxBw^s0Imt3F8}}l

diff --git a/example_boxes/centos_002_lxd.box b/example_boxes/centos_002_lxd.box
new file mode 100644
index 0000000000000000000000000000000000000000..723da1736a4d6bcc1e254c1bf09633a2b2ccc3fe
GIT binary patch
literal 819
zcmV-31I+v%iwFQP!5Ucr1MQXjZ{kJ}$N4#b#n$Rct+)$*#X#CrasY$F%e-Qo%c)w{
z8*Kc<UVPZq{qN@`373m{7gcKdkoF^a*E2hOnH_eA(^`NDv>}0~n=}e5uK{18$TFRU
z`WgRprU+79stA(6D`zs#OG<?o#5ylm0RJl4JY$y<m;g{&J5d~eC+?;7|0#c*0Kmmb
zl({xexO2eydz*Vpoo)cvn0gQnNtD*=_wH2`k(4AbE|=(sOP3R+B!mGzdP*POV^rGj
zA8Y{Lb15#B0r$?OV_N(5%>_VFNT3_y1ibm};CPgxHVvy`f@(+o4{!f2xs?0xAay@~
zx>x36h`e&!=?h!QcL9}i!}9R>{vnP0kjBoAzRvPnkx`7pG<DvkILXSw|9LhCx$kCj
ze529${+ByCXlb6>wG6Hk7?RrRmmlHn?QQsA19dRC_^BLz2BWc|&Sqx&ocd@;8{fg5
zPtx<p*dG$S-MI-SB!8w(YfCf6Ny;4;zOk{?v45vqchQTdCQk_t5INKihj8WNL#0cF
zXXoK*AidP&OWfB<oY3df$-jN|{u7)&9*Wa=w|b@Tc%lFEiX<HRzbq=Etnjq|OZ7VI
z|NjKE2PG*4YRRQEDqu^<k=Qwy`p0sdbW~-eHQcg$Ws~bz6wS6b_ws~faTA-SqBgAS
zr0Ny&eABgXecdbckJZo}`J~&?dPTcY%>-Svu9RqrGeiUn&-kd>yU9nwq`6(U*2O|2
z_P9UD6dl{Kzl{tJ1sV@6Ohm)$v?FQg&o7auEe(CH4hyYeU(IwaYPK7_J9~W1>#Dt%
z$903ad$S*&<)Skjb@^gq<O_^qIWAg?=Vq$z<aa&S*QSav?GCD4V>uCr=8dUYE491H
zUF#}TgO(wU#&etB3~xGN+gmNNy)z6ht(o1KdqOf@2i2)O7#G^23wzsMd(a;&tD0`~
zk=9h4WQUdoGV{SoUv<`<W@Fs*!)vQmOznPS<8Olo!Oj9TQPXrL7Z>2Mr<VT?80``a
x$~)-02zWSW-HE|qFc=I5gTY`h7z_r3!C){L3<iV2U@#beh0p$V9iady004zBoxlJ9

literal 0
HcmV?d00001

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 0a09b261140477a06d5be67bc648c1cab229a785..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 826
zcmV-A1I7FwiwFS6pBh;J1MQT3Z<{(4hx2zog@^8>dzCdnUP#idSE30dH1BUE={il0
zae+X9fWrdQzWZ>}WWANTUR|kon&d~q<{XZHHpliU@M}z<0SPRuBHzos2115ZF4JDD
zR)ohrMXZQoPArLnR1u|0wVD&eVpS~Vfbc4-dBQd#Fa#iHT7D4xB<`i}zbRkO0N{eq
zk8J~o+y&s=ox#1M&ZX~@h=ef6yfi9vS$;%3xW*?>=EFOTGW+9$4Zue(!kGl%&TZO8
z{JFbBfaj^fV}f|wvq{0=Phy|mJwLWPZ+z~{J%#`9_7WUNfVY4DP(!|V|8Lc(NET0^
z?ctEBJgfQ&auN6GLF&+dJ1BDjL=H4@^g>ec8iyv{Pk+7*vJ1O^kG6(Sd&5EjGM<@X
zAM{i8(;JP(hXZhO(BFM*^D#6-=n;PT{ttL}cjrCWK<;)g|IC`dKz}flClkGSL47o&
ziSOaoCDFw(_DzU4TRX&rBu~_7zUYc^7;&c$&-_?q8J{B@#x{ECOor%D)}XQ9M>>3;
zyu;%Dxz~@6>M@X(3i33`XY~1Y_Ny=Qf245S%|ftUzS0~o)PF%L9qNBcEJ@{Rk=FmR
zAhP=Ze~=yR^Du%y&bTV|Q`is_R8;n+_9bgaiY)cjnhjky9^C}RqTY0-P7;zhsAFB1
z<l5pU%sXj$x@s+O)oiEQm%L~9UD8t2cG|4vV^J$Et|fntV?@LSo(O)ueVg>fQGH`J
z%ygy_W6<fwl7@}I-S|TXtyKXoFewflrRkS??(_;d>U^k8<zA}RjO&S}`t@e5eQykI
z1Wh(}<w12w?4926DoN4m^;<$Z8YVN0f^v{HB*%_r%}VauwyTaMaop<WTf_ON*wb%y
zb+MFNtHfShd-A$5EcFLdLs<206|d<mXYtPJt*;gnLzy~aI5yY$ak)E4)maO+H|=J(
z)1Bv4ZP-C-U9!S0nx{xlx=U@Tm`c4iXuICcqLGe`PHp9G)-{5y8LFeYZjCN4!Lb<H
zUWCy$#2~wau8n|$li#(TFc=I5gTY`h7z_r3!C){L3<iV2U@#aA2IJT89SzPaasVg*
E09YlX4FCWD

diff --git a/example_boxes/gentoo_002_lxd.box b/example_boxes/gentoo_002_lxd.box
new file mode 100644
index 0000000000000000000000000000000000000000..49c40fcc06a4158a8825d2e33f0f19278a2d4eda
GIT binary patch
literal 838
zcmV-M1G)SkiwFQ*${JY!1MQUkZ=y&T$Njl~1xId^y|^uJirTwgLRFNCif>iA-E78T
z3J3zi$O@bN-<Q$W>ow_mzx3`lnNI@4^UO2f8J?MWF1R(qzycUttdcM&y#;)MT&a*&
zs8#vrEkUSCa!HT`UanT8sw9?pL97WviQ(U5H80pE7{m-yvYjxBeh_!6|0m_^8N;wq
z9Hy>?V)l|@{hh^rAWnA;Y(zXZ3UC-6oXar8364QjbdaHi%Lx-4fHgXL3Ln}bSlAyQ
zZHD>CCaBP5*mIY>6YkvKL5Aaq!66JeH*oQV#T~^yeRzGWzG!|PDE&6~$Ga=$X$14`
z&%e}Q7(Dz_H6l{PW8elTCMvJ0zJXlAetMKTwBHWOYy_ZJq(3>4RJ2BMu}Nh5^KDez
z;{A8BwL;Qb4ve7n$_)FUAF3a}NHjW}ilc-4?sJ<<fgOVYbIad<1^4&&!K2M6x_<S(
zc>Tr<hK4ek%v+blM?zZY0c?GoTt3DA5~I!5jS<G#3w4q&vSJh`?6KpOA4?qTbAsa3
zg{RJB44-8USo?h>!}rNMEbi}n{rspt1(N!KUncpCJm1d#>)U;r$JAd$+vS_haiae7
zvLx*5za&U<rM9pCVi8X3|Gz+SiqGQ&FiOF-G{`|y$e`HXo7$J+J!&iRK&`vL_tVjB
zB#QHvH}$d@r%?mV=dw~aZ{xC;SEj3uiE4H?*S?ekci`hrTkYnpdN~y|(Y%qv1xg_n
zOf=!cM)xio2&2ZvZrb@w#n!N=r?Q5u$lrv92iGbOOoT<lYqvtF?@zCxr!EX_s`PWU
zZrw~YHEgu%-3M!U%WI0Ys|;%fc6ak$P|ZZAKj`rJ$jD|0MwKXU%AT7lnv*?rU0)r`
z!nmWCJH}!p_UCtV)m$o_Rpy#EfwFEI(qK5X_*MU|9kjgVEZsT%^|d*%+EY)6$M(8B
zuIR&DopnHW({1TJeNk35qX*T7?8IBR$l*NGm)f#zw;T0g*AH&ZW<Iuh^_9O_*D-Qt
zumKx$XLNPNJk>onND$n{h$(KN??T2y*-ub9C=?2XLZMJ76bgkxp-?Ck3WY+UP$(1%
Qh4Me*J9mM?<^U)F00DTcq5uE@

literal 0
HcmV?d00001

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 99fec2d6956b065d0d53e72896bd1b0da1d511ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 813
zcmV+|1Je8-iwFR?pBh;J1MQS+Z<|OIhVwbUVis+sUAc+51>4!pO2jrc@eSXCNmH%H
z!vruGFpQ~T)&E|`Nvt$dlYVHrTJ1a%Gn{u0hcmZxT3urTZAjqhDviRUw}3BEWSRCt
z?TmlgQv_KOj|55Jl`}z+<Wd*J8ZR6H{!OxZ#x^A|0pQ4Sqd0!S@3ry&DE}M-z{N?F
zc{WbCbHD{Vn|n{iWfYN=Brq;j>Qzc^l#&px@j)pyyu+xpKRnm~eBe@Ch5+1&N87ae
z=erAlqL4r@#0hx!*IsxGMQ!R<#ROFk@jt%*QQ=bV<3p(X{_}lgE{4d54o+X03XI8#
zg9#1kh2=>Jf_*CaK9#K<eVyq`-cgLhG<8o>oMh!nfA@EBPTVN`#w_+Jyf}ly8}-Kb
zTYC`bl0LPo8FUgDlIrr0U*YZTZTMgVwco$^t!#b=!;zs*r)KM%YSg8L@8C8d>G`AY
zFA3gky#y1IKZ{QHgl3GBlsgQ3V`8am|4o<5L$98;JSBLI$bQXm2$uog?@sDIJ4R3a
z=%ptIx35z;rqAc&fBR<s98Mqi{50M!-{>E&)PG))gnj*&1WA!=BCY>2tN%X-T9T3!
z0=48)8WylA<VbAqP5o2Zj@zm-)aqVYl(O-4EQ)5!pZR%0vbcdwQ&H>IbyD#QdA90U
zxaM>V{Zl3Mh5_lcwQkX>S295ttt%y3;0zJL!c#tKbZ_#ZFm7y|rc=x{Vvl<LOwq9&
z2b;+7(OTo7g^6hR?N%fWg4reVwS}S2)Ip)u?W?J-MU7UyduNZXd0n-4@~CDIZ)f(x
zvs`os!wz4JjeL$#EXPGt@x4sd-TbcW1=>UrCY^qzV=Ttvz`QXvYpHftxo2I4>bhx2
z!_my<SA&~&*z%Y2Z08Qvm)6v7&wL@7IP1zp?vDy>-htgsx7F|U7Zpu6dPr+1Zn8y-
z0-1S#sW013yHOu?gYepF78AQyUj>_WonUv48mM8q<BJRMSTf6^kI^>4puB^Dhk%ds
r|4I2_Fc=I5gTY`h7z_r3!C){L3<iV2U@#aA#t-5PZj#lv04M+e#(|lN

diff --git a/example_boxes/sid_002_lxd.box b/example_boxes/sid_002_lxd.box
new file mode 100644
index 0000000000000000000000000000000000000000..cc69a594a7935d74c3ca5479a51b3a93f6d8580b
GIT binary patch
literal 828
zcmV-C1H=3uiwFQg${JY!1MQS+Z<|OIhW$Cef<;@YD>pH>U^}~6iP**_zTsOiX{yx#
z6Tn;zV``}S-^&okN+UJd56!N2HIL*O&Y8pUnK{FI)(9X17C_)^lSX0fEnrGSLBKQH
zJZGNH7*-JZ8q2eccrNhgELUS#uE~fsig}Z2p0P_2NGPgiJ5e0J5ck^pf0QpL6h+5L
zl(`m6=nIPW_ZIyDJKX@-5PK|WxFBq#?qR`*B9x*8#N{G>y>vNIib4>;qo?%2Jv2-E
z<H4q=k8}#l6cl~x;xTRf@$Ql`qYwc%gbDTT&&u(b3fnlW0g>4_=Ku8JXQfN&Plr?w
z^Vf&WbPP<d+<5xRRzQqSZHRD6H!QD^?^mVdRVh0w`o7YaqN5mwY3iJ&Fv-dm{O$MR
z963?=gI!c5ytsqo6OM)ttvx#Mkv_E>8L$%&qK5JNui)<PE<D(jG#XvLFNfc#$yAjV
z3$1&BeK@2G@4?PT>BVF0FA3c4+yo+&Kg*7Lf-8neN*@<~u(8y!{=!G)ny=orJVh`t
zQFUf81cnc*?xfDMYxFb@s{uNOeP6-}{(U|9w?EmR%Aq-D@y>X&|9D0J8Iflz{pVR;
z6q=R(b7eTu|9=3iJV^>DspN{E6rjWACfBP><#RdCdXhMiTW+a6+3Y6fIIZg~y*xo#
z+=iMaN-g~+se6U6-1K$Wv<HRqxgNR`AN70kpy;;h8LM#mwHU2oW+GOH3npq0Zu1E{
zYj5q2U94neO^2gQRG=06+er1yKxTjr5vO{+Zp4rM<(28lYgJiF<3es(*9%3C+TGUR
z-kRPpie&ADX;Ve+UK@tzIp>TgeWsYH`3jn`5EmWMb2CYC^8117%X5*P_eb@<x}I@k
z?N*a@L+WpGSHBLWpri7W>C$30<J(@?^^8@vcgDe$zOZ^rk4@%wP@fB<X(6xrV6Yu@
zN5j#&E-UKLl-r_{?96pxYWc`ejGo<Vx26L>ywN+w+#0qv{x)bK=&a1P+18xd<t6o~
zjHR|ibC*D>{0e>7q&%4azf^`mAP@)y0)apv5C{YUfj}S-2m}IwKp+qZZ_PK1L=x%%
GC;$Kh>!FnZ

literal 0
HcmV?d00001

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?