Index: scripts/lockdown.sh
===================================================================
diff -u -r8d76f7e1a4da17d03d1a28e78716ab19a9615cfd -r8153639f3cd191aaf8b384e3b8aadde2d51da4ea
--- scripts/lockdown.sh	(.../lockdown.sh)	(revision 8d76f7e1a4da17d03d1a28e78716ab19a9615cfd)
+++ scripts/lockdown.sh	(.../lockdown.sh)	(revision 8153639f3cd191aaf8b384e3b8aadde2d51da4ea)
@@ -34,6 +34,7 @@
 denali ALL=(root) NOPASSWD: /bin/systemctl stop wpa_supplicant@*
 denali ALL=(root) NOPASSWD: /bin/systemctl restart wpa_supplicant@*
 denali ALL=(root) NOPASSWD: /bin/rm -f /etc/wpa_supplicant/wpa_supplicant-*
+denali ALL=(root) NOPASSWD: /bin/chmod 640 /etc/wpa_supplicant/wpa_supplicant-*
 denali ALL=(root) NOPASSWD: /sbin/ip link set *
 denali ALL=(root) NOPASSWD: /sbin/ip route show
 denali ALL=(root) NOPASSWD: /sbin/ip route del default
Index: scripts/setup.sh
===================================================================
diff -u -rff5794ee387f1e37a01cea349c0085dae5281d5d -r8153639f3cd191aaf8b384e3b8aadde2d51da4ea
--- scripts/setup.sh	(.../setup.sh)	(revision ff5794ee387f1e37a01cea349c0085dae5281d5d)
+++ scripts/setup.sh	(.../setup.sh)	(revision 8153639f3cd191aaf8b384e3b8aadde2d51da4ea)
@@ -109,17 +109,23 @@
   done
 }
 
-function diable_b2qt_services() {
-  echo "Disabling boot2Qt setvices"
-  systemctl disable b2qt
-  systemctl disable connman
-  systemctl disable qtlauncher
-  systemctl disable ebikedata
+function disable_service() {
+  echo "Disabling '$1' service"
+  systemctl stop    "$1"
+  systemctl disable "$1" 
+  if [ -z $(systemctl status | cat | grep "$1" | grep -v grep) ]; then
+    echo "'$1' service disabled"
+  else
+    echo "'$1' service not disabled!"
+  fi
+}
 
-  echo "Stop the boot2Qt setvices"
-  killall qtlauncher
-  killall datacollector
-  killall appcontroller
+function disable_unwanted_services() {
+  disable_service b2qt
+  disable_service connman
+  disable_service qtlauncher
+  disable_service ebikedata
+  disable_service rpcbind  
 }
 
 function setup_denali() {
@@ -156,11 +162,11 @@
 function executionMode() {
   if [ "$(grep $SETUP_ENABLE_MANUFACTURING_MODE $SETUP_CONF_FILE)" = "" ]; then
     # -U for Updating mode
-          # -a for disabling the non-minimizable Alarms
+    # -a for disabling the non-minimizable Alarms
     APPLICATION_PARAMS="-U -a"
   else
     # -E for Maunufacturing mode
-          # -a for disabling the non-minimizable Alarms
+    # -a for disabling the non-minimizable Alarms
     APPLICATION_PARAMS="-E -a"
   fi
   enableDRT
@@ -175,7 +181,7 @@
   format_sdcard
   set_timezone
   # set_datetime "$1" "$2"
-  diable_b2qt_services
+  disable_unwanted_services
   setup_denali
   enable_autostart
   executionMode
Index: scripts/wifi_generate_wpa_supplicant.sh
===================================================================
diff -u -r01b9447a564c79628976078d442b8fa198adec97 -r8153639f3cd191aaf8b384e3b8aadde2d51da4ea
--- scripts/wifi_generate_wpa_supplicant.sh	(.../wifi_generate_wpa_supplicant.sh)	(revision 01b9447a564c79628976078d442b8fa198adec97)
+++ scripts/wifi_generate_wpa_supplicant.sh	(.../wifi_generate_wpa_supplicant.sh)	(revision 8153639f3cd191aaf8b384e3b8aadde2d51da4ea)
@@ -17,13 +17,13 @@
 
 if [ $# -eq 0 ]; then
     currentFile=$(basename "$0")
-    echo "Usage: ./$currentFile <ssid> <password> <dst_file.conf> <security_type>"
+    echo "Usage: ./$currentFile <ssid> <password> <iface> <security_type>"
     exit 0
 fi
 
 ssid=$1
 password=$2
-dest=$3
+dest=/etc/wpa_supplicant/wpa_supplicant-"$3".conf
 securityType=$4
 psk=$(sudo wpa_passphrase "$ssid" "$password" | grep "psk=" | grep -v "#psk" | sed -nr 's/.*psk=(.*)/\1/p')
 case $securityType in 
@@ -55,3 +55,6 @@
 }" | sudo tee $dest > /dev/null;;
 
 esac
+
+sudo chmod 640 $dest
+