From d21ef490ff28bf3211f6f0b3b0850a69dfbb24bc Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 23 Jun 2016 13:56:02 +0100 Subject: [PATCH] Fixing mesh variant images --- src/freedombone-image-customise | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index fac74624..73c287c9 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -1015,7 +1015,7 @@ initialise_mesh() { # User interface for USB drive installs ###################################### function enable_tox_repo { - chroot "$rootdir" echo 'deb http://download.opensuse.org/repositories/home:/antonbatenev:/tox/Debian_8.0/ /' > /etc/apt/sources.list.d/tox.list + echo 'deb http://download.opensuse.org/repositories/home:/antonbatenev:/tox/Debian_8.0/ /' > $rootdir/etc/apt/sources.list.d/tox.list chroot "$rootdir" wget -q http://download.opensuse.org/repositories/home:antonbatenev:tox/Debian_8.0/Release.key -O- | apt-key add - @@ -1028,13 +1028,11 @@ function install_syncthing { return fi - chroot "$rootdir" apt-get -y install curl - - chroot "$rootdir" wget -q ttps://syncthing.net/release-key.txt -O- | apt-key add - + chroot "$rootdir" wget -q https://syncthing.net/release-key.txt -O- | apt-key add - echo "deb http://apt.syncthing.net/ syncthing release" | tee $rootdir/etc/apt/sources.list.d/syncthing.list chroot "$rootdir" apt-get update - chroot "$rootdir" apt-get -y install syncthing + chroot "$rootdir" apt-get -y --force-yes install syncthing # This probably does need to run as root so that it can access the Sync directories # in each user's home directory @@ -1081,7 +1079,7 @@ function configure_user_interface { # Tox user interface enable_tox_repo # TODO: this may not work on all architectures - chroot "$rootdir" apt-get -y install qtox + chroot "$rootdir" apt-get -y --force-yes install qtox fi # Syncthing