Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

Bump version to 1.0.4 with terminal size fix and navigation fix

ExTv096f6226073a
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 54088c0..ee79217 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -23,8 +23,8 @@ android {
applicationId = "com.excp.podroid"
minSdk = 34
targetSdk = 36
- versionCode = 6
- versionName = "1.0.3"
+ versionCode = 7
+ versionName = "1.0.4"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb43..20bfba0 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,21 +1,20 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
+# Podroid ProGuard rules
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
+# Termux terminal-emulator fields accessed via reflection
+-keepclassmembers class com.termux.terminal.TerminalSession {
+ private com.termux.terminal.TerminalEmulator mEmulator;
+}
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+# Termux terminal-view renderer fields accessed via reflection for size calculation
+-keepclassmembers class com.termux.view.TerminalRenderer {
+ private float mFontWidth;
+ private int mFontLineSpacing;
+ private int mFontLineSpacingAndAscent;
+}
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+# TerminalView fields set directly from TerminalScreen
+-keepclassmembers class com.termux.view.TerminalView {
+ public com.termux.terminal.TerminalSession mTermSession;
+ public com.termux.terminal.TerminalEmulator mEmulator;
+ private com.termux.view.TerminalRenderer mRenderer;
+}
diff --git a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
index d0dbd05..aab537a 100644
--- a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
+++ b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
@@ -61,6 +61,10 @@ class PodroidQemu @Inject constructor(
/** Coroutine scope for I/O threads — cancelled on stop(). */
private var ioScope: CoroutineScope? = null
+ /** Console text buffer — capped to prevent unbounded memory growth. */
+ private val consoleBuilder = StringBuilder()
+ private val maxConsoleSize = 64 * 1024 // Keep last 64KB
+
fun writeToConsole(data: ByteArray) {
writeQueue.offer(data)
}
@@ -81,7 +85,7 @@ class PodroidQemu @Inject constructor(
fun start() = start(emptyList())
- fun start(portForwards: List<PortForwardRule>, ramMb: Int = 1024, cpus: Int = 4) {
+ fun start(portForwards: List<PortForwardRule>, ramMb: Int = 512, cpus: Int = 1) {
if (_state.value is VmState.Starting || _state.value is VmState.Running) {
Log.w(TAG, "start() called while VM is ${_state.value}, ignoring")
return
@@ -95,6 +99,7 @@ class PodroidQemu @Inject constructor(
ensureStorageImage()
_state.value = VmState.Starting
+ consoleBuilder.clear()
_consoleText.value = ""
_bootStage.value = "Starting QEMU..."
@@ -155,16 +160,19 @@ class PodroidQemu @Inject constructor(
scope.launch {
FileOutputStream(logFile, true).use { logOut ->
val buf = ByteArray(4096)
- val consoleBuilder = StringBuilder()
val input = proc.inputStream
try {
while (isActive) {
val n = input.read(buf)
if (n < 0) break
val chunk = buf.copyOf(n)
- val text = String(chunk)
+ val text = String(chunk, Charsets.UTF_8)
+ // Cap console buffer to prevent unbounded growth
consoleBuilder.append(text)
+ if (consoleBuilder.length > maxConsoleSize) {
+ consoleBuilder.delete(0, consoleBuilder.length - maxConsoleSize)
+ }
_consoleText.value = consoleBuilder.toString()
logOut.write(chunk, 0, n)
@@ -213,6 +221,7 @@ class PodroidQemu @Inject constructor(
return
}
+ // Block until QEMU exits (keeps the calling service alive)
val exitCode = proc.waitFor()
Log.d(TAG, "QEMU exited with code: $exitCode")
cleanup()
@@ -252,15 +261,23 @@ class PodroidQemu @Inject constructor(
fun stop() {
try {
writeToConsole("sync\n".toByteArray())
- Thread.sleep(500)
} catch (e: Exception) {
Log.d(TAG, "Failed to send sync: ${e.message}")
}
- process?.destroy()
- try { Thread.sleep(1000) } catch (_: Exception) {}
- if (process?.isAlive == true) {
- process?.destroyForcibly()
+ val proc = process
+ if (proc != null) {
+ proc.destroy()
+ try {
+ // Wait up to 3 seconds for graceful exit
+ val exited = proc.waitFor(3, TimeUnit.SECONDS)
+ if (!exited) {
+ proc.destroyForcibly()
+ proc.waitFor(2, TimeUnit.SECONDS)
+ }
+ } catch (_: Exception) {
+ proc.destroyForcibly()
+ }
}
cleanup()
_state.value = VmState.Stopped
diff --git a/app/src/main/java/com/excp/podroid/engine/QmpClient.kt b/app/src/main/java/com/excp/podroid/engine/QmpClient.kt
index e7f5507..1eaedc5 100644
--- a/app/src/main/java/com/excp/podroid/engine/QmpClient.kt
+++ b/app/src/main/java/com/excp/podroid/engine/QmpClient.kt
@@ -21,6 +21,7 @@ class QmpClient(private val socketPath: String) {
companion object {
private const val TAG = "QmpClient"
+ private const val SOCKET_TIMEOUT_MS = 5000
}
suspend fun execute(command: String, arguments: JSONObject? = null): Result<JSONObject> =
@@ -30,6 +31,7 @@ class QmpClient(private val socketPath: String) {
socket.connect(
LocalSocketAddress(socketPath, LocalSocketAddress.Namespace.FILESYSTEM)
)
+ socket.soTimeout = SOCKET_TIMEOUT_MS
val reader = BufferedReader(InputStreamReader(socket.inputStream))
val writer = OutputStreamWriter(socket.outputStream)
diff --git a/app/src/main/java/com/excp/podroid/service/PodroidService.kt b/app/src/main/java/com/excp/podroid/service/PodroidService.kt
index 405edfb..d750360 100644
--- a/app/src/main/java/com/excp/podroid/service/PodroidService.kt
+++ b/app/src/main/java/com/excp/podroid/service/PodroidService.kt
@@ -23,6 +23,7 @@ import com.excp.podroid.R
import com.excp.podroid.data.repository.PortForwardRepository
import com.excp.podroid.data.repository.SettingsRepository
import com.excp.podroid.engine.PodroidQemu
+import com.excp.podroid.engine.VmState
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.*
import javax.inject.Inject
@@ -34,8 +35,9 @@ class PodroidService : Service() {
@Inject lateinit var portForwardRepository: PortForwardRepository
@Inject lateinit var settingsRepository: SettingsRepository
- private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+ private val serviceScope = CoroutineScope(Job() + Dispatchers.Main)
private var launchJob: Job? = null
+ private var notificationJob: Job? = null
private var wakeLock: PowerManager.WakeLock? = null
override fun onBind(intent: Intent?): IBinder? = null
@@ -50,6 +52,7 @@ class PodroidService : Service() {
ACTION_START -> {
startForeground(NOTIFICATION_ID, buildNotification("Starting Podman..."))
acquireWakeLock()
+ startNotificationUpdates()
launchPodroid()
}
ACTION_STOP -> {
@@ -61,10 +64,20 @@ class PodroidService : Service() {
override fun onDestroy() {
super.onDestroy()
+ notificationJob?.cancel()
releaseWakeLock()
serviceScope.cancel()
}
+ override fun onTaskRemoved(rootIntent: Intent?) {
+ super.onTaskRemoved(rootIntent)
+ // App swiped from recents — stop the VM gracefully
+ if (podroidQemu.state.value is VmState.Running ||
+ podroidQemu.state.value is VmState.Starting) {
+ podroidQemu.stop()
+ }
+ }
+
private fun acquireWakeLock() {
if (wakeLock == null) {
val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
@@ -88,11 +101,25 @@ class PodroidService : Service() {
wakeLock = null
}
+ private fun startNotificationUpdates() {
+ notificationJob?.cancel()
+ notificationJob = serviceScope.launch {
+ podroidQemu.bootStage
+ .collect { stage ->
+ val status = when {
+ stage == "Ready" || podroidQemu.state.value is VmState.Running && stage.isEmpty() ->
+ "Podman is running"
+ stage.isNotEmpty() -> stage
+ else -> "Starting Podman..."
+ }
+ updateNotification(status)
+ }
+ }
+ }
+
private fun launchPodroid() {
launchJob?.cancel()
launchJob = serviceScope.launch {
- updateNotification("Podman is running")
-
withContext(Dispatchers.IO) {
try {
val rules = portForwardRepository.getRulesSnapshot()
diff --git a/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt b/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt
index e0d703e..7192175 100644
--- a/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt
+++ b/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt
@@ -32,20 +32,41 @@ fun PodroidNavGraph(
) {
composable(Routes.HOME) {
HomeScreen(
- onNavigateToTerminal = { navController.navigate(Routes.TERMINAL) },
- onNavigateToSettings = { navController.navigate(Routes.SETTINGS) },
+ onNavigateToTerminal = {
+ navController.navigate(Routes.TERMINAL) {
+ launchSingleTop = true
+ }
+ },
+ onNavigateToSettings = {
+ navController.navigate(Routes.SETTINGS) {
+ launchSingleTop = true
+ }
+ },
)
}
composable(Routes.TERMINAL) {
TerminalScreen(
- onNavigateBack = { navController.popBackStack() },
+ onNavigateBack = {
+ // Ensure we always land back on Home, never an empty back stack
+ if (!navController.popBackStack(Routes.HOME, inclusive = false)) {
+ navController.navigate(Routes.HOME) {
+ popUpTo(0) { inclusive = true }
+ }
+ }
+ },
)
}
composable(Routes.SETTINGS) {
SettingsScreen(
- onNavigateBack = { navController.popBackStack() },
+ onNavigateBack = {
+ if (!navController.popBackStack(Routes.HOME, inclusive = false)) {
+ navController.navigate(Routes.HOME) {
+ popUpTo(0) { inclusive = true }
+ }
+ }
+ },
)
}
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt
index 969a7da..b3756d0 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt
@@ -180,7 +180,7 @@ fun HomeScreen(
}
}
- // Error message
+ // Error message with retry
if (vmState is VmState.Error) {
Card(
modifier = Modifier.fillMaxWidth(),
@@ -188,12 +188,26 @@ fun HomeScreen(
containerColor = MaterialTheme.colorScheme.errorContainer,
),
) {
- Text(
- text = (vmState as VmState.Error).message,
- modifier = Modifier.padding(16.dp),
- color = MaterialTheme.colorScheme.onErrorContainer,
- style = MaterialTheme.typography.bodyMedium,
- )
+ Column(modifier = Modifier.padding(16.dp)) {
+ Text(
+ text = (vmState as VmState.Error).message,
+ color = MaterialTheme.colorScheme.onErrorContainer,
+ style = MaterialTheme.typography.bodyMedium,
+ )
+ Spacer(modifier = Modifier.height(12.dp))
+ Button(
+ onClick = { viewModel.startPodroid() },
+ modifier = Modifier.fillMaxWidth(),
+ ) {
+ Icon(
+ imageVector = Icons.Default.Refresh,
+ contentDescription = null,
+ modifier = Modifier.size(20.dp),
+ )
+ Spacer(modifier = Modifier.width(8.dp))
+ Text("Retry")
+ }
+ }
}
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
index 69eea31..439c3ea 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
@@ -37,13 +37,13 @@ class SettingsViewModel @Inject constructor(
val darkTheme: Flow<Boolean> = settingsRepository.darkTheme
val vmRamMb: StateFlow<Int> = settingsRepository.vmRamMb
- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 1024)
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 512)
val vmCpus: StateFlow<Int> = settingsRepository.vmCpus
- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 4)
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 1)
val terminalFontSize: StateFlow<Int> = settingsRepository.terminalFontSize
- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 24)
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 20)
val portForwardRules: StateFlow<List<PortForwardRule>> = portForwardRepository.rules
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
index 77e0320..2c15ba5 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
@@ -191,6 +191,18 @@ fun TerminalScreen(
modifier = Modifier.padding(top = 8.dp, start = 16.dp, end = 16.dp),
textAlign = TextAlign.Center,
)
+ Spacer(modifier = Modifier.height(16.dp))
+ Text(
+ text = "Tap to Retry",
+ color = Color(0xFF4FC3F7),
+ fontSize = 14.sp,
+ fontWeight = FontWeight.Bold,
+ modifier = Modifier
+ .clip(RoundedCornerShape(8.dp))
+ .background(Color(0xFF333333))
+ .clickable { onNavigateBack() }
+ .padding(horizontal = 24.dp, vertical = 12.dp),
+ )
}
}
}
@@ -241,15 +253,17 @@ fun TerminalScreen(
mEmulator = sess.emulator
requestFocus()
- post { syncTerminalSize(this, sess, viewModel) }
+
+ // Use layout listener to sync size once the view is actually measured
+ addOnLayoutChangeListener { v, _, _, _, _, _, _, _, _ ->
+ val tv = v as TerminalView
+ val s = viewModel.session ?: return@addOnLayoutChangeListener
+ syncTerminalSize(tv, s, viewModel)
+ }
}
},
update = { view ->
view.setTextSize(fontSize)
- val sess = viewModel.session
- if (sess != null) {
- view.post { syncTerminalSize(view, sess, viewModel) }
- }
},
modifier = Modifier.fillMaxSize(),
)
@@ -316,14 +330,9 @@ private fun syncTerminalSize(
val cols = (view.width / fw).toInt().coerceAtLeast(4)
val rows = ((view.height - flsa) / fls).coerceAtLeast(4)
- if (session.emulator?.mColumns != cols || session.emulator?.mRows != rows) {
- Log.d("TerminalScreen", "Resizing to ${cols}x${rows}")
- session.updateSize(cols, rows)
- viewModel.updateSize(cols, rows)
- view.onScreenUpdated()
- // Send stty to the VM so programs get SIGWINCH with correct size.
- viewModel.syncSize()
- }
+ // TerminalView auto-resizes its emulator on layout, so just sync
+ // the dimensions to QEMU (updateSize deduplicates and sends stty).
+ viewModel.updateSize(cols, rows)
} catch (e: Exception) {
Log.w("TerminalScreen", "Resize failed: ${e.message}")
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
index 4e1e01d..e1e0113 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
@@ -8,6 +8,10 @@
package com.excp.podroid.ui.screens.terminal
import android.content.Context
+import android.os.Build
+import android.os.VibrationEffect
+import android.os.Vibrator
+import android.os.VibratorManager
import android.util.Log
import android.view.KeyEvent
import android.view.MotionEvent
@@ -23,9 +27,12 @@ import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
import javax.inject.Inject
@HiltViewModel
@@ -49,6 +56,21 @@ class TerminalViewModel @Inject constructor(
var extraCtrl = false
var extraAlt = false
+ /** Last terminal size sent to the VM via stty, to avoid redundant commands. */
+ private var lastSyncedCols = 0
+ private var lastSyncedRows = 0
+ private var resizeJob: Job? = null
+
+
+ private val vibrator: Vibrator by lazy {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ (context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager).defaultVibrator
+ } else {
+ @Suppress("DEPRECATION")
+ context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+ }
+ }
+
val sessionClient = object : TerminalSessionClient {
override fun onTextChanged(changedSession: TerminalSession) {
terminalView?.onScreenUpdated()
@@ -68,10 +90,12 @@ class TerminalViewModel @Inject constructor(
val clip = clipboard.primaryClip
if (clip != null && clip.itemCount > 0) {
val text = clip.getItemAt(0).coerceToText(context).toString()
- qemu.writeToConsole(text.toByteArray())
+ qemu.writeToConsole(text.toByteArray(Charsets.UTF_8))
}
}
- override fun onBell(session: TerminalSession) {}
+ override fun onBell(session: TerminalSession) {
+ vibrator.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE))
+ }
override fun onColorsChanged(session: TerminalSession) {}
override fun onTerminalCursorStateChange(state: Boolean) {}
override fun getTerminalCursorStyle(): Int = 0
@@ -109,7 +133,7 @@ class TerminalViewModel @Inject constructor(
val bytes = when (keyCode) {
KeyEvent.KEYCODE_ENTER -> byteArrayOf(13) // CR — getty translates to LF
KeyEvent.KEYCODE_DEL -> byteArrayOf(127) // Backspace
- KeyEvent.KEYCODE_FORWARD_DEL -> "\u001b[3~".toByteArray() // Delete key
+ KeyEvent.KEYCODE_FORWARD_DEL -> "\u001b[3~".toByteArray()
KeyEvent.KEYCODE_TAB -> byteArrayOf(9)
KeyEvent.KEYCODE_ESCAPE -> byteArrayOf(27)
KeyEvent.KEYCODE_DPAD_UP -> "\u001b[A".toByteArray()
@@ -121,7 +145,6 @@ class TerminalViewModel @Inject constructor(
KeyEvent.KEYCODE_PAGE_UP -> "\u001b[5~".toByteArray()
KeyEvent.KEYCODE_PAGE_DOWN -> "\u001b[6~".toByteArray()
KeyEvent.KEYCODE_INSERT -> "\u001b[2~".toByteArray()
- // Function keys F1-F12
KeyEvent.KEYCODE_F1 -> "\u001bOP".toByteArray()
KeyEvent.KEYCODE_F2 -> "\u001bOQ".toByteArray()
KeyEvent.KEYCODE_F3 -> "\u001bOR".toByteArray()
@@ -167,7 +190,7 @@ class TerminalViewModel @Inject constructor(
}
val chars = Character.toChars(codePoint)
- val charBytes = String(chars).toByteArray()
+ val charBytes = String(chars).toByteArray(Charsets.UTF_8)
if (extraAlt) {
// Alt sends ESC prefix followed by the character
qemu.writeToConsole(byteArrayOf(27) + charBytes)
@@ -200,15 +223,26 @@ class TerminalViewModel @Inject constructor(
fun updateSize(cols: Int, rows: Int) {
qemu.updateTerminalSize(cols, rows)
+ if (cols != lastSyncedCols || rows != lastSyncedRows) {
+ lastSyncedCols = cols
+ lastSyncedRows = rows
+ // Debounce: wait for layout to settle (e.g. keyboard animation)
+ // before sending stty to avoid flooding the console.
+ resizeJob?.cancel()
+ resizeJob = viewModelScope.launch {
+ delay(500)
+ syncSize()
+ }
+ }
}
fun syncSize() {
val rows = qemu.terminalRows
val cols = qemu.terminalCols
- // Send SIGWINCH to all processes on the serial TTY by updating stty.
- // Ctrl-U clears the line first so it doesn't corrupt running apps.
- val cmd = "\u0015stty rows $rows cols $cols\n"
- qemu.writeToConsole(cmd.toByteArray())
+ if (rows <= 0 || cols <= 0) return
+ // Use the sz helper script which sets stty and erases its own echo.
+ val cmd = "\u0015sz $rows $cols\n"
+ qemu.writeToConsole(cmd.toByteArray(Charsets.UTF_8))
}
fun createSession() {
@@ -245,10 +279,6 @@ class TerminalViewModel @Inject constructor(
Log.e(TAG, "Reflection setup failed", e)
}
- // Don't syncSize() here — the view hasn't been measured yet.
- // syncTerminalSize() in TerminalScreen will detect the real dimensions
- // and call syncSize() with the correct values after layout.
-
// QEMU output → trigger UI refresh
qemu.onConsoleOutput = { _, _ ->
terminalView?.let { view ->
diff --git a/init-podroid b/init-podroid
index 85a50c4..c485540 100644
--- a/init-podroid
+++ b/init-podroid
@@ -38,7 +38,6 @@ chmod 1777 /tmp /var/tmp
echo "podroid" > /etc/hostname
hostname podroid
-
# ── Kernel modules ──
echo "[init] Loading kernel modules..."
KVER=$(uname -r)
@@ -66,7 +65,7 @@ fi
# ── Networking ──
echo "[init] Waiting for network..."
NETIF=""
-for i in $(seq 1 10); do
+for i in $(seq 1 30); do
NETIF=$(ip -o link show 2>/dev/null | awk -F': ' '{print $2}' | grep -v lo | head -1)
[ -n "$NETIF" ] && break
sleep 1
@@ -81,8 +80,9 @@ else
echo "[init] WARNING: No network interface found!"
fi
-# DNS (QEMU's 10.0.2.3 forwarder doesn't work on Android)
-echo "nameserver 8.8.8.8" > /etc/resolv.conf
+# DNS — try QEMU gateway forwarder first, fall back to public DNS
+echo "nameserver 10.0.2.3" > /etc/resolv.conf
+echo "nameserver 8.8.8.8" >> /etc/resolv.conf
echo "nameserver 1.1.1.1" >> /etc/resolv.conf
echo "[init] Configuring containers..."
@@ -211,17 +211,31 @@ export CONTAINERS_STORAGE_CONF=/etc/containers/storage.conf
export CONTAINERS_REGISTRIES_CONF=/etc/containers/registries.conf
# Sane terminal settings for serial console
-# Don't hardcode rows/cols — the Android app sends stty with actual dimensions.
stty -ixon -ixoff -iexten -echoctl 2>/dev/null
+# Query terminal emulator for actual size (sets TIOCGWINSZ via escape sequence)
+resize >/dev/null 2>&1
cd /root
PROF
+# ── Silent resize helper ──
+# Called by the Android app to set terminal size without visible echo.
+# After setting stty, it erases the echoed command line so nothing is visible.
+cat > /usr/local/bin/sz <<'SZ'
+#!/bin/sh
+stty rows "$1" cols "$2" 2>/dev/null
+printf '\033[1A\033[2K'
+SZ
+chmod +x /usr/local/bin/sz
+
# ── Login wrapper ──
# getty -n -l /bin/sh doesn't source /etc/profile.
# This wrapper ensures the profile is always sourced (sets HOME, TERM, cd /root).
cat > /usr/local/bin/podroid-login <<'LOGIN'
#!/bin/sh
. /etc/profile
+# Query terminal emulator for actual dimensions via escape sequence.
+# This sets TIOCGWINSZ correctly so TUI apps (vim, btop) get the right size.
+resize >/dev/null 2>&1
exec /bin/sh
LOGIN
chmod +x /usr/local/bin/podroid-login
@@ -268,12 +282,16 @@ done
OVERLAY_OK=false
if [ -n "$PERSIST_DEV" ]; then
- mount -t ext4 -o rw,noatime "$PERSIST_DEV" /mnt/persist 2>/dev/null || {
- echo "[init] Formatting $PERSIST_DEV for persistent storage..."
+ # Try mounting; if it fails, run fsck silently before formatting
+ if ! mount -t ext4 -o rw,noatime "$PERSIST_DEV" /mnt/persist 2>/dev/null; then
/bin/busybox --install -s 2>/dev/null
- mkfs.ext4 -q -F "$PERSIST_DEV" 2>/dev/null
- mount -t ext4 -o rw,noatime "$PERSIST_DEV" /mnt/persist 2>/dev/null
- }
+ e2fsck -y "$PERSIST_DEV" >/dev/null 2>&1
+ if ! mount -t ext4 -o rw,noatime "$PERSIST_DEV" /mnt/persist 2>/dev/null; then
+ echo "[init] Formatting $PERSIST_DEV for persistent storage..."
+ mkfs.ext4 -q -F "$PERSIST_DEV" >/dev/null 2>&1
+ mount -t ext4 -o rw,noatime "$PERSIST_DEV" /mnt/persist 2>/dev/null
+ fi
+ fi
if mountpoint -q /mnt/persist 2>/dev/null; then
# Create overlay directories on persistent disk
@@ -299,6 +317,8 @@ if [ -n "$PERSIST_DEV" ]; then
# Enter overlay and run main init
exec chroot /mnt/overlay /init --main
+ else
+ echo "[init] WARNING: Overlay mount failed! Running without persistence."
fi
fi
fi