pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] point_of_sale: Select the NetworkManager or directly wpa_supplicant

Browse Source 
Above IOT Image 23.09, the Debian "bookworm" distribution is used. This
distribution uses the NetworkManager configuration tool suite to setup
the network. This break the code used until 23.09 included.
In this PR, the code check the Image version and switch to NetworkManager
if necessary.

Before: Conflict with wpa_supplicant management in Debian "bookworm"

Now: The network management tool is choosen in relation to image version

mool

closes odoo/odoo#150560

X-original-commit: 8f96e05c851a748c93caa7577e9af87f724adad1
Signed-off-by: Quentin Lejeune (qle) <qle@odoo.com>
This commit is contained in:
Olivier Monnom (mool)
2024-01-23 07:07:54 +00:00
committed by lejeune quentin
parent c096cccb4d
commit d5822a1f72
3 changed files with 86 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/tools/posbox/configuration/connect_to_server_wifi.sh
+42 -23
View File
@@ -58,14 +58,14 @@ function connect () {
# make network choice persistent
if [ -n "${ESSID}" ] ; then
if [ -n "${PERSIST}" ] ; then
logger -t posbox_connect_to_wifi "Making network selection permanent"
logger -t posbox_connect_to_server_wifi "Making network selection permanent"
sudo mount -o remount,rw /
echo "${ESSID}" > ${PERSISTENT_WIFI_NETWORK_FILE}
echo "${PASSWORD}" >> ${PERSISTENT_WIFI_NETWORK_FILE}
sudo mount -o remount,ro /
fi
else
logger -t posbox_connect_to_wifi "Reading configuration from ${PERSISTENT_WIFI_NETWORK_FILE}"
logger -t posbox_connect_to_server_wifi "Reading configuration from ${PERSISTENT_WIFI_NETWORK_FILE}"
ESSID=$(head -n 1 "${PERSISTENT_WIFI_NETWORK_FILE}" | tr -d '\n')
PASSWORD=$(tail -n 1 "${PERSISTENT_WIFI_NETWORK_FILE}" | tr -d '\n')
fi
@@ -73,29 +73,48 @@ function connect () {
echo "${ESSID}" > ${CURRENT_WIFI_NETWORK_FILE}
echo "${PASSWORD}" >> ${CURRENT_WIFI_NETWORK_FILE}
logger -t posbox_connect_to_wifi "Connecting to ${ESSID}"
logger -t posbox_connect_to_server_wifi "Connecting to ${ESSID}"
sudo service hostapd stop
sudo killall nginx
sudo service nginx restart
sudo service dnsmasq stop
sudo pkill wpa_supplicant
sudo ifconfig wlan0 down
sudo ifconfig wlan0 0.0.0.0 # this is how you clear the interface's configuration
sudo ifconfig wlan0 up
if [ -z "${PASSWORD}" ] ; then
sudo iwconfig wlan0 essid "${ESSID}"
current_iotbox_version=$(cat "/var/odoo/iotbox_version")
# Above this version we need the NetworkManager
required_version="23.09"
if [[ "$current_iotbox_version" > "$required_version" ]]; then
logger -t posbox_connect_to_server_wifi "USING NETWORK MANAGER"
# Necessary when comming from the access point
sudo ip address del 10.11.12.1/24 dev wlan0
sudo nmcli g reload
if [ -z "${PASSWORD}" ] ; then
sudo nmcli d wifi connect "${ESSID}"
else
sudo nmcli d wifi connect "${ESSID}" password "${PASSWORD}"
fi
sudo service nginx restart
else
# Necessary in stretch: https://www.raspberrypi.org/forums/viewtopic.php?t=196927
sudo cp /etc/wpa_supplicant/wpa_supplicant.conf "${WPA_PASS_FILE}"
sudo chmod 777 "${WPA_PASS_FILE}"
sudo wpa_passphrase "${ESSID}" "${PASSWORD}" >> "${WPA_PASS_FILE}"
sudo wpa_supplicant -B -i wlan0 -c "${WPA_PASS_FILE}"
fi
logger -t posbox_connect_to_server_wifi "USING WPA_SUPPLICANT"
sudo service nginx restart
sudo service dnsmasq stop
sudo systemctl daemon-reload
sudo service dhcpcd restart
sudo pkill wpa_supplicant
sudo ifconfig wlan0 down
sudo ifconfig wlan0 0.0.0.0 # this is how you clear the interface's configuration
sudo ifconfig wlan0 up
if [ -z "${PASSWORD}" ] ; then
sudo iwconfig wlan0 essid "${ESSID}"
else
# Necessary in stretch: https://www.raspberrypi.org/forums/viewtopic.php?t=196927
sudo cp /etc/wpa_supplicant/wpa_supplicant.conf "${WPA_PASS_FILE}"
sudo chmod 777 "${WPA_PASS_FILE}"
sudo wpa_passphrase "${ESSID}" "${PASSWORD}" >> "${WPA_PASS_FILE}"
sudo wpa_supplicant -B -i wlan0 -c "${WPA_PASS_FILE}"
fi
sudo systemctl daemon-reload
sudo service dhcpcd restart
fi
# give dhcp some time
timeout 30 sh -c 'until ifconfig wlan0 | grep "inet " ; do sleep 0.1 ; done'
@@ -103,7 +122,7 @@ function connect () {
if [ ${TIMEOUT_RETURN} -eq 124 ] && [ -z "${NO_AP}" ] ; then
logger -t posbox_connect_to_wifi "Failed to connect, forcing Posbox AP"
logger -t posbox_connect_to_server_wifi "Failed to connect, forcing Posbox AP"
sudo /home/pi/odoo/addons/point_of_sale/tools/posbox/configuration/wireless_ap.sh "force" &
else
if [ ${TIMEOUT_RETURN} -ne 124 ] ; then
@@ -111,14 +130,14 @@ function connect () {
fi
if [ ! -f "${LOST_WIFI_FILE}" ] ; then
logger -t posbox_connect_to_wifi "Restarting odoo"
logger -t posbox_connect_to_server_wifi "Restarting odoo"
fi
if [ ${WIFI_WAS_LOST} -eq 0 ] ; then
touch "${LOST_WIFI_FILE}"
fi
logger -t posbox_connect_to_wifi "Starting wifi keep alive script"
logger -t posbox_connect_to_server_wifi "Starting wifi keep alive script"
/home/pi/odoo/addons/point_of_sale/tools/posbox/configuration/keep_wifi_alive.sh &
fi
addons/point_of_sale/tools/posbox/configuration/connect_to_wifi.sh
+36 -17
View File
@@ -38,27 +38,46 @@ function connect () {
logger -t posbox_connect_to_wifi "Connecting to ${ESSID}"
sudo service hostapd stop
sudo killall nginx
sudo service nginx restart
sudo service dnsmasq stop
sudo pkill wpa_supplicant
sudo ifconfig wlan0 down
sudo ifconfig wlan0 0.0.0.0 # this is how you clear the interface's configuration
sudo ifconfig wlan0 up
if [ -z "${PASSWORD}" ] ; then
sudo iwconfig wlan0 essid "${ESSID}"
current_iotbox_version=$(cat "/var/odoo/iotbox_version")
# Above this version we need the NetworkManager
required_version="23.09"
if [[ "$current_iotbox_version" > "$required_version" ]]; then
logger -t posbox_connect_to_wifi "USING NETWORK MANAGER"
# Necessary when comming from the access point
sudo ip address del 10.11.12.1/24 dev wlan0
sudo nmcli g reload
if [ -z "${PASSWORD}" ] ; then
sudo nmcli d wifi connect "${ESSID}"
else
sudo nmcli d wifi connect "${ESSID}" password "${PASSWORD}"
fi
sudo service nginx restart
else
# Necessary in stretch: https://www.raspberrypi.org/forums/viewtopic.php?t=196927
sudo cp /etc/wpa_supplicant/wpa_supplicant.conf "${WPA_PASS_FILE}"
sudo chmod 777 "${WPA_PASS_FILE}"
sudo wpa_passphrase "${ESSID}" "${PASSWORD}" >> "${WPA_PASS_FILE}"
sudo wpa_supplicant -B -i wlan0 -c "${WPA_PASS_FILE}"
fi
logger -t posbox_connect_to_wifi "USING WPA_SUPPLICANT"
sudo service nginx restart
sudo service dnsmasq stop
sudo systemctl daemon-reload
sudo service dhcpcd restart
sudo pkill wpa_supplicant
sudo ifconfig wlan0 down
sudo ifconfig wlan0 0.0.0.0 # this is how you clear the interface's configuration
sudo ifconfig wlan0 up
if [ -z "${PASSWORD}" ] ; then
sudo iwconfig wlan0 essid "${ESSID}"
else
# Necessary in stretch: https://www.raspberrypi.org/forums/viewtopic.php?t=196927
sudo cp /etc/wpa_supplicant/wpa_supplicant.conf "${WPA_PASS_FILE}"
sudo chmod 777 "${WPA_PASS_FILE}"
sudo wpa_passphrase "${ESSID}" "${PASSWORD}" >> "${WPA_PASS_FILE}"
sudo wpa_supplicant -B -i wlan0 -c "${WPA_PASS_FILE}"
fi
sudo systemctl daemon-reload
sudo service dhcpcd restart
fi
# give dhcp some time
timeout 30 sh -c 'until ifconfig wlan0 | grep "inet " ; do sleep 0.1 ; done'
addons/point_of_sale/tools/posbox/configuration/wireless_ap.sh
+8
View File
@@ -10,6 +10,14 @@ if ! [ -f "${WIFI_NETWORK_FILE}" ] && [ -z "${FORCE_HOST_AP}" ] ; then
while [ "$(hostname -I)" = '' ] && [ "$COUNTER" -le 10 ]; do sleep 2;((COUNTER++)); done
fi
# Do we have to use the NetworkManager ?
current_iotbox_version=$(cat "/var/odoo/iotbox_version")
required_version="23.11"
if [[ "$current_iotbox_version" < "$required_version" ]]; then
logger -t wireless_ap "USING WPA_SUPPLICANT REMOVING NETWORK MANAGER SERVICE"
sudo service NetworkManager stop
fi
WIRED_IP=$(hostname -I)
if [ "$WIRED_IP" ]; then