Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/release-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ jobs:
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
- name: Build Dogebox OS T6
run: |
nix flake update
nix build .#packages.aarch64-linux.t6 -o result-t6
echo "Copying artefacts"
mkdir -p artifacts
Expand Down
4 changes: 3 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@ rec {

# These are the built packages, rather than the raw sources.
dkm = inputs.dkm.packages.${system}.default;
dogeboxd = inputs.dogeboxd.packages.${system}.default;
dogeboxd = inputs.dogeboxd.packages.${system}.default.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [ ./nix/dbx/patches/dogeboxd-wifi-test-connect.patch ];
});
dpanel = inputs.dpanel.packages.${system}.default;

# Explicitly only pass the rk3588 firmware for the nanopc-t6 builder.
Expand Down
34 changes: 34 additions & 0 deletions nix/dbx/patches/dogeboxd-wifi-test-connect.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/cmd/_dbxroot/cmd/wifi-test-connect.go b/cmd/_dbxroot/cmd/wifi-test-connect.go
index a5459f3..57d418c 100644
--- a/cmd/_dbxroot/cmd/wifi-test-connect.go
+++ b/cmd/_dbxroot/cmd/wifi-test-connect.go
@@ -40,6 +40,12 @@ func init() {
}

func testWifiConnect(iface string, ssid string, password string) error {
+ stopCreateAPCmd := exec.Command("systemctl", "stop", "create_ap.service")
+ if out, err := stopCreateAPCmd.CombinedOutput(); err != nil {
+ // Non-fatal: we still attempt to connect in case create_ap is not present.
+ log.Printf("warning: failed to stop create_ap.service: %v (%s)", err, strings.TrimSpace(string(out)))
+ }
+
cmd := exec.Command("wpa_supplicant",
"-i", iface,
"-C", "/var/run/wpa_supplicant",
@@ -69,7 +75,7 @@ func testWifiConnect(iface string, ssid string, password string) error {
return err
}

- id := string(networkID)
+ id := strings.TrimSpace(string(networkID))

setSSIDCmd := exec.Command("wpa_cli", "-i", iface, "set_network", id, "ssid", fmt.Sprintf("\"%s\"", ssid))
err = setSSIDCmd.Run()
@@ -110,6 +116,7 @@ func testWifiConnect(iface string, ssid string, password string) error {
log.Printf("Successfully connected to WiFi network: %s", ssid)
} else {
log.Printf("Failed to connect to WiFi network: %s. Current status: %s", ssid, status)
+ return fmt.Errorf("wpa_supplicant did not reach connected state")
}

return nil
Loading