From 75966b24ed66503a840c7c14baae47f888e985f6 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 28 Jul 2016 08:18:30 +0100 Subject: [PATCH] Tomb dependency --- src/freedombone-image | 2 +- src/freedombone-image-customise | 3 +++ src/freedombone-utils-filesystem | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/freedombone-image b/src/freedombone-image index 9bc185e2..4b7b0860 100755 --- a/src/freedombone-image +++ b/src/freedombone-image @@ -359,7 +359,7 @@ fi if [[ $VARIANT == 'meshclient' || $VARIANT == 'meshusb' ]]; then IMAGE_NAME=$'meshclient' if [ ! $IMAGE_SIZE_SPECIFIED ]; then - IMAGE_SIZE=3G + IMAGE_SIZE=4G fi fi diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index a02a22a1..3afeaaa5 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -636,6 +636,9 @@ function configure_user_interface { # tool to change desktop settings from command line chroot "$rootdir" apt-get -y install dconf-cli dconf-gsettings-backend dbus dbus-x11 + # for tomb + chroot "$rootdir" apt-get -y install pinentry-gtk2 + if [[ $VARIANT != "usb" ]]; then # log in automatically chroot "$rootdir" apt-get -y install nodm xinit diff --git a/src/freedombone-utils-filesystem b/src/freedombone-utils-filesystem index 0b67735a..61837f07 100755 --- a/src/freedombone-utils-filesystem +++ b/src/freedombone-utils-filesystem @@ -32,7 +32,7 @@ TOMB_REPO="https://github.com/dyne/Tomb" TOMB_COMMIT='c80ebd6d6ed77980eb5b559757e03ea13a29bdd1' function mesh_install_tomb { - chroot ${rootdir} apt-get -y install cryptsetup zsh + chroot ${rootdir} apt-get -y install cryptsetup zsh pinentry-curses if [ ! -d ${rootdir}/$INSTALL_DIR ]; then mkdir -p ${rootdir}/$INSTALL_DIR @@ -67,7 +67,7 @@ function install_tomb { fi fi - apt-get -y install cryptsetup zsh + apt-get -y install cryptsetup zsh pinentry-curses if [ ! -d $INSTALL_DIR ]; then mkdir -p $INSTALL_DIR