Fixes

etc/iptables.ipv4-mini.nat

@@ -17,7 +17,6 @@
 -A INPUT -i usb0 -j ACCEPT
 -A INPUT -p icmp -m icmp --icmp-type 8 -j ACCEPT
 -A INPUT -p icmp -m icmp --icmp-type 0 -j ACCEPT
--A INPUT -p tcp -m tcp --dport 22 -j ACCEPT
 -A INPUT -p tcp -m tcp --dport 1194 -j ACCEPT
 -A INPUT -p udp -m udp --dport 1194 -j ACCEPT
 -A FORWARD -m state --state INVALID -j DROP

etc/iptables.ipv4.nat

@@ -17,7 +17,6 @@
 -A INPUT -i tun1 -j ACCEPT
 -A INPUT -p icmp -m icmp --icmp-type 8 -j ACCEPT
 -A INPUT -p icmp -m icmp --icmp-type 0 -j ACCEPT
--A INPUT -p tcp -m tcp --dport 22 -j ACCEPT
 -A INPUT -p tcp -m tcp --dport 1194 -j ACCEPT
 -A INPUT -p udp -m udp --dport 1194 -j ACCEPT
 -A FORWARD -m state --state INVALID -j DROP

etc/rc.local.mini

@@ -39,7 +39,7 @@ fi
 
 # Change the MAC address if needed
 # List all available network interfaces
-AVAILABLE_INTERFACES=$(ip -o link show | awk -F': ' '{print $2}' | sed "/^lo/d" | sed "/^wwan/d" | sed "/^wlan0/d"))
+AVAILABLE_INTERFACES=$(ip -o link show | awk -F': ' '{print $2}' | sed "/^lo/d" | sed "/^wwan/d" | sed "/^wlan0/d")
 for INTERFACE in $AVAILABLE_INTERFACES ; do
  if grep "^MAC_$INTERFACE=permanent" /home/torbox/torbox/run/torbox.run || grep "^MAC_$INTERFACE=random" /home/torbox/torbox/run/torbox.run ; then
  # NEW v.0.5.3: We have only to put an interface down, if it is not already down
@@ -77,7 +77,7 @@ for INTERFACE in $AVAILABLE_INTERFACES ; do
  fi
 done
 
-# NEW v.0.5.4: This should work without problem - has to be tested !!! 
+# NEW v.0.5.4: This should work without problem - has to be tested !!!
 # If the internal wlan chip was previously used then let's check if we can auto-connect to a wireless network
 if ip link | grep wlan0 ; then
  if grep "INTERNET_IFACE=wlan0" /home/torbox/torbox/run/torbox.run ; then

install/prepare_image.sh

@@ -161,21 +161,24 @@ done
 unset REPLY
 echo ""
 read -n 1 -s -r -p $'\e[1;31mPlease press any key to continue... \e[0m'
-clear
-echo -e "${YELLOW}The following additional network drivers are installed:${NOCOLOR}"
-dkms status
-echo
-echo -e "${RED}Does it look right?${NOCOLOR}"
-read -r -p $'\e[1;93mWould you like to re-install the aditional network drivers [y/N]? -> \e[0m'
-if [[ $REPLY =~ ^[YyNn]$ ]] ; then
- if [ "$REPLY" == "Y" ] || [ "$REPLY" == "y" ]; then
- sudo dkms remove --all
- sudo bash install_network_drivers
+# the additional network drivers are not installed on a TorBox mini installation
+if [ "$TORBOX_MINI" -eq "0" ]; then
+ clear
+ echo -e "${YELLOW}The following additional network drivers are installed:${NOCOLOR}"
+ dkms status
+ echo
+ echo -e "${RED}Does it look right?${NOCOLOR}"
+ read -r -p $'\e[1;93mWould you like to re-install the aditional network drivers [y/N]? -> \e[0m'
+ if [[ $REPLY =~ ^[YyNn]$ ]] ; then
+ if [ "$REPLY" == "Y" ] || [ "$REPLY" == "y" ]; then
+ sudo dkms remove --all
+ sudo bash install_network_drivers
+ fi
  fi
+ echo ""
+ read -n 1 -s -r -p $'\e[1;31mPlease press any key to continue... \e[0m'
+ unset REPLY
 fi
-echo ""
-read -n 1 -s -r -p $'\e[1;31mPlease press any key to continue... \e[0m'
-unset REPLY
 clear
 echo -e "${YELLOW}[!] PREPARATIONS FOR THE IMAGE${NOCOLOR}"
 echo

run/torbox.run

@@ -48,9 +48,9 @@ FRESH_INSTALLED=0
 
 # NEW v.0.5.4: Changed --> default has to be 1 for "torbox on a cloud" support
 # SSH access from the Internet
-# 0 - SSH access from the Internet is blocked
-# 1 - SSH access from the Internet is allowed (default)
-SSH_FROM_INTERNET=1
+# 0 - SSH access from the Internet is blocked (default)
+# 1 - SSH access from the Internet is allowed 
+SSH_FROM_INTERNET=0
 
 # NEW v.0.5.4: New added with default 1 for "torbox on a cloud" support
 # OPENVPN access from the Internet