diff --git a/stage4/00-cloud-init/01-run.sh b/stage4/00-cloud-init/01-run.sh index c82c6fbe5c..ee1f014e22 100755 --- 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 index b98b997a9a..5e8a30e6c9 100644 --- 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 index 884a183a2b..b98b997a9a 100644 --- 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 index 5a74e75ffd..4313a68808 100644 --- 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 deleted file mode 100644 index 39f646e685..0000000000 --- a/stage4/01-wifi/00-packages +++ /dev/null @@ -1,4 +0,0 @@ -python3-dev -python3-pip -dnsmasq -hostapd diff --git a/stage4/01-wifi/01-run.sh b/stage4/01-wifi/01-run.sh deleted file mode 100755 index dce9aa5798..0000000000 --- a/stage4/01-wifi/01-run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e - -#https://pypi.org/project/PyAccessPoint/ - -on_chroot << EOF -pip3 install wireless netifaces psutil packaging pyaccesspoint - -EOF