Skip to content

fix(install): inject resolv.conf + hosts on fast-install AND restore (no-DNS fix) #25

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.

Sign up for GitHub

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

Merged
luisguzman-adfa merged 3 commits into from
Jun 22, 2026
Merged

fix(install): inject resolv.conf + hosts on fast-install AND restore (no-DNS fix) #25

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7801944
fix(install): write resolv.conf + hosts after fast-install
luisguzman-adfa Jun 20, 2026
138e3f2
docs: flag fast-install DNS write as tech-debt (not Clean Architecture)
luisguzman-adfa Jun 20, 2026
a36c7b1
fix(install): also write DNS on backup RESTORE; share one helper
luisguzman-adfa Jun 20, 2026
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
33 changes: 33 additions & 0 deletions controller/app/src/main/java/org/iiab/controller/DeployFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,10 @@ public void onComplete(String destDir) {
}
}

// Freshly fast-installed rootfs ships without resolv.conf; give it
// DNS before the companion-data (maps/kiwix) steps that need network.
ensureRuntimeNetworkConfig(debianRootfs);

if (chkCompanionData.isChecked()) {
editLocalVarsForMaps(debianRootfs, safeTier);
android.content.SharedPreferences prefs = requireContext().getSharedPreferences(getString(R.string.pref_file_internal), Context.MODE_PRIVATE);
Expand Down Expand Up @@ -2143,6 +2147,8 @@ private void refreshRestoreButtonLogic() {
tarExtractor.startExtraction(requireContext(), backupFile.getAbsolutePath(), iiabRootDir.getAbsolutePath(), new TarExtractor.ExtractionListener() {
@Override
public void onComplete(String destDir) {
// Restored artifact ships without resolv.conf; the app owns runtime DNS.
ensureRuntimeNetworkConfig(new File(iiabRootDir, "installed-rootfs/iiab"));
mainAct.runOnUiThread(() -> {
isRestoring = false;
disableSystemProtection();
Expand All @@ -2169,6 +2175,33 @@ public void onError(String error) {
}
}

// Runtime network config for the proot guest: proot has no resolver daemon, and our build
// artifact ships WITHOUT /etc/resolv.conf on purpose (the app is the single owner of runtime
// network state). Mirrors the reset path. Called from fast-install and restore.
// TODO [tech-debt]: imperative side-effect inside DeployFragment (god-object); not Clean
// Architecture. Fold into the rootfs domain/data slice during the strangler refactor.
private void ensureRuntimeNetworkConfig(File debianRootfs) {
try {
File etc = new File(debianRootfs, "etc");
if (!etc.isDirectory()) {
Log.w(TAG, "ensureRuntimeNetworkConfig: missing " + etc.getAbsolutePath() + " - skipping DNS write");
return;
}
File resolvConf = new File(etc, "resolv.conf");
if (resolvConf.exists()) resolvConf.delete();
try (java.io.FileOutputStream fos = new java.io.FileOutputStream(resolvConf)) {
fos.write("nameserver 1.1.1.1\nnameserver 8.8.8.8\n".getBytes());
}
File hostsFile = new File(etc, "hosts");
try (java.io.FileOutputStream fosH = new java.io.FileOutputStream(hostsFile)) {
fosH.write("127.0.0.1 localhost\n".getBytes());
}
Log.i(TAG, "ensureRuntimeNetworkConfig: wrote resolv.conf + hosts under " + etc.getAbsolutePath());
} catch (Exception e) {
Log.w(TAG, "ensureRuntimeNetworkConfig failed", e);
}
}

private void importBackupSafely(Uri sourceUri) {
isImporting = true;
updateDynamicButtons();
Expand Down
Loading