Rework wlan blocking
This commit is contained in:
parent
b91ab524b0
commit
e86b901e25
@ -3,18 +3,25 @@
|
|||||||
install -v -d "${ROOTFS_DIR}/etc/wpa_supplicant"
|
install -v -d "${ROOTFS_DIR}/etc/wpa_supplicant"
|
||||||
install -v -m 600 files/wpa_supplicant.conf "${ROOTFS_DIR}/etc/wpa_supplicant/"
|
install -v -m 600 files/wpa_supplicant.conf "${ROOTFS_DIR}/etc/wpa_supplicant/"
|
||||||
|
|
||||||
|
# Newer versions of raspberrypi-sys-mods set rfkill.default_state=0 to prevent
|
||||||
|
# radiating on 5GHz bands until the WLAN regulatory domain is set.
|
||||||
|
# Unfortunately, this also blocks bluetooth, so we whitelist the known
|
||||||
|
# on-board BT adapters here.
|
||||||
|
|
||||||
|
mkdir -p "${ROOTFS_DIR}/var/lib/systemd/rfkill/"
|
||||||
|
# 5 miniuart 4 miniuart Zero miniuart other other
|
||||||
|
for addr in 107d50c000.serial 3f215040.serial 20215040.serial fe215040.serial soc; do
|
||||||
|
echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-${addr}:bluetooth"
|
||||||
|
done
|
||||||
|
|
||||||
if [ -v WPA_COUNTRY ]; then
|
if [ -v WPA_COUNTRY ]; then
|
||||||
on_chroot <<- EOF
|
on_chroot <<- EOF
|
||||||
SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_wifi_country "${WPA_COUNTRY}"
|
SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_wifi_country "${WPA_COUNTRY}"
|
||||||
EOF
|
EOF
|
||||||
fi
|
elif [ -d "${ROOTFS_DIR}/var/lib/NetworkManager" ]; then
|
||||||
|
# NetworkManager unblocks all WLAN devices by default. Prevent that:
|
||||||
# Disable wifi on 5GHz models if WPA_COUNTRY is not set
|
cat > "${ROOTFS_DIR}/var/lib/NetworkManager/NetworkManager.state" <<- EOF
|
||||||
mkdir -p "${ROOTFS_DIR}/var/lib/systemd/rfkill/"
|
[main]
|
||||||
if [ -n "$WPA_COUNTRY" ]; then
|
WirelessEnabled=false
|
||||||
echo 0 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-3f300000.mmcnr:wlan"
|
EOF
|
||||||
echo 0 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-fe300000.mmcnr:wlan"
|
|
||||||
else
|
|
||||||
echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-3f300000.mmcnr:wlan"
|
|
||||||
echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-fe300000.mmcnr:wlan"
|
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user