wpa_supplicant has now scan_ssid=1 by default

JakubSvestka · Sep 24, 2014 · 5d00272 · 5d00272
1 parent ceb5b5d
commit 5d00272
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/board/raspberrypi/skeleton/etc/init.d/S35wifi b/board/raspberrypi/skeleton/etc/init.d/S35wifi
@@ -17,7 +17,7 @@ if ! [ -f $conf ] || ! [ -s $conf ]; then
     exit 0
 fi
 
-SSID=$(cat ${conf} | grep ssid | cut -d '"' -f 2)
+SSID=$(cat ${conf} | grep ssid | grep -v scan_ssid | cut -d '"' -f 2)
 
 if [ -z "$SSID" ]; then
     exit 0

diff --git a/board/raspberrypi/skeleton/etc/wpa_supplicant.conf b/board/raspberrypi/skeleton/etc/wpa_supplicant.conf
@@ -2,5 +2,5 @@ update_config=1
 ctrl_interface=/var/run/wpa_supplicant
 
 network={
+    scan_ssid=1
 }
-
diff --git a/board/raspberrypi/writeimage.sh b/board/raspberrypi/writeimage.sh
@@ -149,6 +149,7 @@ if [ -n "$SSID" ]; then
     echo "update_config=1" > $conf
     echo "ctrl_interface=/var/run/wpa_supplicant" >> $conf
     echo "network={" >> $conf
+    echo "    scan_ssid=1" >> $conf
     echo "    ssid=\"$SSID\"" >> $conf
     if [ -n "$PSK" ]; then
         echo "    psk=\"$PSK\"" >> $conf

diff --git a/package/motioneye/motioneye.mk b/package/motioneye/motioneye.mk
@@ -23,6 +23,7 @@ define MOTIONEYE_INSTALL_TARGET_CMDS
     mv $(DST_DIR)/settings_default.py $(DST_DIR)/settings.py
     sed -i "s%os.path.abspath(os.path.join(PROJECT_PATH, 'conf'))%'/data/etc'%" $(DST_DIR)/settings.py
     sed -i "s%os.path.abspath(os.path.join(PROJECT_PATH, 'run'))%'/tmp'%" $(DST_DIR)/settings.py
+    sed -i "s%os.path.abspath(os.path.join(PROJECT_PATH, 'log'))%'/var/log'%" $(DST_DIR)/settings.py
     sed -i "s%os.path.abspath(os.path.join(PROJECT_PATH, 'media'))%'/data/output'%" $(DST_DIR)/settings.py
     sed -i "s%REPO = ('ccrisan', 'motioneye')%REPO = ('ccrisan', 'motionPie')%" $(DST_DIR)/settings.py
     #sed -i "s%LOG_LEVEL = logging.INFO%LOG_LEVEL = logging.DEBUG%" $(DST_DIR)/settings.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ if ! [ -f $conf ] || ! [ -s $conf ]; then @@
         exit 0
     fi
-    SSID=$(cat ${conf} | grep ssid | cut -d '"' -f 2)
+    SSID=$(cat ${conf} | grep ssid | grep -v scan_ssid | cut -d '"' -f 2)
     if [ -z "$SSID" ]; then
         exit 0
@@ Expand Down @@