Просмотр исходного кода

Moving to image distribution via dat

This will scale much better
Bob Mottram 6 лет назад
Родитель
Сommit
60c89bc7eb
2 измененных файлов: 69 добавлений и 49 удалений
  1. 27
    20
      doc/EN/mesh_images.org
  2. 42
    29
      website/EN/mesh_images.html

+ 27
- 20
doc/EN/mesh_images.org Просмотреть файл

@@ -38,7 +38,8 @@ The MultiWriter tool is also available within mesh client images, so that you ca
38 38
 Install some prerequisites:
39 39
 
40 40
 #+begin_src bash
41
-sudo apt-get install xz-utils wget
41
+sudo apt-get install xz-utils nodejs
42
+sudo npm install -g dat
42 43
 #+end_src
43 44
 
44 45
 To download images with dat:
@@ -48,13 +49,6 @@ dat clone dat://e2ed9767d6ab64f4c43a2adbce65af225133fec7ba95737f0a2f6ae292ba358e
48 49
 cd e2ed9767d6ab64f4c43a2adbce65af225133fec7ba95737f0a2f6ae292ba358e
49 50
 #+end_src
50 51
 
51
-Or to download images directly with wget (may be slower):
52
-
53
-#+begin_src bash
54
-wget https://freedombone.net/downloads/v31/freedombone-meshclient-i386.img.xz
55
-wget https://freedombone.net/downloads/v31/freedombone-meshclient-i386.img.xz.sig
56
-#+end_src
57
-
58 52
 Check the signature:
59 53
 
60 54
 #+begin_src bash
@@ -76,7 +70,8 @@ If you're in an emergency and don't have Atheros wifi dongles then there is also
76 70
 Install some prerequisites:
77 71
 
78 72
 #+begin_src bash
79
-sudo apt-get install xz-utils wget
73
+sudo apt-get install xz-utils nodejs
74
+sudo npm install -g dat
80 75
 #+end_src
81 76
 
82 77
 To download images with dat:
@@ -86,13 +81,6 @@ dat clone dat://6d1b73d13b6f9b5c481c6dfd64be6aa58e1cd2d153a6bb04bbc177999ee9925e
86 81
 cd 6d1b73d13b6f9b5c481c6dfd64be6aa58e1cd2d153a6bb04bbc177999ee9925e
87 82
 #+end_src
88 83
 
89
-Or to download images directly with wget (may be slower):
90
-
91
-#+begin_src bash
92
-wget https://freedombone.net/downloads/v31/freedombone-meshclient-insecure-i386.img.xz
93
-wget https://freedombone.net/downloads/v31/freedombone-meshclient-insecure-i386.img.xz.sig
94
-#+end_src
95
-
96 84
 Check the signature:
97 85
 
98 86
 #+begin_src bash
@@ -115,12 +103,31 @@ Routers are intended to build network coverage for an area using small and low c
115 103
 
