瀏覽代碼

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram 7 年之前
父節點
當前提交
ac086978db
共有 4 個文件被更改,包括 1 次插入3 次删除
  1. 二進制
      image_build/mesh_apps/ssb.apk
  2. 1
    1
      src/freedombone-base-tripwire
  3. 0
    1
      src/freedombone-image-customise
  4. 0
    1
      src/freedombone-utils-go

二進制
image_build/mesh_apps/ssb.apk 查看文件


+ 1
- 1
src/freedombone-base-tripwire 查看文件

@@ -139,7 +139,7 @@ function install_tripwire {
139 139
     # Avoid logging the changed database
140 140
     sed -i "s|\$(TWETC)/tw.pol.*||g" /etc/tripwire/twpol.txt
141 141
     # site key name
142
-    sed -i "s|$(TWETC)/site.key|\$(TWETC)/\$(HOSTNAME)-site.key|g" /etc/tripwire/twpol.txt
142
+    sed -i "s|\$(TWETC)/site.key|\$(TWETC)/\$(HOSTNAME)-site.key|g" /etc/tripwire/twpol.txt
143 143
 
144 144
     # create the policy
145 145
     echo '

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

@@ -339,7 +339,6 @@ fi
339 339
 EOF
340 340
 
341 341
     { echo "MY_USERNAME=${MY_USERNAME}";
342
-      echo "SSH_PORT=${SSH_PORT}";
343 342
       echo '# initial setup of the system';
344 343
       echo 'if [ -f ~/.initial_setup ]; then';
345 344
       echo '    if [ -f ~/login.txt ]; then';

+ 0
- 1
src/freedombone-utils-go 查看文件

@@ -214,7 +214,6 @@ function mesh_upgrade_golang {
214 214
         echo $"golang binaries directory not found ${rootdir}/home/go/go${GO_VERSION}/bin"
215 215
         exit 356356785
216 216
     fi
217
-    ls -la "${rootdir}/home/go/go${GO_VERSION}"
218 217
     if ! cp "${rootdir}/home/go/go${GO_VERSION}/bin/"* "${rootdir}/usr/bin"; then
219 218
         ls -la "${rootdir}/home/go/go${GO_VERSION}"
220 219
         echo $'Copying golang binaries failed'