Bob Mottram hace 9 años
padre
commit
ebf5844b4b
Se han modificado 2 ficheros con 7 adiciones y 2 borrados
  1. 5
    1
      src/freedombone
  2. 2
    1
      src/freedombone-image-customise

+ 5
- 1
src/freedombone Ver fichero

@@ -1235,6 +1235,7 @@ function read_configuration {
1235 1235
             TLS_TIME_SOURCE2=$(grep "TLS_TIME_SOURCE2" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1236 1236
         fi
1237 1237
     fi
1238
+	echo "System type: $SYSTEM_TYPE"
1238 1239
 }
1239 1240
 
1240 1241
 function set_default_onion_domains {
@@ -3447,6 +3448,9 @@ function change_debian_repos {
3447 3448
     if grep -Fxq "change_debian_repos" $COMPLETION_FILE; then
3448 3449
         return
3449 3450
     fi
3451
+    if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
3452
+        return
3453
+    fi
3450 3454
     rm -rf /var/lib/apt/lists/*
3451 3455
     apt-get clean
3452 3456
     sed -i "s/ftp.us.debian.org/$DEBIAN_REPO/g" /etc/apt/sources.list
@@ -8407,7 +8411,7 @@ quit" > $INSTALL_DIR/batch.sql
8407 8411
     #echo "$config['db']['schemacheck'] = 'script';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
8408 8412
     #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
8409 8413
     #echo "$config['site']['profile'] = 'community';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
8410
-    
8414
+
8411 8415
     MICROBLOG_ONION_HOSTNAME=$(add_onion_service microblog 80 ${MICROBLOG_ONION_PORT})
8412 8416
 
8413 8417
     systemctl restart php5-fpm

+ 2
- 1
src/freedombone-image-customise Ver fichero

@@ -341,7 +341,8 @@ continue_installation() {
341 341
     if [ $CONFIG_FILENAME ]; then
342 342
         if [ ${#CONFIG_FILENAME} -gt 2 ]; then
343 343
             cp $CONFIG_FILENAME $rootdir/root/$PROJECT_NAME.cfg
344
-            chroot $rootdir $PROJECT_NAME -c /root/$PROJECT_NAME.cfg
344
+            cat $rootdir/root/$PROJECT_NAME.cfg
345
+            chroot "$rootdir" $PROJECT_NAME -c /root/$PROJECT_NAME.cfg
345 346
         fi
346 347
     fi
347 348
 }