116 104
 The above picture shows a Beaglebone Black with the image copied onto a microSD card (there's no need to do anything with the internal EMMC). A USB Atheros wifi adaptor with a large antenna is attached and in this case power is from the mains, although it could be from a battery or solar power system capable of supplying 5 volts and maybe 1A (depending upon how active the router is).
117 105
 
106
+Install some prerequisites:
107
+
118 108
 #+begin_src bash
119
-sudo apt-get install xz-utils wget
120
-wget https://freedombone.net/downloads/v31/freedombone-mesh_beaglebone-armhf.img.xz
121
-wget https://freedombone.net/downloads/v31/freedombone-mesh_beaglebone-armhf.img.xz.sig
122
-gpg --verify freedombone-mesh_beaglebone-armhf.img.xz.sig
109
+sudo apt-get install xz-utils nodejs
110
+sudo npm install -g dat
111
+#+end_src
112
+
113
+To download images with dat:
114
+
115
+#+begin_src bash
116
+dat clone dat://a4e79e49c6e77b919d4ae4827037e813ef1ba2734c342d0d78146ce16a819ebb/
117
+cd a4e79e49c6e77b919d4ae4827037e813ef1ba2734c342d0d78146ce16a819ebb
118
+#+end_src
119
+
120
+Check the signature:
121
+
122
+#+begin_src bash
123
+gpg --verify freedombone-mesh_beaglebone-armhf.img.sig
123 124
 unxz freedombone-mesh_beaglebone-armhf.img.xz
125
+#+end_src
126
+
127
+Then clone to the microSD drive, where sdX is your device name:
128
+
129
+#+begin_src bash
130
+sudo dd if=/dev/zero of=/dev/sdX bs=32M count=8
124 131
 sudo dd bs=32M if=freedombone-mesh_beaglebone-armhf.img of=/dev/sdX conv=fdatasync,sync,noerror
125 132
 #+end_src
126 133
 

+ 42
- 29
website/EN/mesh_images.html Просмотреть файл

@@ -4,7 +4,7 @@
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6 6
 <title></title>
7
-<!-- 2018-06-15 Fri 17:40 -->
7
+<!-- 2018-06-16 Sat 11:38 -->
8 8
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
9 9
 <meta  name="generator" content="Org-mode" />
10 10
 <meta  name="author" content="Bob Mottram" />
@@ -209,7 +209,8 @@ Install some prerequisites:
209 209
 
210 210
 <div class="org-src-container">
211 211
 
212
-<pre class="src src-bash">sudo apt-get install xz-utils wget
212
+<pre class="src src-bash">sudo apt-get install xz-utils nodejs
213
+sudo npm install -g dat
213 214
 </pre>
214 215
 </div>
215 216
 
@@ -225,17 +226,6 @@ cd e2ed9767d6ab64f4c43a2adbce65af225133fec7ba95737f0a2f6ae292ba358e
225 226
 </div>
226 227
 
227 228
 <p>
228
-Or to download images directly with wget (may be slower):
229
-</p>
230
-
231
-<div class="org-src-container">
232
-
233
-<pre class="src src-bash">wget https://freedombone.net/downloads/v31/freedombone-meshclient-i386.img.xz
234
-wget https://freedombone.net/downloads/v31/freedombone-meshclient-i386.img.xz.sig
235
-</pre>
236
-</div>
237
-
238
-<p>
239 229
 Check the signature:
240 230
 </p>
241 231
 
@@ -271,7 +261,8 @@ Install some prerequisites:
271 261
 
272 262
 <div class="org-src-container">
273 263
 
274
-<pre class="src src-bash">sudo apt-get install xz-utils wget
264
+<pre class="src src-bash">sudo apt-get install xz-utils nodejs
265
+sudo npm install -g dat
275 266
 </pre>
276 267
 </div>
277 268
 
@@ -287,17 +278,6 @@ cd 6d1b73d13b6f9b5c481c6dfd64be6aa58e1cd2d153a6bb04bbc177999ee9925e
287 278
 </div>
288 279
 
289 280
 <p>
290
-Or to download images directly with wget (may be slower):
291
-</p>
292
-
293
-<div class="org-src-container">
294
-
295
-<pre class="src src-bash">wget https://freedombone.net/downloads/v31/freedombone-meshclient-insecure-i386.img.xz
296
-wget https://freedombone.net/downloads/v31/freedombone-meshclient-insecure-i386.img.xz.sig
297
-</pre>
298
-</div>
299
-
300
-<p>
301 281
 Check the signature:
302 282
 </p>
303 283
 
@@ -341,13 +321,46 @@ Routers are intended to build network coverage for an area using small and low c
341 321
 The above picture shows a Beaglebone Black with the image copied onto a microSD card (there's no need to do anything with the internal EMMC). A USB Atheros wifi adaptor with a large antenna is attached and in this case power is from the mains, although it could be from a battery or solar power system capable of supplying 5 volts and maybe 1A (depending upon how active the router is).
342 322
 </p>
343 323
 
324
+<p>
325
+Install some prerequisites:
326
+</p>
327
+
344 328
 <div class="org-src-container">
345 329
 
346
-<pre class="src src-bash">sudo apt-get install xz-utils wget
347
-wget https://freedombone.net/downloads/v31/freedombone-mesh_beaglebone-armhf.img.xz
348
-wget https://freedombone.net/downloads/v31/freedombone-mesh_beaglebone-armhf.img.xz.sig
349
-gpg --verify freedombone-mesh_beaglebone-armhf.img.xz.sig
330
+<pre class="src src-bash">sudo apt-get install xz-utils nodejs
331
+sudo npm install -g dat
332
+</pre>
333
+</div>
334
+
335
+<p>
336
+To download images with dat:
337
+</p>
338
+
339
+<div class="org-src-container">
340
+
341
+<pre class="src src-bash">dat clone dat://a4e79e49c6e77b919d4ae4827037e813ef1ba2734c342d0d78146ce16a819ebb/
342
+cd a4e79e49c6e77b919d4ae4827037e813ef1ba2734c342d0d78146ce16a819ebb
343
+</pre>
344
+</div>
345
+
346
+<p>
347
+Check the signature:
348
+</p>
349
+
350
+<div class="org-src-container">
351
+
352
+<pre class="src src-bash">gpg --verify freedombone-mesh_beaglebone-armhf.img.sig
350 353
 unxz freedombone-mesh_beaglebone-armhf.img.xz
354
+</pre>
355
+</div>
356
+
357
+<p>
358
+Then clone to the microSD drive, where sdX is your device name:
359
+</p>
360
+
361
+<div class="org-src-container">
362
+
363
+<pre class="src src-bash">sudo dd if=/dev/zero of=/dev/sdX bs=32M count=8
351 364
 sudo dd bs=32M if=freedombone-mesh_beaglebone-armhf.img of=/dev/sdX conv=fdatasync,sync,noerror
352 365
 </pre>
353 366
 </div>