Skip to content

Commit

Permalink
Fix wifi connection setup at boot
Browse files Browse the repository at this point in the history
There seems to be a conflict between IWD and networkd when they both try
to manage the wireless interface.
This commit improves the configuration to better define their respective
roles.
  • Loading branch information
Mercotui committed Sep 25, 2022
1 parent 1d5bfe1 commit 5693077
Show file tree
Hide file tree
Showing 5 changed files with 134 additions and 15 deletions.
131 changes: 119 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@

# Created by https://www.toptal.com/developers/gitignore/api/c++,qt,cmake
# Edit at https://www.toptal.com/developers/gitignore?templates=c++,qt,cmake

### project specific ###

distro/buildroot
build/

# Created by https://www.toptal.com/developers/gitignore/api/qt,c++,cmake,clion
# Edit at https://www.toptal.com/developers/gitignore?templates=qt,c++,cmake,clion

### C++ ###
# Prerequisites
*.d
Expand All @@ -21,12 +20,6 @@ build/
*.gch
*.pch

# Linker files
*.ilk

# Debugger Files
*.pdb

# Compiled Dynamic libraries
*.so
*.dylib
Expand All @@ -47,6 +40,119 @@ build/
*.out
*.app

### CLion ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### CLion Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr

# Sonarlint plugin
# https://plugins.jetbrains.com/plugin/7973-sonarlint
.idea/**/sonarlint/

# SonarQube Plugin
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
.idea/**/sonarIssues.xml

# Markdown Navigator plugin
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
.idea/**/markdown-navigator.xml
.idea/**/markdown-navigator-enh.xml
.idea/**/markdown-navigator/

# Cache file creation bug
# See https://youtrack.jetbrains.com/issue/JBR-2257
.idea/$CACHE_FILE$

# CodeStream plugin
# https://plugins.jetbrains.com/plugin/12206-codestream
.idea/codestream.xml

# Azure Toolkit for IntelliJ plugin
# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
.idea/**/azureSettings.xml

### CMake ###
CMakeLists.txt.user
CMakeCache.txt
Expand All @@ -59,7 +165,6 @@ install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps
CMakeUserPresets.json

### CMake Patch ###
# External projects
Expand Down Expand Up @@ -109,4 +214,6 @@ CMakeLists.txt.user*
# QtCreator local machine specific files for imported projects
*creator.user*

# End of https://www.toptal.com/developers/gitignore/api/c++,qt,cmake
*_qmlcache.qrc

# End of https://www.toptal.com/developers/gitignore/api/qt,c++,cmake,clion
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# don't rename interfaces, and don't do DHCP, systemd and networkd will do this for us
[General]
UseDefaultInterface=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[Match]
Name=wlan0

[Network]
DHCP=yes
IPv6PrivacyExtensions=true
3 changes: 2 additions & 1 deletion distro/configs/truncated-cube-lamp_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@ BR2_PACKAGE_RASPI_GPIO=y
BR2_PACKAGE_RTL8812AU_AIRCRACK_NG=y
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_PYTHON_PIGPIO=y
BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_IWD=y
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_VIM=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_SIZE="250M"
BR2_TARGET_ROOTFS_EXT2_SIZE="4G"
# BR2_TARGET_ROOTFS_TAR is not set
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
Expand Down
6 changes: 4 additions & 2 deletions server/caddy.service
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
[Unit]
Description=Caddy
Documentation=https://caddyserver.com/docs/
After=network.target network-online.target
Requires=network-online.target
# TODO(menno 25.09.2022) network-online.target seems to conflict with IWD, so disabled until systemd.networkd and IWD work out their race
After=network.target
# network-online.target
# Requires=network-online.target

[Service]
Type=notify
Expand Down

0 comments on commit 5693077

Please sign in to comment.