diff options
| author | Florian Didron <fdidron@users.noreply.github.com> | 2021-09-01 13:22:49 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-01 13:22:49 +0900 |
| commit | 1af87917b23c49f540f114b90f8a012e44622ce6 (patch) | |
| tree | b05b036aa39cbc80f6a8111788823995ff4695a1 | |
| parent | fdd23b8e6e23eb848596eeaeb452433a236868dd (diff) | |
| parent | f512ffc4374435ccbb12b53693083405784138b9 (diff) | |
Merge pull request #113 from lunaryorn/modernize-udev-rules
Modernize udev rules
| -rw-r--r-- | dist/linux64/50-oryx.rules | 6 | ||||
| -rw-r--r-- | dist/linux64/50-wally.rules | 8 | ||||
| -rwxr-xr-x | install.linux.sh | 17 |
3 files changed, 9 insertions, 22 deletions
diff --git a/dist/linux64/50-oryx.rules b/dist/linux64/50-oryx.rules index 36367d4..d1f641e 100644 --- a/dist/linux64/50-oryx.rules +++ b/dist/linux64/50-oryx.rules @@ -1,6 +1,6 @@ # Rule for the Moonlander -SUBSYSTEM=="usb", ATTR{idVendor}=="3297", ATTR{idProduct}=="1969", TAG+="uaccess", TAG+="udev-acl" +SUBSYSTEM=="usb", ATTR{idVendor}=="3297", ATTR{idProduct}=="1969", TAG+="uaccess" # Rule for the Ergodox EZ Original / Shine / Glow -SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="1307", TAG+="uaccess", TAG+="udev-acl" +SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="1307", TAG+="uaccess" # Rule for the Planck EZ Standard / Glow -SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="6060", TAG+="uaccess", TAG+="udev-acl" +SUBSYSTEM=="usb", ATTR{idVendor}=="feed", ATTR{idProduct}=="6060", TAG+="uaccess" diff --git a/dist/linux64/50-wally.rules b/dist/linux64/50-wally.rules index bcbd6a2..1353099 100644 --- a/dist/linux64/50-wally.rules +++ b/dist/linux64/50-wally.rules @@ -1,10 +1,8 @@ # Teensy rules for the Ergodox EZ Original / Shine / Glow ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666" -KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", TAG+="uaccess" +KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", TAG+="uaccess" # STM32 rules for the Moonlander and Planck EZ Standard / Glow -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", \ - MODE:="0666", \ - SYMLINK+="stm32_dfu" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", TAG+="uaccess", SYMLINK+="stm32_dfu" diff --git a/install.linux.sh b/install.linux.sh index 5ae646f..c0984a9 100755 --- a/install.linux.sh +++ b/install.linux.sh @@ -35,20 +35,9 @@ for key in ${!packageAA[@]}; do which $key && sudo $key install -y ${packageAA[$key]} done -# WALLY UDEV RULE FOR DEVICE RELATED EVENT -cat <<EOF | sudo tee /etc/udev/rules.d/50-wally.rules -# Teensy rules for the Ergodox EZ -ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" -ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666" -KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666" -# STM32 rules for the Moonlander and Planck EZ -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu" -EOF - -# ADD USER TO PLUGDEV GROUP -sudo groupadd plugdev -sudo usermod -aG plugdev $USER +# UDEV RULES +install -m644 -t /etc/udev/rules.d/ \ + dist/linux64/50-oryx.rules dist/linux64/50-wally.rules # HARDWARE PLATFORM DEPENDENT WALLY if [[ "$(uname -i)" =~ 'x86' ]]; then |