Skip to content
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.

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

NetworkManager Support #2218

Merged

Conversation

AlvinSchiller
Copy link
Collaborator

@AlvinSchiller AlvinSchiller commented Jan 18, 2024

PR for #2184

  • Update setup
  • Update autohotspot based on dhcpcd
  • Add autohotspot based on NetworkManager
  • Fix autohotspot problems solved in v2 (Merge Autohotspot setup into main install script #2086)
  • Fix "Static IP" for NetworkManager
  • Fix "IPv6 disablement"
  • Update docs
  • fix path to boot files on bookworm (/boot/firmware)

Optional (maybe with a seperat PR)

  • Add card actions for Wifi / Autohotspot handling (addresses 🚀 | Wifi Plugin #1993)
  • Add rpc call to force a Hotspot (add to gui and card actions)?

@AlvinSchiller AlvinSchiller self-assigned this Jan 19, 2024
@AlvinSchiller AlvinSchiller added bug future3 Relates to future3 development installation labels Jan 19, 2024
installation/includes/01_default_config.sh Outdated Show resolved Hide resolved
installation/includes/01_default_config.sh Outdated Show resolved Hide resolved
installation/routines/customize_options.sh Outdated Show resolved Hide resolved
installation/routines/setup_autohotspot.sh Outdated Show resolved Hide resolved
installation/routines/setup_autohotspot.sh Outdated Show resolved Hide resolved
installation/routines/setup_autohotspot.sh Outdated Show resolved Hide resolved
installation/routines/setup_autohotspot.sh Outdated Show resolved Hide resolved
@pabera pabera added this to the v3.6 milestone Jan 19, 2024
@AlvinSchiller
Copy link
Collaborator Author

IPv6 disablement was also broken for bullseye.
Changed it to a kernel parameter to thoroughly disable ipv6 also for future connections.

@AlvinSchiller AlvinSchiller marked this pull request as ready for review January 30, 2024 00:50
Copy link
Collaborator

@pabera pabera left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't install it, but overall looks good! Will approve once tested on a Pi

echo -n ${string} | wc -m
}

is_service_enabled() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is quite some similarity with verify_service_enablement(). Could those 2 functions be combined?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Extracted the repetitive code to an internal function

Comment on lines +20 to +28
local configFile=$(get_boot_config_path)
log " Disable on-chip BCM audio"
if grep -q -E "^dtparam=([^,]*,)*audio=(on|true|yes|1).*" "${RPI_BOOT_CONFIG_FILE}" ; then
log " Backup ${RPI_BOOT_CONFIG_FILE} --> ${DISABLE_ONBOARD_AUDIO_BACKUP}"
sudo cp "${RPI_BOOT_CONFIG_FILE}" "${DISABLE_ONBOARD_AUDIO_BACKUP}"
sudo sed -i "s/^\(dtparam=\([^,]*,\)*\)audio=\(on\|true\|yes\|1\)\(.*\)/\1audio=off\4/g" "${RPI_BOOT_CONFIG_FILE}"
if grep -q -E "^dtparam=([^,]*,)*audio=(on|true|yes|1).*" "${configFile}" ; then
local configFile_backup="${configFile}.backup.audio_on_$(date +%d.%m.%y_%H.%M.%S)"
log " Backup ${configFile} --> ${configFile_backup}"
sudo cp "${configFile}" "${configFile_backup}"
sudo sed -i "s/^\(dtparam=\([^,]*,\)*\)audio=\(on\|true\|yes\|1\)\(.*\)/\1audio=off\4/g" "${configFile}"
else
log " On board audio seems to be off already. Not touching ${RPI_BOOT_CONFIG_FILE}"
log " On board audio seems to be off already. Not touching ${configFile}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not related to NetworkManager. Since I already worked on this in my PR, maybe you could remove it to avoid conflicts

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can do, but this leaves this feature not functional for bookworm and some clutter.

It should also not be a problem with your branch, as you deleted the whole file, which can just be kept on merging.
I can support on merging if you like.

installation/routines/setup_autohotspot.sh Outdated Show resolved Hide resolved
installation/routines/setup_autohotspot.sh Outdated Show resolved Hide resolved
Aligned some language and typos
Aligning wording and removing typos
@pabera pabera modified the milestones: v3.6, v3.5 Feb 4, 2024
@pabera pabera changed the title Network Management fixes NetworkManager Support Feb 4, 2024
@pabera pabera mentioned this pull request Feb 4, 2024
13 tasks
@pabera pabera merged commit 2fe7055 into MiczFlor:future3/develop Feb 4, 2024
21 checks passed
@AlvinSchiller AlvinSchiller deleted the future3/feature/autohotspot branch February 4, 2024 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug future3 Relates to future3 development installation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants