Skip to content

Support wpa_supplicant.conf.txt, convert DOS line endings to UNIX to keep wpa_supplicant happy #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Support wpa_supplicant.conf.txt, convert DOS line endings to UNIX to keep wpa_supplicant happy #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d8098cc
Update raspberrypi-net-mods.service
Sep 18, 2020
18317d9
Update raspberrypi-net-mods.service
Sep 19, 2020
6b261f2
Move shell script to separate file
andrum993 Sep 21, 2020
9cae22f
take 2
andrum993 Sep 21, 2020
5c7130c
Add dos2unix line ending conversion, force file to 7-bit ASCII
andrum993 Sep 21, 2020
3ceff7c
Fixup install file
andrum993 Sep 21, 2020
5c36469
fix typo in unit file
andrum993 Sep 21, 2020
cffe58e
Fix script permissions
andrum993 Sep 21, 2020
219696d
temp
andrum993 Sep 22, 2020
e18dfe6
temp
andrum993 Sep 22, 2020
4adc786
Handle wpa_supplicant.conf.txt, force line endings to UNIX
andrum993 Sep 22, 2020
fb03bd4
Merge branch 'patch-1' of https://github.com/andrum99/raspberrypi-net…
andrum993 Sep 22, 2020
745ade5
fix typo
andrum993 Sep 22, 2020
2480b5d
Add back globbing removed in error by squash
andrum993 Sep 22, 2020
11af9ea
take 2
andrum993 Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Standards-Version: 4.3.0

Package: raspberrypi-net-mods
Architecture: all
Depends: ${misc:Depends}, dhcpcd5 (>= 6.10.1-1+rpi2)
Depends: ${misc:Depends}, dhcpcd5 (>= 6.10.1-1+rpi2), dos2unix
Description: Network configuration for the Raspberry Pi UI
1 change: 1 addition & 0 deletions debian/raspberrypi-net-mods.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
etc
usr
4 changes: 2 additions & 2 deletions debian/raspberrypi-net-mods.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[Unit]
Description=Copy user wpa_supplicant.conf
ConditionPathExists=/boot/wpa_supplicant.conf
ConditionPathExistsGlob=/boot/wpa_supplicant.conf{,.txt}
Before=dhcpcd.service
After=systemd-rfkill.service

[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/mv /boot/wpa_supplicant.conf /etc/wpa_supplicant/wpa_supplicant.conf
ExecStart=/usr/lib/raspberrypi-net-mods/mv-wpa.sh
ExecStartPost=/bin/chmod 600 /etc/wpa_supplicant/wpa_supplicant.conf
ExecStartPost=/usr/sbin/rfkill unblock wifi

Expand Down
10 changes: 10 additions & 0 deletions usr/lib/raspberrypi-net-mods/mv-wpa.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh
if [ -f "/boot/wpa_supplicant.conf" ]; then
/bin/mv /boot/wpa_supplicant.conf /etc/wpa_supplicant/wpa_supplicant.conf
if [ -f "/boot/wpa_supplicant.conf.txt" ]; then
/bin/rm /boot/wpa_supplicant.conf.txt
fi
elif [ -f "/boot/wpa_supplicant.conf.txt" ]; then
/bin/mv /boot/wpa_supplicant.conf.txt /etc/wpa_supplicant/wpa_supplicant.conf
fi
dos2unix /etc/wpa_supplicant/wpa_supplicant.conf