Browse Source

Tomb dependency

Bob Mottram 9 years ago
parent
commit
75966b24ed
3 changed files with 6 additions and 3 deletions
  1. 1
    1
      src/freedombone-image
  2. 3
    0
      src/freedombone-image-customise
  3. 2
    2
      src/freedombone-utils-filesystem

+ 1
- 1
src/freedombone-image View File

359
 if [[ $VARIANT == 'meshclient' || $VARIANT == 'meshusb' ]]; then
359
 if [[ $VARIANT == 'meshclient' || $VARIANT == 'meshusb' ]]; then
360
     IMAGE_NAME=$'meshclient'
360
     IMAGE_NAME=$'meshclient'
361
     if [ ! $IMAGE_SIZE_SPECIFIED ]; then
361
     if [ ! $IMAGE_SIZE_SPECIFIED ]; then
362
-        IMAGE_SIZE=3G
362
+        IMAGE_SIZE=4G
363
     fi
363
     fi
364
 fi
364
 fi
365
 
365
 

+ 3
- 0
src/freedombone-image-customise View File

636
 	# tool to change desktop settings from command line
636
 	# tool to change desktop settings from command line
637
 	chroot "$rootdir" apt-get -y install dconf-cli dconf-gsettings-backend dbus dbus-x11
637
 	chroot "$rootdir" apt-get -y install dconf-cli dconf-gsettings-backend dbus dbus-x11
638
 
638
 
639
+	# for tomb
640
+	chroot "$rootdir" apt-get -y install pinentry-gtk2
641
+
639
 	if [[ $VARIANT != "usb" ]]; then
642
 	if [[ $VARIANT != "usb" ]]; then
640
 		# log in automatically
643
 		# log in automatically
641
 		chroot "$rootdir" apt-get -y install nodm xinit
644
 		chroot "$rootdir" apt-get -y install nodm xinit

+ 2
- 2
src/freedombone-utils-filesystem View File

32
 TOMB_COMMIT='c80ebd6d6ed77980eb5b559757e03ea13a29bdd1'
32
 TOMB_COMMIT='c80ebd6d6ed77980eb5b559757e03ea13a29bdd1'
33
 
33
 
34
 function mesh_install_tomb {
34
 function mesh_install_tomb {
35
-	chroot ${rootdir} apt-get -y install cryptsetup zsh
35
+	chroot ${rootdir} apt-get -y install cryptsetup zsh pinentry-curses
36
 
36
 
37
 	if [ ! -d ${rootdir}/$INSTALL_DIR ]; then
37
 	if [ ! -d ${rootdir}/$INSTALL_DIR ]; then
38
 		mkdir -p ${rootdir}/$INSTALL_DIR
38
 		mkdir -p ${rootdir}/$INSTALL_DIR
67
 		fi
67
 		fi
68
 	fi
68
 	fi
69
 
69
 
70
-	apt-get -y install cryptsetup zsh
70
+	apt-get -y install cryptsetup zsh pinentry-curses
71
 
71
 
72
 	if [ ! -d $INSTALL_DIR ]; then
72
 	if [ ! -d $INSTALL_DIR ]; then
73
 		mkdir -p $INSTALL_DIR
73
 		mkdir -p $INSTALL_DIR