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

Tomb dependency

This commit is contained in:
Bob Mottram 2016-07-28 08:18:30 +01:00
parent cd73ea5d74
commit 75966b24ed
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone-image
View File

@ -359,7 +359,7 @@ fi
if [[ $VARIANT == 'meshclient' || $VARIANT == 'meshusb' ]]; then if [[ $VARIANT == 'meshclient' || $VARIANT == 'meshusb' ]]; then
IMAGE_NAME=$'meshclient' IMAGE_NAME=$'meshclient'
if [ ! $IMAGE_SIZE_SPECIFIED ]; then if [ ! $IMAGE_SIZE_SPECIFIED ]; then
IMAGE_SIZE=3G IMAGE_SIZE=4G
fi fi
fi fi

3
src/freedombone-image-customise
View File

@ -636,6 +636,9 @@ function configure_user_interface {
# tool to change desktop settings from command line # tool to change desktop settings from command line
chroot "$rootdir" apt-get -y install dconf-cli dconf-gsettings-backend dbus dbus-x11 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 if [[ $VARIANT != "usb" ]]; then
# log in automatically # log in automatically
chroot "$rootdir" apt-get -y install nodm xinit chroot "$rootdir" apt-get -y install nodm xinit

4
src/freedombone-utils-filesystem
View File

@ -32,7 +32,7 @@ TOMB_REPO="https://github.com/dyne/Tomb"
TOMB_COMMIT='c80ebd6d6ed77980eb5b559757e03ea13a29bdd1' TOMB_COMMIT='c80ebd6d6ed77980eb5b559757e03ea13a29bdd1'
function mesh_install_tomb { 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 if [ ! -d ${rootdir}/$INSTALL_DIR ]; then
mkdir -p ${rootdir}/$INSTALL_DIR mkdir -p ${rootdir}/$INSTALL_DIR
@ -67,7 +67,7 @@ function install_tomb {
fi fi
fi fi
apt-get -y install cryptsetup zsh apt-get -y install cryptsetup zsh pinentry-curses
if [ ! -d $INSTALL_DIR ]; then if [ ! -d $INSTALL_DIR ]; then
mkdir -p $INSTALL_DIR mkdir -p $INSTALL_DIR