mv wifi AP test

CentipedeRTK · Jan 25, 2021 · 898b8b9 · 898b8b9
1 parent 0ff123e
commit 898b8b9
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 27 deletions.
diff --git a/stage4/00-cloud-init/01-run.sh b/stage4/00-cloud-init/01-run.sh
@@ -3,7 +3,7 @@
 install -m 644 files/user-data ${ROOTFS_DIR}/boot/
 install -m 644 files/meta-data ${ROOTFS_DIR}/boot/
 install -m 644 files/cloud/cloud.cfg ${ROOTFS_DIR}/etc/cloud/
-#install -m 644 files/wpa_supplicant.conf ${ROOTFS_DIR}/boot/
+install -m 644 files/wpa_supplicant.conf ${ROOTFS_DIR}/boot/
 
 on_chroot << EOF
 echo 'Get cloud-init'

diff --git a/stage4/00-cloud-init/files/user-data b/stage4/00-cloud-init/files/user-data
@@ -18,14 +18,4 @@ runcmd:
   - rfkill unblock all
   - cd /home/basegnss && ./first_boot.sh && rm ./first_boot.sh && systemctl start str2str_tcp
 
-bootcmd:
-  - pyaccesspoint -i eth0 -ip 192.168.45.1 -s BaseGNSS -p 12345678 start
-  - while [ ! -f /var/lib/cloud/instance/boot-finished ]; do pyaccesspoint stop;  pyaccesspoint -i eth0 -ip 192.168.45.1 -s BaseGNSS -p 12345678 start; done;
-
 final_message: "BaseGNSS OK"
-
-power_state:
-  mode: reboot
-  message: I'll be back !!!
-  timeout: 20
-  condition: True
diff --git a/stage4/00-cloud-init/files/user-data_temp b/stage4/00-cloud-init/files/user-data_temp
@@ -19,8 +19,8 @@ runcmd:
   - cd /home/basegnss && ./first_boot.sh && rm ./first_boot.sh && systemctl start str2str_tcp
 
 bootcmd:
-  - pyaccesspoint -ip 192.168.45.1 -s BaseGNSS -p 12345678 start
-  - wpa_supplicant -B -Dnl80211,wext -c/etc/wpa_supplicant/wpa_supplicant.conf -iwlan0
+  - pyaccesspoint -i eth0 -ip 192.168.45.1 -s BaseGNSS -p 12345678 start
+  - while [ ! -f /var/lib/cloud/instance/boot-finished ]; do pyaccesspoint stop;  pyaccesspoint -i eth0 -ip 192.168.45.1 -s BaseGNSS -p 12345678 start; done;
 
 final_message: "BaseGNSS OK"
 

diff --git a/stage4/00-cloud-init/files/wpa_supplicant.conf b/stage4/00-cloud-init/files/wpa_supplicant.conf
@@ -3,8 +3,8 @@ update_config=1
 country=FR
 
 network={
-    ssid="GeoPoppy_Pi3"
-    psk="geopoppy"
+    ssid="my_wifi"
+    psk="*******"
     key_mgmt=WPA-PSK
 }
 
diff --git a/stage4/01-wifi/00-packages b/stage4/01-wifi/00-packages
diff --git a/stage4/01-wifi/01-run.sh b/stage4/01-wifi/01-run.sh