free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing mesh variant images

This commit is contained in:
Bob Mottram 2016-06-23 13:56:02 +01:00
parent 3e1f751b01
commit d21ef490ff
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/freedombone-image-customise
View File

@ -1015,7 +1015,7 @@ initialise_mesh() {
# User interface for USB drive installs ###################################### # User interface for USB drive installs ######################################
function enable_tox_repo { 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 - 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 return
fi fi
chroot "$rootdir" apt-get -y install curl chroot "$rootdir" wget -q https://syncthing.net/release-key.txt -O- | apt-key add -
chroot "$rootdir" wget -q ttps://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 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 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 # This probably does need to run as root so that it can access the Sync directories
# in each user's home directory # in each user's home directory
@ -1081,7 +1079,7 @@ function configure_user_interface {
# Tox user interface # Tox user interface
enable_tox_repo enable_tox_repo
# TODO: this may not work on all architectures # 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 fi
# Syncthing # Syncthing