network: fix Wi-Fi interfaces not listed in dry-run #1785
Conversation
When a Wi-Fi interface is present in the machine configuration (e.g.,
mwhudson.json), the GUI seemingly ignores it. This happens because there
is a filter on the server side which only returns Wi-Fi interfaces if
the wlan_support_install_state() function returns
PackageInstallState.DONE.
However, calling the /network endpoint shows that the state is set to
the wrong value:
{"wlan_support_install_state": "NOT_NEEDED"}
This turns out to be inconsistent because:
* we lean on a PackageInstaller instance to tell if wpasupplicant is
installed (this is what the wlan_support_install_state() function
reflects) ; but
* in dry-run mode, we pretend to install wpasupplicant without
actually relying on the PackageInstaller instance.
Fixed by using the PackageInstaller instance to install the
wpasupplicant package - with a special implementation that only pretends
to install it. This is enough to make the PackageInstaller instance
think the package is installed.
Signed-off-by: Olivier Gayot <[email protected]>
ogayot
force-pushed
the
wifi-package-not-needed
branch
from
86afe9d
to
c09a32c
Compare
Updated. I must admit I don't find these DryRun classes very practical. But I do like that it makes the "main" code cleaner (less cluttered with dry-run specific things). I had to introduce a little bit of code duplication here, hope it's okay.. |
Signed-off-by: Olivier Gayot <[email protected]>
ogayot
force-pushed
the
wifi-package-not-needed
branch
from
c61f0a8
to
1670d07
Compare
There was a problem hiding this comment.
Sorry for not reviewing yesterday, I did read the code but somehow forgot to write anything down!
This looks OK. I don't think we have to regard the interpretation of SUBIQUITY_DEBUG_FLAGS with any kind of stability though -- seems like it would make things easier and more flexible to switch to using some syntax like SUBIQUITY_DEBUG_FLAGS=pkginstall=wpasupplicant=FAILED or something?
Yes that sounds like good improvements to implement going forward :) |
When a Wi-Fi interface is present in the machine configuration (e.g., mwhudson.json), the GUI seemingly ignores it. This happens because there is a filter on the server side which only returns Wi-Fi interfaces if the wlan_support_install_state() function returns
PackageInstallState.DONE.
However, calling the /network endpoint shows that the state is set to the wrong value:
{"wlan_support_install_state": "NOT_NEEDED"}This turns out to be inconsistent because:
Fixed by using the PackageInstaller instance to install the wpasupplicant package - with a special implementation that only pretends to install it. This is enough to make the PackageInstaller instance think the package is installed.
LP: #2039091