Reparenting pn-sfe-integration.

.vscode/tasks.json

@@ -1,6 +1,4 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
     "version": "2.0.0",
     "tasks": [{
         "label": "Copy to target",

.vscode/vsbuild.sh

@@ -3,42 +3,70 @@
 ## Compile sync-settings and install if no errors.
 ##
 TARGET=$1
+PORT=22
+
+GREEN=$'\e[0;32m'
+NC=$'\e[0m'
 
 # Break target down by commas into an array.
 TARGET_ADDRESSES=()
 while IFS=',' read -ra ADDRESSES; do
-    for address in "${ADDRESSES[@]}"; do
-        TARGET_ADDRESSES+=($address)
-    done
-done <<< "$TARGET"
+	for address in "${ADDRESSES[@]}"; do
+		TARGET_ADDRESSES+=("$address")
+	done
+done <<<"$TARGET"
 
 for target_address in "${TARGET_ADDRESSES[@]}"; do
-    echo "Copying to $target_address..."
-    ssh-copy-id root@$target_address
-
-    rsync=$(ssh root@$target_address "which rsync")
-    if [ "$rsync" = "" ] ; then
-        ssh root@$target_address "opkg update; opkg install rsync"
-    fi
-
-    rsync -r -a -v --chown=root:root wan-manager/files/* root@$target_address:/usr/bin
-    rsync -r -a -v --chown=root:root credentials/files/credentials.json root@$target_address:/etc/config/credentials.json
-    # rsync -r -a -v --chown=root:root pyconnector/files/* root@$target_address:/usr/bin
-    # rsync -r -a -v --chown=root:root strongswan-full/files/override.ipsec.init root@$target_address:/etc/init.d/ipsec
-    # rsync -r -a -v --chown=root:root pyconnector/files/pyconnector root@$target_address:/usr/bin/pyconnector
-    # rsync -r -a -v --chown=root:root pyconnector/files/pyconnector.init root@$target_address:/etc/init.d/pyconnector
-    rsync -r -a -v --chown=root:root sync-settings/files/speedtest.sh root@$target_address:/usr/bin/speedtest.sh
-    # rsync -r -a -v --chown=root:root speedtest-cli-dbg root@$target_address:/root/speedtest-cli-dbg
-
-    # Tests
-    target_sync_path=$(ssh root@$target_address "find /usr -name tests | grep '\(site-packages\|dist-packages\)/tests' | head -1")
-    if [ "$target_sync_path" != "" ] ; then
-        rsync -r -a -v runtests/files/usr/lib/python/tests/* root@$target_address:$target_sync_path
-    fi
-
-    # Restd 
-    target_sync_path=$(ssh root@$target_address "find /usr -name restd | grep '\(site-packages\|dist-packages\)/restd' | head -1")
-    if [ "$target_sync_path" != "" ] ; then
-        rsync -r -a -v restd/files/usr/lib/python/restd/* root@$target_address:$target_sync_path
-    fi
+
+	echo "${GREEN}Copying to $target_address ...${NC}"
+
+	ssh-copy-id root@"$target_address"
+
+	isEos=true
+	if ! ssh -p "$PORT" root@"$target_address" "ls /etc/Eos-release"; then
+		isEos=false
+		echo "${GREEN}Bare MFW found${NC}"
+	else
+		echo "${GREEN}MFW in EOS found${NC}"
+	fi
+
+	target_sync_path=""
+	mfw_dir=""
+	if [ "$isEos" != true ]; then
+		# bare MFW target
+		rsync=$(ssh -p "$PORT" root@"$target_address" "which rsync")
+		if [ "$rsync" = "" ]; then
+			ssh -p "$PORT" root@"$target_address" "opkg update; opkg install rsync"
+		fi
+
+		target_sync_path="/usr/bin"
+	else
+		target_sync_path="/mfw/usr/bin"
+		mfw_dir="/mfw"
+	fi
+
+	echo "${GREEN}Copying to $target_sync_path... ${NC}"
+
+	rsync -r -a -v --chown=root:root wan-manager/files/* root@"$target_address":"$target_sync_path"
+	rsync -r -a -v --chown=root:root credentials/files/credentials.json root@"$target_address":"$mfw_dir"/etc/config/credentials.json
+	# rsync -r -a -v --chown=root:root pyconnector/files/* root@$target_address:/usr/bin
+	# rsync -r -a -v --chown=root:root strongswan-full/files/override.ipsec.init root@$target_address:/etc/init.d/ipsec
+	# rsync -r -a -v --chown=root:root pyconnector/files/pyconnector root@$target_address:/usr/bin/pyconnector
+	# rsync -r -a -v --chown=root:root pyconnector/files/pyconnector.init root@$target_address:/etc/init.d/pyconnector
+	rsync -r -a -v --chown=root:root sync-settings/files/speedtest.sh root@"$target_address":"$target_sync_path"/speedtest.sh
+	# rsync -r -a -v --chown=root:root speedtest-cli-dbg root@$target_address:/root/speedtest-cli-dbg
+
+	# Tests
+	target_site_packages=$(ssh root@"$target_address" "find $mfw_dir/usr -name tests | grep '\(site-packages\|dist-packages\)/tests' | head -1")
+	if [ "$target_site_packages" != "" ]; then
+		echo "${GREEN}Copying to $target_site_packages... ${NC}"
+		rsync -r -a -v runtests/files/usr/lib/python/tests/* root@"$target_address":$target_site_packages
+	fi
+
+	# Restd
+	target_site_packages=$(ssh root@"$target_address" "find $mfw_dir/usr -name restd | grep '\(site-packages\|dist-packages\)/restd' | head -1")
+	if [ "$target_site_packages" != "" ]; then
+		echo "${GREEN}Copying to $target_site_packages... ${NC}"
+		rsync -r -a -v restd/files/usr/lib/python/restd/* root@"$target_address":"$target_site_packages"
+	fi
 done

backup-scripts/files/upload-backup.sh

@@ -31,8 +31,17 @@ function createBackup() {
   debug "Backing up settings to gunzipped tar archive file"
   TEMP_DIR=`mktemp -d -t ut-backup.XXXXXXX`
   TEMP_DIR_NAME=$(basename $TEMP_DIR)
+  CP_DIR="/etc/config/captive_portal"
 
   cp /etc/config/settings.json $TEMP_DIR
+# TODO: Directory check is added for cases where upgrade from older builds 
+# to newer may not have the directory present. This check should probably 
+# be removed in future builds.
+  if [ -d "$CP_DIR" ] ; then
+    cp $CP_DIR/* $TEMP_DIR
+    rm -f $TEMP_DIR/captive_portal_settings
+  fi
+
   tar -C /tmp -zcf $BACKUP_FILE $TEMP_DIR_NAME
   rm -r $TEMP_DIR
 }

bctid/Makefile

@@ -34,6 +34,10 @@ endef
 TMP_BUILD_DIR:=$(PKG_BUILD_DIR)/tmp/
 
 define Package/bctid/install
+	# Copy bctid categories file
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_BIN) files/categories.json $(1)/etc/config/categories.json
+
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/bctid $(1)/usr/share/bctid
 	$(INSTALL_BIN) $(TMP_BUILD_DIR)/src/bin/bctid $(1)/usr/bin/
 	$(CP) $(TMP_BUILD_DIR)/src/bin/bcti.cfg $(1)/usr/share/bctid/