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.2 with terminal improvements and new settings

ExTvd3e8e0dddeaa
diff --git a/Dockerfile b/Dockerfile
index 59debfc..002a57a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,9 @@ RUN apk update && apk add --no-cache \
curl \
e2fsprogs \
util-linux \
- openrc
+ openrc \
+ ncurses-terminfo-base \
+ musl-locales
# Podman/container config is written at boot by init-podroid
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index dff4484..47cb501 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 = 2
- versionName = "1.0.1"
+ versionCode = 3
+ versionName = "1.0.2"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 032542d..3625761 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,6 +61,17 @@
</intent-filter>
</activity>
+ <!-- FileProvider for sharing console logs -->
+ <provider
+ android:name="androidx.core.content.FileProvider"
+ android:authorities="${applicationId}.fileprovider"
+ android:exported="false"
+ android:grantUriPermissions="true">
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths" />
+ </provider>
+
<!-- Foreground service that hosts the QEMU process -->
<service
android:name=".service.PodroidService"
diff --git a/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt b/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt
index 14a5412..fdf4523 100644
--- a/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt
+++ b/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt
@@ -11,9 +11,11 @@ import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.booleanPreferencesKey
import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.intPreferencesKey
import androidx.datastore.preferences.preferencesDataStore
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
import javax.inject.Inject
import javax.inject.Singleton
@@ -27,11 +29,38 @@ class SettingsRepository @Inject constructor(
companion object {
val KEY_DARK_THEME = booleanPreferencesKey("dark_theme")
+ val KEY_VM_RAM = intPreferencesKey("vm_ram_mb")
+ val KEY_VM_CPUS = intPreferencesKey("vm_cpus")
+ val KEY_FONT_SIZE = intPreferencesKey("terminal_font_size")
}
val darkTheme: Flow<Boolean> = context.dataStore.data
.map { it[KEY_DARK_THEME] ?: true }
+ val vmRamMb: Flow<Int> = context.dataStore.data
+ .map { it[KEY_VM_RAM] ?: 1024 }
+
+ val vmCpus: Flow<Int> = context.dataStore.data
+ .map { it[KEY_VM_CPUS] ?: 4 }
+
+ val terminalFontSize: Flow<Int> = context.dataStore.data
+ .map { it[KEY_FONT_SIZE] ?: 24 }
+
suspend fun setDarkTheme(value: Boolean) =
context.dataStore.edit { it[KEY_DARK_THEME] = value }
+
+ suspend fun setVmRamMb(value: Int) =
+ context.dataStore.edit { it[KEY_VM_RAM] = value }
+
+ suspend fun setVmCpus(value: Int) =
+ context.dataStore.edit { it[KEY_VM_CPUS] = value }
+
+ suspend fun setTerminalFontSize(value: Int) =
+ context.dataStore.edit { it[KEY_FONT_SIZE] = value }
+
+ suspend fun getVmRamMbSnapshot(): Int =
+ context.dataStore.data.map { it[KEY_VM_RAM] ?: 1024 }.first()
+
+ suspend fun getVmCpusSnapshot(): Int =
+ context.dataStore.data.map { it[KEY_VM_CPUS] ?: 4 }.first()
}
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 ad04d76..d3c6ea4 100644
--- a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
+++ b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
@@ -9,7 +9,6 @@ package com.excp.podroid.engine
import android.content.Context
import android.util.Log
-import com.excp.podroid.data.repository.PortForwardRepository
import com.excp.podroid.data.repository.PortForwardRule
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.MutableStateFlow
@@ -24,7 +23,6 @@ import javax.inject.Singleton
@Singleton
class PodroidQemu @Inject constructor(
@ApplicationContext private val context: Context,
- private val portForwardRepository: PortForwardRepository,
) {
private val _state = MutableStateFlow<VmState>(VmState.Idle)
val state: StateFlow<VmState> = _state.asStateFlow()
@@ -33,6 +31,10 @@ class PodroidQemu @Inject constructor(
private val _consoleText = MutableStateFlow("")
val consoleText: StateFlow<String> = _consoleText.asStateFlow()
+ /** Current boot stage for UI feedback */
+ private val _bootStage = MutableStateFlow("")
+ val bootStage: StateFlow<String> = _bootStage.asStateFlow()
+
var process: Process? = null
private set
@@ -42,7 +44,7 @@ class PodroidQemu @Inject constructor(
/**
* Callback for raw console output bytes. When set, each chunk read from
- * QEMU stdout is forwarded here (used by QemuTerminalSession).
+ * QEMU stdout is forwarded here (used by TerminalViewModel).
*/
var onConsoleOutput: ((ByteArray, Int) -> Unit)? = null
@@ -55,7 +57,7 @@ class PodroidQemu @Inject constructor(
start(emptyList())
}
- fun start(portForwards: List<PortForwardRule>) {
+ fun start(portForwards: List<PortForwardRule>, ramMb: Int = 1024, cpus: Int = 4) {
if (_state.value is VmState.Starting || _state.value is VmState.Running) {
Log.w(TAG, "start() called while VM is in state ${_state.value}, ignoring")
return
@@ -66,11 +68,15 @@ class PodroidQemu @Inject constructor(
return
}
+ // Ensure storage image exists (may have been deleted by reset)
+ ensureStorageImage()
+
_state.value = VmState.Starting
_consoleText.value = ""
+ _bootStage.value = "Starting QEMU..."
try {
- val cmd = buildCommand(qemuExe, portForwards)
+ val cmd = buildCommand(qemuExe, portForwards, ramMb, cpus)
Log.d(TAG, "Launching: ${cmd.joinToString(" ")}")
val nativeDir = context.applicationInfo.nativeLibraryDir
@@ -81,31 +87,35 @@ class PodroidQemu @Inject constructor(
.directory(context.filesDir)
pb.environment()["LD_LIBRARY_PATH"] = "$nativeDir:$filesDir"
- process = pb.start()
- consoleOutput = process!!.outputStream
+ val proc = pb.start()
+ process = proc
+ consoleOutput = proc.outputStream
Log.d(TAG, "Process started")
+ _bootStage.value = "Booting kernel..."
// Read serial console output (stdout), log to file, and forward to listeners
val logFile = File(context.filesDir, "console.log")
logFile.delete()
Thread({
- try {
+ FileOutputStream(logFile, true).use { logOut ->
val buf = ByteArray(4096)
- val input = process!!.inputStream
- val logOut = FileOutputStream(logFile, true)
- while (true) {
- val n = input.read(buf)
- if (n < 0) break
- val chunk = buf.copyOf(n)
- _consoleText.value += String(chunk)
- logOut.write(chunk, 0, n)
- logOut.flush()
- // Forward to terminal session if attached
- onConsoleOutput?.invoke(chunk, n)
+ val input = proc.inputStream
+ try {
+ while (true) {
+ val n = input.read(buf)
+ if (n < 0) break
+ val chunk = buf.copyOf(n)
+ _consoleText.value += String(chunk)
+ logOut.write(chunk, 0, n)
+ logOut.flush()
+ // Detect boot stages from console output
+ detectBootStage(String(chunk))
+ // Forward to terminal session if attached
+ onConsoleOutput?.invoke(chunk, n)
+ }
+ } catch (e: Exception) {
+ Log.d(TAG, "Console reader ended: ${e.message}")
}
- logOut.close()
- } catch (e: Exception) {
- Log.d(TAG, "Console reader ended: ${e.message}")
}
}, "qemu-console-reader").apply {
isDaemon = true
@@ -116,13 +126,15 @@ class PodroidQemu @Inject constructor(
Thread({
try {
val buf = ByteArray(4096)
- val err = process!!.errorStream
+ val err = proc.errorStream
while (true) {
val n = err.read(buf)
if (n < 0) break
Log.d("PodroidVM-err", String(buf, 0, n).trimEnd().take(300))
}
- } catch (_: Exception) {}
+ } catch (e: Exception) {
+ Log.d(TAG, "Stderr drain ended: ${e.message}")
+ }
}, "qemu-stderr-drain").apply {
isDaemon = true
start()
@@ -130,19 +142,19 @@ class PodroidQemu @Inject constructor(
// After a short delay, mark as running if process is still alive
Thread.sleep(2000)
- if (process?.isAlive == true) {
+ if (proc.isAlive) {
Log.d(TAG, "QEMU is running!")
_state.value = VmState.Running
} else {
Log.e(TAG, "QEMU died immediately")
- val exitCode = process?.waitFor() ?: -1
+ val exitCode = proc.waitFor()
Log.e(TAG, "Exit code: $exitCode")
_state.value = VmState.Error("QEMU exited with code $exitCode")
return
}
// Wait for process to exit
- val exitCode = process?.waitFor() ?: -1
+ val exitCode = proc.waitFor()
Log.d(TAG, "QEMU exited with code: $exitCode")
process = null
consoleOutput = null
@@ -156,6 +168,29 @@ class PodroidQemu @Inject constructor(
}
}
+ private fun detectBootStage(text: String) {
+ when {
+ "Mounting persistent" in text || "Formatting" in text ->
+ _bootStage.value = "Mounting storage..."
+ "overlay" in text ->
+ _bootStage.value = "Setting up overlay..."
+ "Mounting filesystems" in text ->
+ _bootStage.value = "Mounting filesystems..."
+ "Loading kernel modules" in text ->
+ _bootStage.value = "Loading kernel modules..."
+ "Configuring containers" in text ->
+ _bootStage.value = "Configuring containers..."
+ "Waiting for network" in text ->
+ _bootStage.value = "Waiting for network..."
+ "Found eth0" in text || "Found" in text ->
+ _bootStage.value = "Network found"
+ "Podroid" in text && "Alpine" in text ->
+ _bootStage.value = "Almost ready..."
+ "Internet: OK" in text || "Ready!" in text ->
+ _bootStage.value = "Ready"
+ }
+ }
+
fun stop() {
// Send sync via serial console for graceful shutdown
try {
@@ -176,16 +211,18 @@ class PodroidQemu @Inject constructor(
process = null
consoleOutput = null
onConsoleOutput = null
+ _bootStage.value = ""
_state.value = VmState.Stopped
}
- private fun buildCommand(qemuExe: File, portForwards: List<PortForwardRule>): List<String> {
+ private fun buildCommand(qemuExe: File, portForwards: List<PortForwardRule>, ramMb: Int, cpus: Int): List<String> {
val args = mutableListOf<String>()
// Machine & CPU
args += "-M"; args += "virt"
args += "-cpu"; args += "max"
- args += "-m"; args += "1024"
+ args += "-smp"; args += "$cpus"
+ args += "-m"; args += "$ramMb"
args += "-accel"; args += "tcg,thread=multi"
// Kernel & Initrd (Podroid Core)
@@ -224,13 +261,13 @@ class PodroidQemu @Inject constructor(
args += "-netdev"; args += netdevArg
args += "-device"; args += "virtio-net,netdev=net0"
- // Serial console via stdio — bidirectional through process stdin/stdout
+ // Serial console via stdio
args += "-serial"; args += "stdio"
// Display (headless)
args += "-display"; args += "none"
- // QMP socket for management (port forwarding, VM control)
+ // QMP socket for management
args += "-qmp"
args += "unix:${context.filesDir.absolutePath}/qmp.sock,server,nowait"
@@ -240,6 +277,20 @@ class PodroidQemu @Inject constructor(
return listOf(qemuExe.absolutePath) + args
}
+ private fun ensureStorageImage() {
+ val storageFile = File(context.filesDir, "storage.img")
+ if (!storageFile.exists()) {
+ try {
+ java.io.RandomAccessFile(storageFile, "rw").use { raf ->
+ raf.setLength(2L * 1024 * 1024 * 1024) // 2GB sparse
+ }
+ Log.d(TAG, "Created storage.img")
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to create storage.img", e)
+ }
+ }
+ }
+
private fun qemuExecutable(): File? {
val nativeDir = context.applicationInfo.nativeLibraryDir
val exe = File(nativeDir, "libqemu-system-aarch64.so")
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 a647b7f..e7f5507 100644
--- a/app/src/main/java/com/excp/podroid/engine/QmpClient.kt
+++ b/app/src/main/java/com/excp/podroid/engine/QmpClient.kt
@@ -23,56 +23,46 @@ class QmpClient(private val socketPath: String) {
private const val TAG = "QmpClient"
}
- /**
- * Execute a QMP command and return the response.
- * Each call opens a new connection (QMP is stateless per-connection after capabilities).
- */
suspend fun execute(command: String, arguments: JSONObject? = null): Result<JSONObject> =
withContext(Dispatchers.IO) {
try {
- val socket = LocalSocket()
- socket.connect(
- LocalSocketAddress(socketPath, LocalSocketAddress.Namespace.FILESYSTEM)
- )
+ LocalSocket().use { socket ->
+ socket.connect(
+ LocalSocketAddress(socketPath, LocalSocketAddress.Namespace.FILESYSTEM)
+ )
- val reader = BufferedReader(InputStreamReader(socket.inputStream))
- val writer = OutputStreamWriter(socket.outputStream)
+ val reader = BufferedReader(InputStreamReader(socket.inputStream))
+ val writer = OutputStreamWriter(socket.outputStream)
- // Read QMP greeting
- val greeting = reader.readLine()
- Log.d(TAG, "QMP greeting: $greeting")
+ // Read QMP greeting
+ val greeting = reader.readLine()
+ Log.d(TAG, "QMP greeting: $greeting")
- // Send qmp_capabilities to enter command mode
- writer.write("{\"execute\":\"qmp_capabilities\"}\n")
- writer.flush()
- val capResponse = reader.readLine()
- Log.d(TAG, "Capabilities response: $capResponse")
+ // Send qmp_capabilities to enter command mode
+ writer.write("{\"execute\":\"qmp_capabilities\"}\n")
+ writer.flush()
+ val capResponse = reader.readLine()
+ Log.d(TAG, "Capabilities response: $capResponse")
- // Send the actual command
- val cmd = JSONObject().apply {
- put("execute", command)
- if (arguments != null) put("arguments", arguments)
- }
- writer.write(cmd.toString() + "\n")
- writer.flush()
+ // Send the actual command
+ val cmd = JSONObject().apply {
+ put("execute", command)
+ if (arguments != null) put("arguments", arguments)
+ }
+ writer.write(cmd.toString() + "\n")
+ writer.flush()
- val response = reader.readLine()
- Log.d(TAG, "Command response: $response")
+ val response = reader.readLine()
+ Log.d(TAG, "Command response: $response")
- socket.close()
- Result.success(JSONObject(response ?: "{}"))
+ Result.success(JSONObject(response ?: "{}"))
+ }
} catch (e: Exception) {
Log.e(TAG, "QMP command failed: $command", e)
Result.failure(e)
}
}
- /**
- * Add a port forward rule at runtime via QEMU monitor.
- * @param hostPort Port on the Android host
- * @param guestPort Port inside the VM
- * @param protocol "tcp" or "udp"
- */
suspend fun addPortForward(hostPort: Int, guestPort: Int, protocol: String = "tcp"): Result<JSONObject> {
val monitorCmd = "hostfwd_add net0 ${protocol}::${hostPort}-:${guestPort}"
return execute(
@@ -81,9 +71,6 @@ class QmpClient(private val socketPath: String) {
)
}
- /**
- * Remove a port forward rule at runtime via QEMU monitor.
- */
suspend fun removePortForward(hostPort: Int, protocol: String = "tcp"): Result<JSONObject> {
val monitorCmd = "hostfwd_remove net0 ${protocol}::${hostPort}"
return execute(
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 40808e9..af77b0b 100644
--- a/app/src/main/java/com/excp/podroid/service/PodroidService.kt
+++ b/app/src/main/java/com/excp/podroid/service/PodroidService.kt
@@ -19,6 +19,7 @@ import androidx.core.app.NotificationCompat
import com.excp.podroid.MainActivity
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 dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.*
@@ -29,6 +30,7 @@ class PodroidService : Service() {
@Inject lateinit var podroidQemu: PodroidQemu
@Inject lateinit var portForwardRepository: PortForwardRepository
+ @Inject lateinit var settingsRepository: SettingsRepository
private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
private var launchJob: Job? = null
@@ -66,7 +68,9 @@ class PodroidService : Service() {
withContext(Dispatchers.IO) {
try {
val rules = portForwardRepository.getRulesSnapshot()
- podroidQemu.start(rules)
+ val ramMb = settingsRepository.getVmRamMbSnapshot()
+ val cpus = settingsRepository.getVmCpusSnapshot()
+ podroidQemu.start(rules, ramMb, cpus)
} catch (e: Exception) {
Log.e(TAG, "QEMU failed to start", e)
}
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 58411f7..780975e 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
@@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.PowerSettingsNew
+import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.filled.Terminal
import androidx.compose.material3.Button
@@ -151,6 +152,24 @@ fun HomeScreen(
)
}
+ // Restart Button (only show when running)
+ if (isRunning) {
+ FilledTonalButton(
+ onClick = { viewModel.restartVm() },
+ modifier = Modifier
+ .fillMaxWidth()
+ .height(48.dp),
+ ) {
+ Icon(
+ imageVector = Icons.Default.Refresh,
+ contentDescription = null,
+ modifier = Modifier.size(20.dp),
+ )
+ Spacer(modifier = Modifier.width(8.dp))
+ Text("Restart VM")
+ }
+ }
+
// Error message
if (vmState is VmState.Error) {
Card(
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt
index 73c28b7..df6986b 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt
@@ -38,4 +38,13 @@ class HomeViewModel @Inject constructor(
fun stopVm() {
PodroidService.stop(context)
}
+
+ /** Restart the VM (stop then start). */
+ fun restartVm() {
+ PodroidService.stop(context)
+ // Start after a brief delay to allow stop to complete
+ android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
+ PodroidService.start(context)
+ }, 2000)
+ }
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
index c4683cf..d915101 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
@@ -22,6 +22,8 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.RestartAlt
+import androidx.compose.material.icons.filled.Share
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
@@ -33,6 +35,7 @@ import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Slider
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
@@ -48,6 +51,7 @@ import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.excp.podroid.BuildConfig
import com.excp.podroid.data.repository.PortForwardRule
import com.excp.podroid.engine.VmState
@@ -60,7 +64,15 @@ fun SettingsScreen(
val darkTheme by viewModel.darkTheme.collectAsStateWithLifecycle(false)
val portForwardRules by viewModel.portForwardRules.collectAsStateWithLifecycle()
val vmState by viewModel.vmState.collectAsStateWithLifecycle()
+ val vmRamMb by viewModel.vmRamMb.collectAsStateWithLifecycle()
+ val vmCpus by viewModel.vmCpus.collectAsStateWithLifecycle()
+ val terminalFontSize by viewModel.terminalFontSize.collectAsStateWithLifecycle()
var showAddDialog by remember { mutableStateOf(false) }
+ var showResetDialog by remember { mutableStateOf(false) }
+
+ val ramOptions = listOf(512, 1024, 2048, 4096)
+ val cpuOptions = listOf(1, 2, 4, 6, 8)
+ val vmNotRunning = vmState !is VmState.Running && vmState !is VmState.Starting
Scaffold(
topBar = {
@@ -94,6 +106,97 @@ fun SettingsScreen(
Spacer(Modifier.height(16.dp))
+ // Terminal Section
+ SettingsSectionHeader("Terminal")
+
+ Text(
+ text = "Font size: $terminalFontSize",
+ style = MaterialTheme.typography.bodyMedium,
+ )
+ Slider(
+ value = terminalFontSize.toFloat(),
+ onValueChange = { viewModel.setTerminalFontSize(it.toInt()) },
+ valueRange = 12f..40f,
+ steps = 13,
+ modifier = Modifier.fillMaxWidth(),
+ )
+
+ Spacer(Modifier.height(16.dp))
+
+ // VM Resources Section
+ SettingsSectionHeader("VM Resources")
+
+ if (!vmNotRunning) {
+ Text(
+ text = "Stop the VM to change these settings",
+ style = MaterialTheme.typography.labelSmall,
+ color = MaterialTheme.colorScheme.error,
+ modifier = Modifier.padding(bottom = 8.dp),
+ )
+ }
+
+ Text(
+ text = "Memory: ${vmRamMb} MB",
+ style = MaterialTheme.typography.bodyMedium,
+ )
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(vertical = 4.dp),
+ horizontalArrangement = Arrangement.spacedBy(8.dp),
+ ) {
+ ramOptions.forEach { ram ->
+ FilledTonalButton(
+ onClick = { viewModel.setVmRamMb(ram) },
+ enabled = vmNotRunning,
+ modifier = Modifier.weight(1f),
+ colors = if (vmRamMb == ram) {
+ androidx.compose.material3.ButtonDefaults.filledTonalButtonColors(
+ containerColor = MaterialTheme.colorScheme.primary,
+ contentColor = MaterialTheme.colorScheme.onPrimary,
+ )
+ } else {
+ androidx.compose.material3.ButtonDefaults.filledTonalButtonColors()
+ },
+ ) {
+ Text(if (ram >= 1024) "${ram / 1024}G" else "${ram}M", style = MaterialTheme.typography.labelSmall)
+ }
+ }
+ }
+
+ Spacer(Modifier.height(8.dp))
+
+ Text(
+ text = "CPU cores: $vmCpus",
+ style = MaterialTheme.typography.bodyMedium,
+ )
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(vertical = 4.dp),
+ horizontalArrangement = Arrangement.spacedBy(8.dp),
+ ) {
+ cpuOptions.forEach { cpu ->
+ FilledTonalButton(
+ onClick = { viewModel.setVmCpus(cpu) },
+ enabled = vmNotRunning,
+ modifier = Modifier.weight(1f),
+ colors = if (vmCpus == cpu) {
+ androidx.compose.material3.ButtonDefaults.filledTonalButtonColors(
+ containerColor = MaterialTheme.colorScheme.primary,
+ contentColor = MaterialTheme.colorScheme.onPrimary,
+ )
+ } else {
+ androidx.compose.material3.ButtonDefaults.filledTonalButtonColors()
+ },
+ ) {
+ Text("$cpu", style = MaterialTheme.typography.labelSmall)
+ }
+ }
+ }
+
+ Spacer(Modifier.height(16.dp))
+
// Port Forwarding Section
SettingsSectionHeader("Port Forwarding")
@@ -143,9 +246,48 @@ fun SettingsScreen(
Spacer(Modifier.height(16.dp))
+ // Diagnostics Section
+ SettingsSectionHeader("Diagnostics")
+
+ FilledTonalButton(
+ onClick = { viewModel.exportConsoleLogs() },
+ modifier = Modifier.fillMaxWidth(),
+ ) {
+ Icon(Icons.Default.Share, contentDescription = null)
+ Spacer(Modifier.width(8.dp))
+ Text("Export Console Log")
+ }
+
+ Spacer(Modifier.height(8.dp))
+
+ FilledTonalButton(
+ onClick = { showResetDialog = true },
+ enabled = vmNotRunning,
+ modifier = Modifier.fillMaxWidth(),
+ colors = androidx.compose.material3.ButtonDefaults.filledTonalButtonColors(
+ containerColor = MaterialTheme.colorScheme.errorContainer,
+ contentColor = MaterialTheme.colorScheme.onErrorContainer,
+ ),
+ ) {
+ Icon(Icons.Default.RestartAlt, contentDescription = null)
+ Spacer(Modifier.width(8.dp))
+ Text("Reset VM")
+ }
+
+ if (!vmNotRunning) {
+ Text(
+ text = "Stop the VM before resetting",
+ style = MaterialTheme.typography.labelSmall,
+ color = MaterialTheme.colorScheme.error,
+ modifier = Modifier.padding(top = 4.dp),
+ )
+ }
+
+ Spacer(Modifier.height(16.dp))
+
SettingsSectionHeader("About")
- SettingsInfoRow("Version", "1.0.0")
+ SettingsInfoRow("Version", BuildConfig.VERSION_NAME)
SettingsInfoRow("QEMU", "10.2.1")
SettingsInfoRow("Guest", "AArch64 (ARM64)")
SettingsInfoRow("Distro", "Alpine Linux")
@@ -165,6 +307,29 @@ fun SettingsScreen(
},
)
}
+
+ if (showResetDialog) {
+ AlertDialog(
+ onDismissRequest = { showResetDialog = false },
+ title = { Text("Reset VM") },
+ text = {
+ Text("This will delete all persistent storage including installed packages, containers, and data. The VM will start fresh on next boot.")
+ },
+ confirmButton = {
+ TextButton(onClick = {
+ viewModel.resetVm()
+ showResetDialog = false
+ }) {
+ Text("Reset", color = MaterialTheme.colorScheme.error)
+ }
+ },
+ dismissButton = {
+ TextButton(onClick = { showResetDialog = false }) {
+ Text("Cancel")
+ }
+ },
+ )
+ }
}
@Composable
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 682863b..69eea31 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
@@ -6,6 +6,9 @@
*/
package com.excp.podroid.ui.screens.settings
+import android.content.Context
+import android.content.Intent
+import androidx.core.content.FileProvider
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.excp.podroid.data.repository.PortForwardRepository
@@ -14,15 +17,18 @@ import com.excp.podroid.data.repository.SettingsRepository
import com.excp.podroid.engine.PodroidQemu
import com.excp.podroid.engine.VmState
import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
+import java.io.File
import javax.inject.Inject
@HiltViewModel
class SettingsViewModel @Inject constructor(
+ @ApplicationContext private val context: Context,
private val settingsRepository: SettingsRepository,
private val portForwardRepository: PortForwardRepository,
private val podroidQemu: PodroidQemu,
@@ -30,6 +36,15 @@ class SettingsViewModel @Inject constructor(
val darkTheme: Flow<Boolean> = settingsRepository.darkTheme
+ val vmRamMb: StateFlow<Int> = settingsRepository.vmRamMb
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 1024)
+
+ val vmCpus: StateFlow<Int> = settingsRepository.vmCpus
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 4)
+
+ val terminalFontSize: StateFlow<Int> = settingsRepository.terminalFontSize
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 24)
+
val portForwardRules: StateFlow<List<PortForwardRule>> = portForwardRepository.rules
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
@@ -40,11 +55,22 @@ class SettingsViewModel @Inject constructor(
viewModelScope.launch { settingsRepository.setDarkTheme(value) }
}
+ fun setVmRamMb(value: Int) {
+ viewModelScope.launch { settingsRepository.setVmRamMb(value) }
+ }
+
+ fun setVmCpus(value: Int) {
+ viewModelScope.launch { settingsRepository.setVmCpus(value) }
+ }
+
+ fun setTerminalFontSize(value: Int) {
+ viewModelScope.launch { settingsRepository.setTerminalFontSize(value) }
+ }
+
fun addPortForward(hostPort: Int, guestPort: Int, protocol: String = "tcp") {
val rule = PortForwardRule(hostPort, guestPort, protocol)
viewModelScope.launch {
portForwardRepository.addRule(rule)
- // If VM is running, apply immediately via QMP
if (podroidQemu.state.value is VmState.Running) {
podroidQemu.qmpClient.addPortForward(hostPort, guestPort, protocol)
}
@@ -54,10 +80,37 @@ class SettingsViewModel @Inject constructor(
fun removePortForward(rule: PortForwardRule) {
viewModelScope.launch {
portForwardRepository.removeRule(rule)
- // If VM is running, remove immediately via QMP
if (podroidQemu.state.value is VmState.Running) {
podroidQemu.qmpClient.removePortForward(rule.hostPort, rule.protocol)
}
}
}
+
+ fun resetVm() {
+ val storageFile = File(context.filesDir, "storage.img")
+ if (storageFile.exists()) {
+ storageFile.delete()
+ }
+ }
+
+ fun exportConsoleLogs() {
+ val logFile = File(context.filesDir, "console.log")
+ if (!logFile.exists()) return
+
+ val uri = FileProvider.getUriForFile(
+ context,
+ "${context.packageName}.fileprovider",
+ logFile,
+ )
+ val intent = Intent(Intent.ACTION_SEND).apply {
+ type = "text/plain"
+ putExtra(Intent.EXTRA_STREAM, uri)
+ putExtra(Intent.EXTRA_SUBJECT, "Podroid Console Log")
+ addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+ addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ }
+ context.startActivity(Intent.createChooser(intent, "Share console log").apply {
+ addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ })
+ }
}
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 ddab8c2..3812055 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
@@ -9,6 +9,8 @@ package com.excp.podroid.ui.screens.terminal
import android.app.Activity
import android.graphics.Typeface
import android.view.WindowManager
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.horizontalScroll
@@ -16,9 +18,11 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.ime
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.padding
@@ -27,9 +31,11 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
@@ -37,9 +43,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@@ -63,8 +66,8 @@ fun TerminalScreen(
) {
val context = LocalContext.current
val vmState by viewModel.vmState.collectAsState()
-
- val isVmRunning = vmState is VmState.Running
+ val bootStage by viewModel.bootStage.collectAsState()
+ val fontSize by viewModel.terminalFontSize.collectAsState()
// Keep screen on and adjust for soft keyboard
DisposableEffect(Unit) {
@@ -87,7 +90,13 @@ fun TerminalScreen(
TopAppBar(
title = { Text("Terminal", color = Color.White) },
navigationIcon = {
- IconButton(onClick = onNavigateBack) {
+ IconButton(onClick = {
+ // Hide keyboard before navigating back
+ val imm = context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE)
+ as android.view.inputmethod.InputMethodManager
+ (context as? Activity)?.currentFocus?.let { imm.hideSoftInputFromWindow(it.windowToken, 0) }
+ onNavigateBack()
+ }) {
Icon(
Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = "Back",
@@ -100,74 +109,178 @@ fun TerminalScreen(
),
)
- // Termux TerminalView
- if (!isVmRunning) {
- Box(
- modifier = Modifier
- .weight(1f)
- .fillMaxWidth(),
- contentAlignment = Alignment.Center
- ) {
- Column(horizontalAlignment = Alignment.CenterHorizontally) {
- Text(
- text = "VM Not Running",
- color = Color.Red,
- fontSize = 18.sp,
- fontWeight = FontWeight.Bold
- )
- Text(
- text = "Start the VM from Home screen first",
- color = Color.Gray,
- fontSize = 14.sp,
- modifier = Modifier.padding(top = 8.dp)
- )
+ when (vmState) {
+ is VmState.Idle, is VmState.Stopped -> {
+ // VM not running
+ Box(
+ modifier = Modifier
+ .weight(1f)
+ .fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ Column(horizontalAlignment = Alignment.CenterHorizontally) {
+ Text(
+ text = "VM Not Running",
+ color = Color.Red,
+ fontSize = 18.sp,
+ fontWeight = FontWeight.Bold
+ )
+ Text(
+ text = "Start the VM from Home screen first",
+ color = Color.Gray,
+ fontSize = 14.sp,
+ modifier = Modifier.padding(top = 8.dp)
+ )
+ }
+ }
+ }
+
+ is VmState.Starting -> {
+ // Loading screen with boot stage feedback
+ Box(
+ modifier = Modifier
+ .weight(1f)
+ .fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ modifier = Modifier.padding(32.dp)
+ ) {
+ CircularProgressIndicator(
+ color = Color(0xFF4FC3F7),
+ strokeWidth = 3.dp,
+ )
+ Spacer(modifier = Modifier.height(24.dp))
+ Text(
+ text = "Starting VM...",
+ color = Color.White,
+ fontSize = 18.sp,
+ fontWeight = FontWeight.Bold
+ )
+ Spacer(modifier = Modifier.height(12.dp))
+ Text(
+ text = bootStage.ifEmpty { "Initializing..." },
+ color = Color(0xFF4FC3F7),
+ fontSize = 14.sp,
+ )
+ Spacer(modifier = Modifier.height(24.dp))
+ LinearProgressIndicator(
+ modifier = Modifier
+ .fillMaxWidth(0.7f)
+ .height(4.dp)
+ .clip(RoundedCornerShape(2.dp)),
+ color = Color(0xFF4FC3F7),
+ trackColor = Color(0xFF333333),
+ )
+ }
+ }
+ }
+
+ is VmState.Error -> {
+ Box(
+ modifier = Modifier
+ .weight(1f)
+ .fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ Column(horizontalAlignment = Alignment.CenterHorizontally) {
+ Text(
+ text = "Error",
+ color = Color.Red,
+ fontSize = 18.sp,
+ fontWeight = FontWeight.Bold
+ )
+ Text(
+ text = (vmState as VmState.Error).message,
+ color = Color.Gray,
+ fontSize = 14.sp,
+ modifier = Modifier.padding(top = 8.dp, start = 16.dp, end = 16.dp),
+ textAlign = TextAlign.Center
+ )
+ }
}
}
- } else {
- AndroidView(
- factory = { ctx ->
- TerminalView(ctx, null).apply {
- setTextSize(24)
- setTypeface(Typeface.MONOSPACE)
- keepScreenOn = true
- isFocusable = true
- isFocusableInTouchMode = true
-
- // Create session wired to QEMU I/O (no host binaries)
- viewModel.createSession()
- viewModel.attachView(this)
- setTerminalViewClient(viewModel.viewClient)
-
- // Set session and emulator directly on the view
- // (avoid attachSession which calls JNI.setPtyWindowSize)
- val session = viewModel.session!!
- mTermSession = session
- mEmulator = session.emulator
-
- // Request focus so keyboard works
- requestFocus()
-
- // Resize emulator to match view after layout
- post {
- if (width > 0 && height > 0 && mRenderer != null) {
- try {
- val rendererClass = mRenderer.javaClass
- val fw = rendererClass.getDeclaredField("mFontWidth").apply { isAccessible = true }.getFloat(mRenderer)
- val fls = rendererClass.getDeclaredField("mFontLineSpacing").apply { isAccessible = true }.getInt(mRenderer)
- val flsa = rendererClass.getDeclaredField("mFontLineSpacingAndAscent").apply { isAccessible = true }.getInt(mRenderer)
- val cols = (width / fw).toInt().coerceAtLeast(4)
- val rows = ((height - flsa) / fls).coerceAtLeast(4)
- session.emulator?.resize(cols, rows)
- onScreenUpdated()
- } catch (_: Exception) {}
+
+ is VmState.Paused, is VmState.Saving, is VmState.Resuming -> {
+ // Treat like Starting — show progress
+ Box(
+ modifier = Modifier
+ .weight(1f)
+ .fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ Column(horizontalAlignment = Alignment.CenterHorizontally) {
+ CircularProgressIndicator(
+ color = Color(0xFF4FC3F7),
+ strokeWidth = 3.dp,
+ )
+ Spacer(modifier = Modifier.height(16.dp))
+ Text(
+ text = when (vmState) {
+ is VmState.Paused -> "VM Paused"
+ is VmState.Saving -> "Saving state..."
+ is VmState.Resuming -> "Resuming..."
+ else -> ""
+ },
+ color = Color.White,
+ fontSize = 18.sp,
+ fontWeight = FontWeight.Bold,
+ )
+ }
+ }
+ }
+
+ is VmState.Running -> {
+ // Terminal view
+ AndroidView(
+ factory = { ctx ->
+ TerminalView(ctx, null).apply {
+ setTextSize(fontSize)
+ setTypeface(Typeface.MONOSPACE)
+ keepScreenOn = true
+ isFocusable = true
+ isFocusableInTouchMode = true
+
+ // Create session wired to QEMU I/O (no host binaries)
+ viewModel.createSession()
+ viewModel.attachView(this)
+ setTerminalViewClient(viewModel.viewClient)
+
+ // Set session and emulator directly on the view
+ val sess = viewModel.session ?: return@apply
+ mTermSession = sess
+ mEmulator = sess.emulator
+
+ // Request focus so keyboard works
+ requestFocus()
+
+ // Resize emulator to match view after layout
+ post {
+ if (width > 0 && height > 0 && mRenderer != null) {
+ try {
+ val rendererClass = mRenderer.javaClass
+ val fw = rendererClass.getDeclaredField("mFontWidth").apply { isAccessible = true }.getFloat(mRenderer)
+ val fls = rendererClass.getDeclaredField("mFontLineSpacing").apply { isAccessible = true }.getInt(mRenderer)
+ val flsa = rendererClass.getDeclaredField("mFontLineSpacingAndAscent").apply { isAccessible = true }.getInt(mRenderer)
+ val cols = (width / fw).toInt().coerceAtLeast(4)
+ val rows = ((height - flsa) / fls).coerceAtLeast(4)
+ sess.emulator?.resize(cols, rows)
+ onScreenUpdated()
+ } catch (_: Exception) {}
+ }
}
}
- }
- },
- modifier = Modifier
- .weight(1f)
- .fillMaxWidth(),
- )
+ },
+ update = { view ->
+ view.setTextSize(fontSize)
+ view.onScreenUpdated()
+ },
+ modifier = Modifier
+ .weight(1f)
+ .fillMaxWidth(),
+ )
+ }
}
// Extra keys row
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 475b523..4ad4d3f 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
@@ -12,6 +12,7 @@ import android.system.Os
import android.util.Log
import android.view.KeyEvent
import android.view.MotionEvent
+import com.excp.podroid.data.repository.SettingsRepository
import com.excp.podroid.engine.PodroidQemu
import com.excp.podroid.engine.VmState
import com.termux.terminal.TerminalEmulator
@@ -22,7 +23,10 @@ import com.termux.view.TerminalViewClient
import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.stateIn
import java.io.OutputStream
import javax.inject.Inject
@@ -30,9 +34,13 @@ import javax.inject.Inject
class TerminalViewModel @Inject constructor(
@ApplicationContext private val context: Context,
private val qemu: PodroidQemu,
+ settingsRepository: SettingsRepository,
) : ViewModel() {
val vmState: StateFlow<VmState> = qemu.state
+ val bootStage: StateFlow<String> = qemu.bootStage
+ val terminalFontSize: StateFlow<Int> = settingsRepository.terminalFontSize
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 24)
private var terminalView: TerminalView? = null
private var emulator: TerminalEmulator? = null
@@ -50,8 +58,26 @@ class TerminalViewModel @Inject constructor(
}
override fun onTitleChanged(changedSession: TerminalSession) {}
override fun onSessionFinished(finishedSession: TerminalSession) {}
- override fun onCopyTextToClipboard(session: TerminalSession, text: String?) {}
- override fun onPasteTextFromClipboard(session: TerminalSession?) {}
+ override fun onCopyTextToClipboard(session: TerminalSession, text: String?) {
+ if (text != null) {
+ val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
+ clipboard.setPrimaryClip(android.content.ClipData.newPlainText("Terminal", text))
+ }
+ }
+ override fun onPasteTextFromClipboard(session: TerminalSession?) {
+ val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
+ val clip = clipboard.primaryClip
+ if (clip != null && clip.itemCount > 0) {
+ val text = clip.getItemAt(0).coerceToText(context).toString()
+ val bytes = text.toByteArray()
+ try {
+ qemuStdin?.write(bytes)
+ qemuStdin?.flush()
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to paste", e)
+ }
+ }
+ }
override fun onBell(session: TerminalSession) {}
override fun onColorsChanged(session: TerminalSession) {}
override fun onTerminalCursorStateChange(state: Boolean) {}
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
new file mode 100644
index 0000000..f16f0b7
--- /dev/null
+++ b/app/src/main/res/xml/file_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+ <files-path name="logs" path="." />
+</paths>
diff --git a/init-podroid b/init-podroid
index 102cff2..1d8d97a 100644
--- a/init-podroid
+++ b/init-podroid
@@ -7,6 +7,7 @@
if [ "$1" = "--main" ]; then
# ── Core filesystems ──
+echo "[init] Mounting filesystems..."
mount -t proc proc /proc -o noexec,nosuid,nodev
mount -t sysfs sys /sys -o noexec,nosuid,nodev
mount -t devtmpfs devtmpfs /dev -o exec,nosuid,mode=0755,size=2M 2>/dev/null || \
@@ -38,6 +39,7 @@ echo "podroid" > /etc/hostname
hostname podroid
# ── Kernel modules ──
+echo "[init] Loading kernel modules..."
KVER=$(uname -r)
if [ -d "/lib/modules/$KVER" ]; then
depmod -a 2>/dev/null
@@ -82,6 +84,7 @@ fi
echo "nameserver 8.8.8.8" > /etc/resolv.conf
echo "nameserver 1.1.1.1" >> /etc/resolv.conf
+echo "[init] Configuring containers..."
# ── Sysctl for container networking ──
sysctl -qw net.ipv4.ip_forward=1 2>/dev/null
sysctl -qw net.ipv4.conf.all.forwarding=1 2>/dev/null
@@ -143,7 +146,10 @@ fi
# ── Environment ──
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
export HOME=/root
-export TERM=vt100
+export TERM=xterm-256color
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+export CHARSET=UTF-8
export PODMAN_IGNORE_CGROUPSV1_WARNING=1
export CONTAINERS_CONF=/etc/containers/containers.conf
export CONTAINERS_STORAGE_CONF=/etc/containers/storage.conf
@@ -151,6 +157,7 @@ export CONTAINERS_REGISTRIES_CONF=/etc/containers/registries.conf
# ── Console settings ──
dmesg -n 1 2>/dev/null
+stty rows 24 cols 80 2>/dev/null
# ── Graceful shutdown handler ──
shutdown_handler() {
@@ -177,15 +184,13 @@ echo " DNS: 8.8.8.8"
echo " Persistent: ${PERSISTENT}"
echo ""
-# Quick connectivity check (background, don't block boot)
-{
- if wget -q -O /dev/null --timeout=8 http://dl-cdn.alpinelinux.org/alpine/MIRRORS.txt 2>/dev/null; then
- echo "[init] Internet: OK"
- else
- echo "[init] Internet: unavailable (ping won't work, use wget/curl)"
- fi
-} &
-
+# Quick connectivity check (synchronous so output doesn't overlap shell prompt)
+if wget -q -O /dev/null --timeout=5 http://dl-cdn.alpinelinux.org/alpine/MIRRORS.txt 2>/dev/null; then
+ echo " Internet: OK"
+else
+ echo " Internet: unavailable"
+fi
+echo ""
echo " Ready! Try: podman run --rm alpine echo hello"
echo ""
@@ -195,11 +200,15 @@ echo ""
cat > /etc/profile <<'PROF'
export HOME=/root
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-export TERM=linux
+export TERM=xterm-256color
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+export CHARSET=UTF-8
export PODMAN_IGNORE_CGROUPSV1_WARNING=1
export CONTAINERS_CONF=/etc/containers/containers.conf
export CONTAINERS_STORAGE_CONF=/etc/containers/storage.conf
export CONTAINERS_REGISTRIES_CONF=/etc/containers/registries.conf
+stty rows 24 cols 80 2>/dev/null
cd /root
PROF
@@ -209,7 +218,7 @@ grep -q '^root:' /etc/passwd 2>/dev/null || echo "root:x:0:0:root:/root:/bin/sh"
# Use getty to spawn a proper login shell on the serial console.
# getty sets up the controlling TTY correctly, enabling job control + Ctrl+C.
while true; do
- /sbin/getty -n -l /bin/sh 0 ttyAMA0 linux
+ /sbin/getty -n -l /bin/sh 0 ttyAMA0 xterm-256color
sleep 1
done
fi