From 9543fea1afa4c2eb467cf89fc4104cef3541d9b6 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 28 Dec 2017 12:58:34 +0000 Subject: [PATCH 1/3] Change ownership within chroot --- src/freedombone-app-cryptpad | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/freedombone-app-cryptpad b/src/freedombone-app-cryptpad index 92ddd366..ea74bc12 100755 --- a/src/freedombone-app-cryptpad +++ b/src/freedombone-app-cryptpad @@ -330,7 +330,12 @@ function cryptpad_create_config { echo ' //logFeedback: true,' >> $cryptpad_prefix$CRYPTPAD_DIR/config.js echo ' //logRPC: true,' >> $cryptpad_prefix$CRYPTPAD_DIR/config.js echo '};' >> $cryptpad_prefix$CRYPTPAD_DIR/config.js - chown cryptpad:cryptpad $cryptpad_prefix$CRYPTPAD_DIR/config.js + + if [[ "$cryptpad_install_type" != "mesh" ]]; then + chown cryptpad:cryptpad $cryptpad_prefix$CRYPTPAD_DIR/config.js + else + chroot "$rootdir" chown cryptpad:cryptpad $CRYPTPAD_DIR/config.js + fi } function mesh_install_cryptpad { From 4396da43536694976fd8403f3e5fa6998c988f1c Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 28 Dec 2017 15:10:54 +0000 Subject: [PATCH 2/3] Additional cleanup during mesh install --- src/freedombone-image-customise | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index c27c89ed..994e0326 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -701,6 +701,11 @@ initialise_mesh() { install_web_server mesh_install_scuttlebot #install_ferment + + chroot "$rootdir" apt-get clean + chroot "$rootdir" /bin/rm -rf /var/lib/apt/lists/* + chroot "$rootdir" apt-get clean + install_ipfs install_tox install_pelican From 47ee47e6fbccc2876514bc0aa6cb43a7ac5c5016 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 28 Dec 2017 21:02:36 +0000 Subject: [PATCH 3/3] Update some hashes --- doc/EN/mesh_images.org | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/EN/mesh_images.org b/doc/EN/mesh_images.org index 8646716e..917bea0a 100644 --- a/doc/EN/mesh_images.org +++ b/doc/EN/mesh_images.org @@ -45,7 +45,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.x wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig gpg --verify freedombone-meshclient-i386.img.xz.sig sha256sum freedombone-meshclient-i386.img.xz -3e88205461bb2061dc172ff0a1e65e5cae1013f8f7dc26c6d5cbe1c986c98555 +49391230de6a4f1966db091813deb8f9d93c947677f5483baa52400d7fcba7d3 unxz freedombone-meshclient-i386.img.xz sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8 sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync @@ -61,7 +61,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig sha256sum freedombone-meshclient-insecure-i386.img.xz -09c059664daf56d210134735d37e8117bb7b755acc8b9b253cdfa42052249ccb +066ef17f90078de8ae85807fa0207f5e3b994a74442cb0683a3bbce1a1b6253b unxz freedombone-meshclient-insecure-i386.img.xz sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8 sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync @@ -82,7 +82,7 @@ wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf.img.xz.sig gpg --verify freedombone-mesh_beaglebone-armhf.img.xz.sig sha256sum freedombone-mesh_beaglebone-armhf.img.xz -60017999340a6559d1de76f3d78d9771c11de5eeefb3d3b812747ce306251e67 +ad8f22c0d46c98a80aa47b5809402971cf5cf26ebf587c59a667307b2386c3d2 unxz freedombone-mesh_beaglebone-armhf.img.xz sudo dd bs=1M if=freedombone-mesh_beaglebone-armhf.img of=/dev/sdX conv=fdatasync #+end_src @@ -102,7 +102,7 @@ wget https://freedombone.net/downloads/current/freedombone.tar.gz wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig gpg --verify freedombone.tar.gz.sig sha256sum freedombone.tar.gz -3d2a7f2bd7a3475832756b7bb63b96ba5fc4a4f4d7bffe86e685be9a3b41b958 + tar -xzvf freedombone.tar.gz cd freedombone git checkout stretch