浏览代码

Tomb dependency

Bob Mottram 9 年前
父节点
当前提交
75966b24ed
共有 3 个文件被更改,包括 6 次插入3 次删除
  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 查看文件

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

+ 3
- 0
src/freedombone-image-customise 查看文件

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

+ 2
- 2
src/freedombone-utils-filesystem 查看文件

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