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.5 with setup wizard, SSH, update checker, and compact MOTD

ExTv29de91968fbd
diff --git a/Dockerfile b/Dockerfile
index d8475fd..b99c7f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,6 +47,7 @@ RUN apk update && apk add --no-cache \
e2fsprogs \
util-linux \
openrc \
+ openssh \
ncurses-terminfo-base \
musl-locales
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ee79217..8b448d8 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 = 7
- versionName = "1.0.4"
+ versionCode = 8
+ versionName = "1.0.5"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/com/excp/podroid/MainActivity.kt b/app/src/main/java/com/excp/podroid/MainActivity.kt
index e77243d..db38645 100644
--- a/app/src/main/java/com/excp/podroid/MainActivity.kt
+++ b/app/src/main/java/com/excp/podroid/MainActivity.kt
@@ -1,9 +1,3 @@
-/*
- * Podroid - Rootless Podman for Android
- * Copyright (C) 2024 Podroid contributors
- *
- * Main activity for Podroid.
- */
package com.excp.podroid
import android.os.Bundle
@@ -28,9 +22,8 @@ class MainActivity : ComponentActivity() {
enableEdgeToEdge()
setContent {
val darkTheme by settingsRepository.darkTheme.collectAsState(initial = true)
-
PodroidTheme(darkTheme = darkTheme) {
- PodroidNavGraph()
+ PodroidNavGraph(settingsRepository = settingsRepository)
}
}
}
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 aee7b48..e59a8d5 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
@@ -28,10 +28,13 @@ 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 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 KEY_STORAGE_GB = intPreferencesKey("storage_gb")
+ val KEY_SETUP_DONE = booleanPreferencesKey("setup_done")
+ val KEY_SSH_ENABLED = booleanPreferencesKey("ssh_enabled")
}
val darkTheme: Flow<Boolean> = context.dataStore.data
@@ -46,6 +49,15 @@ class SettingsRepository @Inject constructor(
val terminalFontSize: Flow<Int> = context.dataStore.data
.map { it[KEY_FONT_SIZE] ?: 20 }
+ val storageSizeGb: Flow<Int> = context.dataStore.data
+ .map { it[KEY_STORAGE_GB] ?: 2 }
+
+ val isSetupDone: Flow<Boolean> = context.dataStore.data
+ .map { it[KEY_SETUP_DONE] ?: false }
+
+ val sshEnabled: Flow<Boolean> = context.dataStore.data
+ .map { it[KEY_SSH_ENABLED] ?: false }
+
suspend fun setDarkTheme(value: Boolean) =
context.dataStore.edit { it[KEY_DARK_THEME] = value }
@@ -58,9 +70,27 @@ class SettingsRepository @Inject constructor(
suspend fun setTerminalFontSize(value: Int) =
context.dataStore.edit { it[KEY_FONT_SIZE] = value }
+ suspend fun setStorageSizeGb(value: Int) =
+ context.dataStore.edit { it[KEY_STORAGE_GB] = value }
+
+ suspend fun markSetupDone() =
+ context.dataStore.edit { it[KEY_SETUP_DONE] = true }
+
+ suspend fun setSshEnabled(value: Boolean) =
+ context.dataStore.edit { it[KEY_SSH_ENABLED] = value }
+
+ suspend fun getSshEnabledSnapshot(): Boolean =
+ context.dataStore.data.map { it[KEY_SSH_ENABLED] ?: false }.first()
+
suspend fun getVmRamMbSnapshot(): Int =
context.dataStore.data.map { it[KEY_VM_RAM] ?: 512 }.first()
suspend fun getVmCpusSnapshot(): Int =
context.dataStore.data.map { it[KEY_VM_CPUS] ?: 1 }.first()
+
+ suspend fun getStorageSizeGbSnapshot(): Int =
+ context.dataStore.data.map { it[KEY_STORAGE_GB] ?: 2 }.first()
+
+ suspend fun isSetupDoneSnapshot(): Boolean =
+ context.dataStore.data.map { it[KEY_SETUP_DONE] ?: false }.first()
}
diff --git a/app/src/main/java/com/excp/podroid/data/repository/UpdateRepository.kt b/app/src/main/java/com/excp/podroid/data/repository/UpdateRepository.kt
new file mode 100644
index 0000000..cc1049b
--- /dev/null
+++ b/app/src/main/java/com/excp/podroid/data/repository/UpdateRepository.kt
@@ -0,0 +1,71 @@
+package com.excp.podroid.data.repository
+
+import android.content.Context
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+import java.net.URL
+import javax.inject.Inject
+import javax.inject.Singleton
+
+data class UpdateInfo(
+ val latestVersion: String,
+ val releaseUrl: String,
+)
+
+@Singleton
+class UpdateRepository @Inject constructor(
+ @ApplicationContext private val context: Context,
+) {
+ private val dismissedKey = stringPreferencesKey("dismissed_update_version")
+
+ suspend fun checkForUpdate(currentVersion: String): UpdateInfo? = withContext(Dispatchers.IO) {
+ try {
+ val json = URL("https://api.github.com/repos/ExTV/Podroid/releases/latest")
+ .openConnection()
+ .apply {
+ connectTimeout = 5000
+ readTimeout = 5000
+ setRequestProperty("Accept", "application/vnd.github+json")
+ }
+ .getInputStream()
+ .bufferedReader()
+ .readText()
+
+ val obj = JSONObject(json)
+ val tag = obj.getString("tag_name").trimStart('v')
+ val url = obj.getString("html_url")
+
+ if (isNewer(tag, currentVersion)) UpdateInfo(tag, url) else null
+ } catch (_: Exception) {
+ null
+ }
+ }
+
+ suspend fun isDismissed(version: String): Boolean {
+ val dismissed = context.dataStore.data.first()[dismissedKey]
+ return dismissed == version
+ }
+
+ suspend fun dismissUpdate(version: String) {
+ context.dataStore.edit { it[dismissedKey] = version }
+ }
+
+ /** Returns true if `latest` is a higher version than `current`. */
+ private fun isNewer(latest: String, current: String): Boolean {
+ val l = latest.substringBefore("-").split(".").map { it.toIntOrNull() ?: 0 }
+ val c = current.substringBefore("-").split(".").map { it.toIntOrNull() ?: 0 }
+ val maxLen = maxOf(l.size, c.size)
+ for (i in 0 until maxLen) {
+ val lv = l.getOrElse(i) { 0 }
+ val cv = c.getOrElse(i) { 0 }
+ if (lv > cv) return true
+ if (lv < cv) return false
+ }
+ return false
+ }
+}
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 aab537a..663381b 100644
--- a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
+++ b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
@@ -31,6 +31,7 @@ import javax.inject.Singleton
@Singleton
class PodroidQemu @Inject constructor(
@ApplicationContext private val context: Context,
+ private val settingsRepository: com.excp.podroid.data.repository.SettingsRepository,
) {
private val _state = MutableStateFlow<VmState>(VmState.Idle)
val state: StateFlow<VmState> = _state.asStateFlow()
@@ -85,7 +86,13 @@ class PodroidQemu @Inject constructor(
fun start() = start(emptyList())
- fun start(portForwards: List<PortForwardRule>, ramMb: Int = 512, cpus: Int = 1) {
+ fun start(
+ portForwards: List<PortForwardRule>,
+ ramMb: Int = 512,
+ cpus: Int = 1,
+ sshEnabled: Boolean = false,
+ androidIp: String = "unknown",
+ ) {
if (_state.value is VmState.Starting || _state.value is VmState.Running) {
Log.w(TAG, "start() called while VM is ${_state.value}, ignoring")
return
@@ -104,7 +111,7 @@ class PodroidQemu @Inject constructor(
_bootStage.value = "Starting QEMU..."
try {
- val cmd = buildCommand(qemuExe, portForwards, ramMb, cpus)
+ val cmd = buildCommand(qemuExe, portForwards, ramMb, cpus, sshEnabled, androidIp)
Log.d(TAG, "Launching: ${cmd.joinToString(" ")}")
val nativeDir = context.applicationInfo.nativeLibraryDir
@@ -239,8 +246,6 @@ class PodroidQemu @Inject constructor(
_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 ->
@@ -249,11 +254,11 @@ class PodroidQemu @Inject constructor(
_bootStage.value = "Waiting for network..."
"Found" in text && "eth" in text ->
_bootStage.value = "Network found"
- "Internet:" in text ->
- _bootStage.value = "Checking internet..."
- "Podroid" in text && "Alpine" in text ->
+ "Starting SSH" in text ->
+ _bootStage.value = "Starting SSH..."
+ "internet " in text || "Internet:" in text ->
_bootStage.value = "Almost ready..."
- "Ready!" in text ->
+ "podman run" in text || "Ready!" in text ->
_bootStage.value = "Ready"
}
}
@@ -299,6 +304,8 @@ class PodroidQemu @Inject constructor(
portForwards: List<PortForwardRule>,
ramMb: Int,
cpus: Int,
+ sshEnabled: Boolean = false,
+ androidIp: String = "unknown",
): List<String> {
val args = mutableListOf<String>()
@@ -313,7 +320,12 @@ class PodroidQemu @Inject constructor(
if (kernelPath.exists()) {
args += "-kernel"; args += kernelPath.absolutePath
- args += "-append"; args += "console=ttyAMA0 loglevel=1 quiet"
+ val cmdline = buildString {
+ append("console=ttyAMA0 loglevel=1 quiet")
+ append(" androidip=$androidIp")
+ if (sshEnabled) append(" ssh=1")
+ }
+ args += "-append"; args += cmdline
} else {
Log.w(TAG, "Kernel not found!")
}
@@ -350,15 +362,27 @@ class PodroidQemu @Inject constructor(
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)
- }
- Log.d(TAG, "Created storage.img")
- } catch (e: Exception) {
- Log.e(TAG, "Failed to create storage.img", e)
+ val gb = kotlinx.coroutines.runBlocking {
+ settingsRepository.getStorageSizeGbSnapshot().toLong()
+ }
+ val desiredBytes = gb * 1024L * 1024L * 1024L
+
+ if (storageFile.exists()) {
+ if (storageFile.length() == desiredBytes) {
+ Log.d(TAG, "storage.img already correct size (${gb}GB)")
+ return
+ }
+ Log.d(TAG, "storage.img size mismatch (is ${storageFile.length() / (1024*1024*1024)}GB, want ${gb}GB) — recreating")
+ storageFile.delete()
+ }
+
+ try {
+ java.io.RandomAccessFile(storageFile, "rw").use { raf ->
+ raf.setLength(desiredBytes)
}
+ Log.d(TAG, "Created storage.img (${gb}GB)")
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to create storage.img", e)
}
}
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 d750360..bf4a02d 100644
--- a/app/src/main/java/com/excp/podroid/service/PodroidService.kt
+++ b/app/src/main/java/com/excp/podroid/service/PodroidService.kt
@@ -122,10 +122,18 @@ class PodroidService : Service() {
launchJob = serviceScope.launch {
withContext(Dispatchers.IO) {
try {
- val rules = portForwardRepository.getRulesSnapshot()
+ val rules = portForwardRepository.getRulesSnapshot().toMutableList()
val ramMb = settingsRepository.getVmRamMbSnapshot()
val cpus = settingsRepository.getVmCpusSnapshot()
- podroidQemu.start(rules, ramMb, cpus)
+ val sshEnabled = settingsRepository.getSshEnabledSnapshot()
+
+ // Auto-inject SSH port forward when SSH is enabled
+ if (sshEnabled && rules.none { it.hostPort == SSH_HOST_PORT }) {
+ rules.add(com.excp.podroid.data.repository.PortForwardRule(SSH_HOST_PORT, 22, "tcp"))
+ }
+
+ val androidIp = getAndroidLocalIp()
+ podroidQemu.start(rules, ramMb, cpus, sshEnabled, androidIp)
} catch (e: Exception) {
Log.e(TAG, "QEMU failed to start", e)
}
@@ -137,6 +145,16 @@ class PodroidService : Service() {
}
}
+ private fun getAndroidLocalIp(): String {
+ return try {
+ java.net.NetworkInterface.getNetworkInterfaces()
+ ?.asSequence()
+ ?.flatMap { it.inetAddresses.asSequence() }
+ ?.firstOrNull { !it.isLoopbackAddress && it is java.net.Inet4Address }
+ ?.hostAddress ?: "unknown"
+ } catch (_: Exception) { "unknown" }
+ }
+
private fun createNotificationChannel() {
val channel = NotificationChannel(
CHANNEL_ID,
@@ -183,8 +201,9 @@ class PodroidService : Service() {
private const val CHANNEL_ID = "podroid_service"
private const val NOTIFICATION_ID = 1001
- const val ACTION_START = "com.excp.podroid.action.START"
- const val ACTION_STOP = "com.excp.podroid.action.STOP"
+ const val ACTION_START = "com.excp.podroid.action.START"
+ const val ACTION_STOP = "com.excp.podroid.action.STOP"
+ const val SSH_HOST_PORT = 9922
fun start(context: Context) {
val intent = Intent(context, PodroidService::class.java).apply {
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 7192175..3eba168 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
@@ -1,22 +1,23 @@
-/*
- * Podroid - Rootless Podman for Android
- * Copyright (C) 2024 Podroid contributors
- *
- * Simplified navigation for Podroid.
- */
package com.excp.podroid.ui.navigation
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
+import com.excp.podroid.data.repository.SettingsRepository
import com.excp.podroid.ui.screens.home.HomeScreen
import com.excp.podroid.ui.screens.settings.SettingsScreen
+import com.excp.podroid.ui.screens.setup.SetupScreen
import com.excp.podroid.ui.screens.terminal.TerminalScreen
+import javax.inject.Inject
-/** Navigation route definitions. */
object Routes {
+ const val SETUP = "setup"
const val HOME = "home"
const val TERMINAL = "terminal"
const val SETTINGS = "settings"
@@ -24,23 +25,39 @@ object Routes {
@Composable
fun PodroidNavGraph(
+ settingsRepository: SettingsRepository,
navController: NavHostController = rememberNavController(),
) {
+ val isSetupDone by settingsRepository.isSetupDone.collectAsState(initial = null)
+
+ // Wait until we know whether setup is done before deciding the start destination
+ val startDestination = when (isSetupDone) {
+ true -> Routes.HOME
+ false -> Routes.SETUP
+ null -> return // still loading — render nothing to avoid flicker
+ }
+
NavHost(
navController = navController,
- startDestination = Routes.HOME,
+ startDestination = startDestination,
) {
+ composable(Routes.SETUP) {
+ SetupScreen(
+ onSetupComplete = {
+ navController.navigate(Routes.HOME) {
+ popUpTo(Routes.SETUP) { inclusive = true }
+ }
+ },
+ )
+ }
+
composable(Routes.HOME) {
HomeScreen(
onNavigateToTerminal = {
- navController.navigate(Routes.TERMINAL) {
- launchSingleTop = true
- }
+ navController.navigate(Routes.TERMINAL) { launchSingleTop = true }
},
onNavigateToSettings = {
- navController.navigate(Routes.SETTINGS) {
- launchSingleTop = true
- }
+ navController.navigate(Routes.SETTINGS) { launchSingleTop = true }
},
)
}
@@ -48,7 +65,6 @@ fun PodroidNavGraph(
composable(Routes.TERMINAL) {
TerminalScreen(
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 }
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 b3756d0..347b2b4 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
@@ -1,11 +1,7 @@
-/*
- * Podroid - Rootless Podman for Android
- * Copyright (C) 2024 Podroid contributors
- *
- * Home screen with Start/Stop button and web terminal link.
- */
package com.excp.podroid.ui.screens.home
+import android.content.Intent
+import android.net.Uri
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
@@ -15,11 +11,14 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
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.SystemUpdate
import androidx.compose.material.icons.filled.Terminal
+import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
@@ -32,15 +31,19 @@ import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
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.engine.VmState
@OptIn(ExperimentalMaterial3Api::class)
@@ -50,22 +53,46 @@ fun HomeScreen(
onNavigateToSettings: () -> Unit,
viewModel: HomeViewModel = hiltViewModel(),
) {
+ val context = LocalContext.current
val vmState by viewModel.vmState.collectAsStateWithLifecycle()
val bootStage by viewModel.bootStage.collectAsStateWithLifecycle()
+ val updateInfo by viewModel.updateInfo.collectAsStateWithLifecycle()
val isRunning = vmState is VmState.Running
val isStarting = vmState is VmState.Starting
+ // Update dialog
+ updateInfo?.let { info ->
+ AlertDialog(
+ onDismissRequest = { viewModel.dismissUpdate() },
+ icon = { Icon(Icons.Default.SystemUpdate, contentDescription = null) },
+ title = { Text("Update available") },
+ text = {
+ Text("Version ${info.latestVersion} is available. You have ${BuildConfig.VERSION_NAME}.")
+ },
+ confirmButton = {
+ Button(onClick = {
+ context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(info.releaseUrl)))
+ viewModel.dismissUpdate()
+ }) {
+ Text("Download")
+ }
+ },
+ dismissButton = {
+ TextButton(onClick = { viewModel.dismissUpdate() }) {
+ Text("Later")
+ }
+ },
+ )
+ }
+
Scaffold(
topBar = {
TopAppBar(
title = { Text("Podroid") },
actions = {
IconButton(onClick = onNavigateToSettings) {
- Icon(
- imageVector = Icons.Default.Settings,
- contentDescription = "Settings"
- )
+ Icon(Icons.Default.Settings, contentDescription = "Settings")
}
},
)
@@ -75,115 +102,103 @@ fun HomeScreen(
modifier = Modifier
.fillMaxSize()
.padding(innerPadding)
- .padding(16.dp),
+ .padding(horizontal = 24.dp),
horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.spacedBy(24.dp),
+ verticalArrangement = Arrangement.spacedBy(20.dp),
) {
- Spacer(modifier = Modifier.height(32.dp))
+ Spacer(modifier = Modifier.height(24.dp))
- // Status Icon
+ // Status icon
when {
- isStarting -> {
- CircularProgressIndicator(
- modifier = Modifier.size(80.dp),
- strokeWidth = 6.dp,
- )
- }
- isRunning -> {
- Icon(
- imageVector = Icons.Default.Terminal,
- contentDescription = null,
- modifier = Modifier.size(80.dp),
- tint = MaterialTheme.colorScheme.primary,
- )
- }
- else -> {
- Icon(
- imageVector = Icons.Default.Terminal,
- contentDescription = null,
- modifier = Modifier.size(80.dp),
- tint = MaterialTheme.colorScheme.onSurfaceVariant,
- )
- }
+ isStarting -> CircularProgressIndicator(
+ modifier = Modifier.size(72.dp),
+ strokeWidth = 5.dp,
+ )
+ else -> Icon(
+ imageVector = Icons.Default.Terminal,
+ contentDescription = null,
+ modifier = Modifier.size(72.dp),
+ tint = if (isRunning)
+ MaterialTheme.colorScheme.primary
+ else
+ MaterialTheme.colorScheme.onSurfaceVariant,
+ )
}
- // Status Text
- Text(
- text = when {
- isStarting -> "Starting Podman..."
- isRunning -> "Podman is running"
- else -> "Ready to start"
- },
- style = MaterialTheme.typography.headlineSmall,
- color = when {
- isStarting -> MaterialTheme.colorScheme.primary
- isRunning -> MaterialTheme.colorScheme.primary
- else -> MaterialTheme.colorScheme.onSurfaceVariant
- },
- )
-
- // Boot stage indicator
- if (isStarting && bootStage.isNotEmpty()) {
+ // Status text
+ Column(horizontalAlignment = Alignment.CenterHorizontally) {
Text(
- text = bootStage,
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onSurfaceVariant,
+ text = when {
+ isStarting -> "Starting…"
+ isRunning -> "VM is running"
+ else -> "VM is stopped"
+ },
+ style = MaterialTheme.typography.headlineSmall,
+ fontWeight = FontWeight.SemiBold,
+ color = when {
+ isStarting -> MaterialTheme.colorScheme.primary
+ isRunning -> MaterialTheme.colorScheme.primary
+ else -> MaterialTheme.colorScheme.onSurfaceVariant
+ },
)
+
+ if (isStarting && bootStage.isNotEmpty()) {
+ Spacer(Modifier.height(4.dp))
+ Text(
+ text = bootStage,
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ )
+ }
}
- // Start/Stop Button
+ // Start / Stop button
Button(
onClick = {
- if (isRunning || isStarting) {
- viewModel.stopVm()
- } else {
- viewModel.startPodroid()
- }
+ if (isRunning || isStarting) viewModel.stopVm()
+ else viewModel.startPodroid()
},
modifier = Modifier
.fillMaxWidth()
.height(56.dp),
+ shape = RoundedCornerShape(16.dp),
colors = ButtonDefaults.buttonColors(
containerColor = if (isRunning || isStarting)
MaterialTheme.colorScheme.error
else
- MaterialTheme.colorScheme.primary
+ MaterialTheme.colorScheme.primary,
),
) {
- Icon(
- imageVector = Icons.Default.PowerSettingsNew,
- contentDescription = null,
- modifier = Modifier.size(24.dp),
- )
- Spacer(modifier = Modifier.width(8.dp))
+ Icon(Icons.Default.PowerSettingsNew, contentDescription = null,
+ modifier = Modifier.size(22.dp))
+ Spacer(Modifier.width(10.dp))
Text(
- text = if (isRunning || isStarting) "Stop Podman" else "Start Podman",
+ text = if (isRunning || isStarting) "Stop VM" else "Start VM",
style = MaterialTheme.typography.titleMedium,
)
}
- // Restart Button (only show when running)
+ // Restart button
if (isRunning) {
FilledTonalButton(
onClick = { viewModel.restartVm() },
modifier = Modifier
.fillMaxWidth()
.height(48.dp),
+ shape = RoundedCornerShape(16.dp),
) {
- Icon(
- imageVector = Icons.Default.Refresh,
- contentDescription = null,
- modifier = Modifier.size(20.dp),
- )
- Spacer(modifier = Modifier.width(8.dp))
+ Icon(Icons.Default.Refresh, contentDescription = null,
+ modifier = Modifier.size(20.dp))
+ Spacer(Modifier.width(8.dp))
Text("Restart VM")
}
}
- // Error message with retry
+ // Error card
if (vmState is VmState.Error) {
Card(
modifier = Modifier.fillMaxWidth(),
+ shape = RoundedCornerShape(16.dp),
colors = CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.errorContainer,
),
@@ -194,39 +209,33 @@ fun HomeScreen(
color = MaterialTheme.colorScheme.onErrorContainer,
style = MaterialTheme.typography.bodyMedium,
)
- Spacer(modifier = Modifier.height(12.dp))
+ Spacer(Modifier.height(12.dp))
Button(
onClick = { viewModel.startPodroid() },
modifier = Modifier.fillMaxWidth(),
+ shape = RoundedCornerShape(12.dp),
) {
- Icon(
- imageVector = Icons.Default.Refresh,
- contentDescription = null,
- modifier = Modifier.size(20.dp),
- )
- Spacer(modifier = Modifier.width(8.dp))
- Text("Retry")
+ Icon(Icons.Default.Refresh, contentDescription = null,
+ modifier = Modifier.size(18.dp))
+ Spacer(Modifier.width(8.dp))
+ Text("Try again")
}
}
}
}
- Spacer(modifier = Modifier.height(16.dp))
-
- // Terminal button (only show when running)
+ // Open Terminal button
if (isRunning) {
FilledTonalButton(
onClick = onNavigateToTerminal,
modifier = Modifier
.fillMaxWidth()
.height(56.dp),
+ shape = RoundedCornerShape(16.dp),
) {
- Icon(
- imageVector = Icons.Default.Terminal,
- contentDescription = null,
- modifier = Modifier.size(24.dp),
- )
- Spacer(modifier = Modifier.width(8.dp))
+ Icon(Icons.Default.Terminal, contentDescription = null,
+ modifier = Modifier.size(22.dp))
+ Spacer(Modifier.width(10.dp))
Text(
text = "Open Terminal",
style = MaterialTheme.typography.titleMedium,
@@ -236,13 +245,14 @@ fun HomeScreen(
Spacer(modifier = Modifier.weight(1f))
- // Info text
Text(
- text = "Podroid runs a headless Alpine Linux VM with Podman.\nAccess containers via the serial terminal.",
+ text = "Alpine Linux · Podman · QEMU",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
)
+
+ Spacer(Modifier.height(8.dp))
}
}
}
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 356eef9..f1a1b59 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
@@ -1,21 +1,21 @@
-/*
- * Podroid - Rootless Podman for Android
- * Copyright (C) 2024 Podroid contributors
- *
- * Home screen ViewModel for Podroid.
- */
package com.excp.podroid.ui.screens.home
import android.content.Context
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
+import com.excp.podroid.BuildConfig
+import com.excp.podroid.data.repository.UpdateInfo
+import com.excp.podroid.data.repository.UpdateRepository
import com.excp.podroid.engine.PodroidQemu
import com.excp.podroid.engine.VmState
import com.excp.podroid.service.PodroidService
import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
import javax.inject.Inject
@@ -24,6 +24,7 @@ import javax.inject.Inject
class HomeViewModel @Inject constructor(
@ApplicationContext private val context: Context,
private val podroidQemu: PodroidQemu,
+ private val updateRepository: UpdateRepository,
) : ViewModel() {
val vmState: StateFlow<VmState> = podroidQemu.state
@@ -32,12 +33,34 @@ class HomeViewModel @Inject constructor(
val bootStage: StateFlow<String> = podroidQemu.bootStage
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), "")
- /** Start Podroid (the Podman VM). */
+ private val _updateInfo = MutableStateFlow<UpdateInfo?>(null)
+ val updateInfo: StateFlow<UpdateInfo?> = _updateInfo.asStateFlow()
+
+ init {
+ checkForUpdate()
+ }
+
+ private fun checkForUpdate() {
+ viewModelScope.launch {
+ val info = updateRepository.checkForUpdate(BuildConfig.VERSION_NAME) ?: return@launch
+ if (!updateRepository.isDismissed(info.latestVersion)) {
+ _updateInfo.value = info
+ }
+ }
+ }
+
+ fun dismissUpdate() {
+ val version = _updateInfo.value?.latestVersion ?: return
+ _updateInfo.value = null
+ viewModelScope.launch {
+ updateRepository.dismissUpdate(version)
+ }
+ }
+
fun startPodroid() {
PodroidService.start(context)
}
- /** Stop the running Podman VM. */
fun stopVm() {
PodroidService.stop(context)
}
@@ -45,7 +68,7 @@ class HomeViewModel @Inject constructor(
fun restartVm() {
PodroidService.stop(context)
viewModelScope.launch {
- kotlinx.coroutines.delay(2000)
+ delay(2000)
PodroidService.start(context)
}
}
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 a58551b..495ae57 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
@@ -1,9 +1,3 @@
-/*
- * Podroid - Rootless Podman for Android
- * Copyright (C) 2024 Podroid contributors
- *
- * Settings screen for Podroid.
- */
package com.excp.podroid.ui.screens.settings
import androidx.compose.foundation.layout.Arrangement
@@ -25,6 +19,7 @@ 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.ButtonDefaults
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -47,6 +42,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -55,6 +51,8 @@ import com.excp.podroid.BuildConfig
import com.excp.podroid.data.repository.PortForwardRule
import com.excp.podroid.engine.VmState
+private val storageSizes = listOf(2, 4, 8, 16, 32, 64)
+
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SettingsScreen(
@@ -67,6 +65,8 @@ fun SettingsScreen(
val vmRamMb by viewModel.vmRamMb.collectAsStateWithLifecycle()
val vmCpus by viewModel.vmCpus.collectAsStateWithLifecycle()
val terminalFontSize by viewModel.terminalFontSize.collectAsStateWithLifecycle()
+ val storageSizeGb by viewModel.storageSizeGb.collectAsStateWithLifecycle()
+ val sshEnabled by viewModel.sshEnabled.collectAsStateWithLifecycle(false)
var showAddDialog by remember { mutableStateOf(false) }
var showResetDialog by remember { mutableStateOf(false) }
@@ -95,22 +95,23 @@ fun SettingsScreen(
) {
Spacer(Modifier.height(8.dp))
- SettingsSectionHeader("Display")
+ // ── Display ──────────────────────────────────────────────
+ SettingsSectionHeader("Appearance")
SettingsSwitchRow(
title = "Dark theme",
- subtitle = "Use dark color scheme",
+ subtitle = "Use a dark color scheme",
checked = darkTheme,
onCheckedChange = { viewModel.setDarkTheme(it) },
)
Spacer(Modifier.height(16.dp))
- // Terminal Section
+ // ── Terminal ─────────────────────────────────────────────
SettingsSectionHeader("Terminal")
Text(
- text = "Font size: $terminalFontSize",
+ text = "Font size: $terminalFontSize sp",
style = MaterialTheme.typography.bodyMedium,
)
Slider(
@@ -123,12 +124,12 @@ fun SettingsScreen(
Spacer(Modifier.height(16.dp))
- // VM Resources Section
+ // ── VM Resources ─────────────────────────────────────────
SettingsSectionHeader("VM Resources")
if (!vmNotRunning) {
Text(
- text = "Stop the VM to change these settings",
+ text = "Stop the VM to change these settings.",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.error,
modifier = Modifier.padding(bottom = 8.dp),
@@ -136,7 +137,7 @@ fun SettingsScreen(
}
Text(
- text = "Memory: ${vmRamMb} MB",
+ text = "Memory: $vmRamMb MB",
style = MaterialTheme.typography.bodyMedium,
)
Row(
@@ -151,15 +152,18 @@ fun SettingsScreen(
enabled = vmNotRunning,
modifier = Modifier.weight(1f),
colors = if (vmRamMb == ram) {
- androidx.compose.material3.ButtonDefaults.filledTonalButtonColors(
+ ButtonDefaults.filledTonalButtonColors(
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary,
)
} else {
- androidx.compose.material3.ButtonDefaults.filledTonalButtonColors()
+ ButtonDefaults.filledTonalButtonColors()
},
) {
- Text(if (ram >= 1024) "${ram / 1024}G" else "${ram}M", style = MaterialTheme.typography.labelSmall)
+ Text(
+ if (ram >= 1024) "${ram / 1024}G" else "${ram}M",
+ style = MaterialTheme.typography.labelSmall,
+ )
}
}
}
@@ -182,12 +186,12 @@ fun SettingsScreen(
enabled = vmNotRunning,
modifier = Modifier.weight(1f),
colors = if (vmCpus == cpu) {
- androidx.compose.material3.ButtonDefaults.filledTonalButtonColors(
+ ButtonDefaults.filledTonalButtonColors(
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary,
)
} else {
- androidx.compose.material3.ButtonDefaults.filledTonalButtonColors()
+ ButtonDefaults.filledTonalButtonColors()
},
) {
Text("$cpu", style = MaterialTheme.typography.labelSmall)
@@ -195,14 +199,40 @@ fun SettingsScreen(
}
}
+ Spacer(Modifier.height(8.dp))
+
+ // SSH
+ SettingsSwitchRow(
+ title = "Enable SSH",
+ subtitle = if (sshEnabled)
+ "ssh root@<phone-ip> -p 9922 | password: podroid"
+ else
+ "Access the VM over your local network via SSH",
+ checked = sshEnabled,
+ onCheckedChange = { viewModel.setSshEnabled(it) },
+ )
+
+ Spacer(Modifier.height(4.dp))
+
+ // Storage size (read-only — set at first boot)
+ Text(
+ text = "Persistent storage: $storageSizeGb GB",
+ style = MaterialTheme.typography.bodyMedium,
+ )
+ Text(
+ text = "Set during initial setup. Reset the VM to change.",
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ modifier = Modifier.padding(top = 2.dp, bottom = 8.dp),
+ )
+
Spacer(Modifier.height(16.dp))
- // Port Forwarding Section
+ // ── Port Forwarding ───────────────────────────────────────
SettingsSectionHeader("Port Forwarding")
Text(
- text = "Forward ports from the VM to your Android device. " +
- "Changes apply immediately if the VM is running.",
+ text = "Forward ports from the VM to your Android device. Rules apply immediately when the VM is running.",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(bottom = 8.dp),
@@ -210,7 +240,7 @@ fun SettingsScreen(
if (portForwardRules.isEmpty()) {
Text(
- text = "No port forwards configured",
+ text = "No rules configured.",
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(vertical = 8.dp),
@@ -237,7 +267,7 @@ fun SettingsScreen(
if (vmState is VmState.Running) {
Text(
- text = "VM is running - changes apply immediately via QMP",
+ text = "VM is running — new rules take effect immediately.",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.primary,
modifier = Modifier.padding(top = 4.dp),
@@ -246,7 +276,7 @@ fun SettingsScreen(
Spacer(Modifier.height(16.dp))
- // Diagnostics Section
+ // ── Diagnostics ───────────────────────────────────────────
SettingsSectionHeader("Diagnostics")
FilledTonalButton(
@@ -264,19 +294,19 @@ fun SettingsScreen(
onClick = { showResetDialog = true },
enabled = vmNotRunning,
modifier = Modifier.fillMaxWidth(),
- colors = androidx.compose.material3.ButtonDefaults.filledTonalButtonColors(
+ colors = ButtonDefaults.filledTonalButtonColors(
containerColor = MaterialTheme.colorScheme.errorContainer,
contentColor = MaterialTheme.colorScheme.onErrorContainer,
),
) {
Icon(Icons.Default.RestartAlt, contentDescription = null)
Spacer(Modifier.width(8.dp))
- Text("Reset VM")
+ Text("Reset VM Storage")
}
if (!vmNotRunning) {
Text(
- text = "Stop the VM before resetting",
+ text = "Stop the VM before resetting.",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.error,
modifier = Modifier.padding(top = 4.dp),
@@ -285,14 +315,15 @@ fun SettingsScreen(
Spacer(Modifier.height(16.dp))
+ // ── About ─────────────────────────────────────────────────
SettingsSectionHeader("About")
SettingsInfoRow("Version", BuildConfig.VERSION_NAME)
SettingsInfoRow("QEMU", "10.2.1")
- SettingsInfoRow("Guest", "AArch64 (ARM64)")
- SettingsInfoRow("Distro", "Alpine Linux 3.23")
- SettingsInfoRow("Container", "Podman + crun")
- SettingsInfoRow("Storage", "2GB persistent (overlay)")
+ SettingsInfoRow("Architecture", "AArch64 (ARM64)")
+ SettingsInfoRow("Linux distro", "Alpine Linux 3.23")
+ SettingsInfoRow("Container runtime", "Podman + crun")
+ SettingsInfoRow("Storage", "$storageSizeGb GB persistent overlay")
Spacer(Modifier.height(32.dp))
}
@@ -311,9 +342,12 @@ fun SettingsScreen(
if (showResetDialog) {
AlertDialog(
onDismissRequest = { showResetDialog = false },
- title = { Text("Reset VM") },
+ title = { Text("Reset VM storage?") },
text = {
- Text("This will delete all persistent storage including installed packages, containers, and data. The VM will start fresh on next boot.")
+ Text(
+ "This permanently deletes all persistent data — installed packages, " +
+ "container images, and files. The VM will start fresh on next boot."
+ )
},
confirmButton = {
TextButton(onClick = {
@@ -333,10 +367,7 @@ fun SettingsScreen(
}
@Composable
-private fun PortForwardRuleRow(
- rule: PortForwardRule,
- onDelete: () -> Unit,
-) {
+private fun PortForwardRuleRow(rule: PortForwardRule, onDelete: () -> Unit) {
Card(
modifier = Modifier
.fillMaxWidth()
@@ -353,8 +384,9 @@ private fun PortForwardRuleRow(
) {
Column(modifier = Modifier.weight(1f)) {
Text(
- text = "Host :${rule.hostPort} -> VM :${rule.guestPort}",
+ text = "localhost:${rule.hostPort} → VM:${rule.guestPort}",
style = MaterialTheme.typography.bodyMedium,
+ fontWeight = FontWeight.Medium,
)
Text(
text = rule.protocol.uppercase(),
@@ -365,7 +397,7 @@ private fun PortForwardRuleRow(
IconButton(onClick = onDelete) {
Icon(
Icons.Default.Delete,
- contentDescription = "Remove",
+ contentDescription = "Remove rule",
tint = MaterialTheme.colorScheme.error,
)
}
@@ -384,13 +416,14 @@ private fun AddPortForwardDialog(
AlertDialog(
onDismissRequest = onDismiss,
- title = { Text("Add Port Forward") },
+ title = { Text("Add port forward") },
text = {
Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
OutlinedTextField(
value = hostPort,
onValueChange = { hostPort = it; error = null },
- label = { Text("Host port (Android)") },
+ label = { Text("Android port") },
+ placeholder = { Text("e.g. 8080") },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
singleLine = true,
modifier = Modifier.fillMaxWidth(),
@@ -399,6 +432,7 @@ private fun AddPortForwardDialog(
value = guestPort,
onValueChange = { guestPort = it; error = null },
label = { Text("VM port") },
+ placeholder = { Text("e.g. 80") },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
singleLine = true,
modifier = Modifier.fillMaxWidth(),
@@ -417,7 +451,7 @@ private fun AddPortForwardDialog(
val hp = hostPort.toIntOrNull()
val gp = guestPort.toIntOrNull()
if (hp == null || gp == null || hp !in 1..65535 || gp !in 1..65535) {
- error = "Enter valid ports (1-65535)"
+ error = "Enter valid port numbers (1–65535)"
return@TextButton
}
onAdd(hp, gp, "tcp")
@@ -426,9 +460,7 @@ private fun AddPortForwardDialog(
}
},
dismissButton = {
- TextButton(onClick = onDismiss) {
- Text("Cancel")
- }
+ TextButton(onClick = onDismiss) { Text("Cancel") }
},
)
}
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 439c3ea..f9b5e5c 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
@@ -45,6 +45,15 @@ class SettingsViewModel @Inject constructor(
val terminalFontSize: StateFlow<Int> = settingsRepository.terminalFontSize
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 20)
+ val storageSizeGb: StateFlow<Int> = settingsRepository.storageSizeGb
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 2)
+
+ val sshEnabled: Flow<Boolean> = settingsRepository.sshEnabled
+
+ fun setSshEnabled(value: Boolean) {
+ viewModelScope.launch { settingsRepository.setSshEnabled(value) }
+ }
+
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/setup/SetupScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt
new file mode 100644
index 0000000..d7ae8b0
--- /dev/null
+++ b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt
@@ -0,0 +1,461 @@
+package com.excp.podroid.ui.screens.setup
+
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.foundation.background
+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.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowForward
+import androidx.compose.material.icons.filled.Info
+import androidx.compose.material.icons.filled.Memory
+import androidx.compose.material.icons.filled.Security
+import androidx.compose.material.icons.filled.Storage
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Slider
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import kotlinx.coroutines.launch
+
+private val storageSizes = listOf(2, 4, 8, 16, 32, 64)
+
+@Composable
+fun SetupScreen(
+ onSetupComplete: () -> Unit,
+ viewModel: SetupViewModel = hiltViewModel(),
+) {
+ var sliderPosition by remember { mutableFloatStateOf(0f) }
+ var sshEnabled by remember { mutableStateOf(true) }
+ val selectedGb = storageSizes[sliderPosition.toInt().coerceIn(0, storageSizes.lastIndex)]
+ val setupComplete by viewModel.setupComplete.collectAsStateWithLifecycle()
+ val pagerState = rememberPagerState(pageCount = { 2 })
+ val scope = rememberCoroutineScope()
+
+ LaunchedEffect(setupComplete) {
+ if (setupComplete) onSetupComplete()
+ }
+
+ Scaffold { innerPadding ->
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(innerPadding),
+ ) {
+ // Step progress bar
+ LinearProgressIndicator(
+ progress = { (pagerState.currentPage + 1) / 2f },
+ modifier = Modifier.fillMaxWidth(),
+ trackColor = MaterialTheme.colorScheme.surfaceVariant,
+ )
+
+ // Pages — swipe disabled; navigation is button-only
+ HorizontalPager(
+ state = pagerState,
+ modifier = Modifier.weight(1f),
+ userScrollEnabled = false,
+ ) { page ->
+ when (page) {
+ 0 -> StoragePage(
+ sliderPosition = sliderPosition,
+ selectedGb = selectedGb,
+ onSliderChange = { sliderPosition = it },
+ onNext = { scope.launch { pagerState.animateScrollToPage(1) } },
+ )
+ 1 -> VmConfigPage(
+ sshEnabled = sshEnabled,
+ onSshToggle = { sshEnabled = it },
+ onBack = { scope.launch { pagerState.animateScrollToPage(0) } },
+ onGetStarted = { viewModel.completeSetup(selectedGb, sshEnabled) },
+ )
+ }
+ }
+
+ // Pill-shaped page indicator
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(vertical = 16.dp),
+ horizontalArrangement = Arrangement.Center,
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ repeat(2) { index ->
+ val isSelected = pagerState.currentPage == index
+ val dotWidth by animateDpAsState(
+ targetValue = if (isSelected) 24.dp else 8.dp,
+ label = "dot_width",
+ )
+ Box(
+ modifier = Modifier
+ .padding(horizontal = 4.dp)
+ .height(8.dp)
+ .width(dotWidth)
+ .background(
+ color = if (isSelected)
+ MaterialTheme.colorScheme.primary
+ else
+ MaterialTheme.colorScheme.outlineVariant,
+ shape = CircleShape,
+ ),
+ )
+ }
+ }
+ }
+ }
+}
+
+// ── Page 1: Storage ───────────────────────────────────────────────────────────
+
+@Composable
+private fun StoragePage(
+ sliderPosition: Float,
+ selectedGb: Int,
+ onSliderChange: (Float) -> Unit,
+ onNext: () -> Unit,
+) {
+ // Outer column keeps button fixed at bottom while inner column scrolls
+ Column(
+ modifier = Modifier.fillMaxSize(),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ ) {
+ Column(
+ modifier = Modifier
+ .weight(1f)
+ .verticalScroll(rememberScrollState())
+ .padding(horizontal = 24.dp),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ ) {
+ Spacer(Modifier.height(40.dp))
+
+ Icon(
+ imageVector = Icons.Default.Storage,
+ contentDescription = null,
+ modifier = Modifier.size(64.dp),
+ tint = MaterialTheme.colorScheme.primary,
+ )
+
+ Spacer(Modifier.height(20.dp))
+
+ Text(
+ text = "Persistent Storage",
+ style = MaterialTheme.typography.headlineMedium,
+ fontWeight = FontWeight.Bold,
+ textAlign = TextAlign.Center,
+ )
+
+ Spacer(Modifier.height(8.dp))
+
+ Text(
+ text = "Stores installed packages, container images, and your files.",
+ style = MaterialTheme.typography.bodyLarge,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ textAlign = TextAlign.Center,
+ )
+
+ Spacer(Modifier.height(48.dp))
+
+ Text(
+ text = "$selectedGb GB",
+ style = MaterialTheme.typography.displayMedium,
+ fontWeight = FontWeight.Bold,
+ color = MaterialTheme.colorScheme.primary,
+ )
+
+ Spacer(Modifier.height(8.dp))
+
+ Slider(
+ value = sliderPosition,
+ onValueChange = onSliderChange,
+ valueRange = 0f..(storageSizes.lastIndex.toFloat()),
+ steps = storageSizes.size - 2,
+ modifier = Modifier.fillMaxWidth(),
+ )
+
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ ) {
+ Text(
+ "2 GB",
+ style = MaterialTheme.typography.labelSmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ )
+ Text(
+ "64 GB",
+ style = MaterialTheme.typography.labelSmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ )
+ }
+
+ Spacer(Modifier.height(24.dp))
+
+ Card(
+ modifier = Modifier.fillMaxWidth(),
+ shape = RoundedCornerShape(12.dp),
+ colors = CardDefaults.cardColors(
+ containerColor = MaterialTheme.colorScheme.secondaryContainer,
+ ),
+ ) {
+ Row(
+ modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Icon(
+ Icons.Default.Info,
+ contentDescription = null,
+ tint = MaterialTheme.colorScheme.secondary,
+ modifier = Modifier.size(18.dp),
+ )
+ Spacer(Modifier.width(12.dp))
+ Text(
+ text = "Cannot be resized later without a full VM reset.",
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSecondaryContainer,
+ )
+ }
+ }
+
+ Spacer(Modifier.height(16.dp))
+ }
+
+ // Fixed next button
+ Column(modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp)) {
+ Button(
+ onClick = onNext,
+ modifier = Modifier
+ .fillMaxWidth()
+ .height(56.dp),
+ shape = RoundedCornerShape(16.dp),
+ ) {
+ Text(
+ "Next",
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.SemiBold,
+ )
+ Spacer(Modifier.width(8.dp))
+ Icon(Icons.AutoMirrored.Filled.ArrowForward, contentDescription = null)
+ }
+ }
+ }
+}
+
+// ── Page 2: VM config + SSH ───────────────────────────────────────────────────
+
+@Composable
+private fun VmConfigPage(
+ sshEnabled: Boolean,
+ onSshToggle: (Boolean) -> Unit,
+ onBack: () -> Unit,
+ onGetStarted: () -> Unit,
+) {
+ Column(
+ modifier = Modifier.fillMaxSize(),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ ) {
+ Column(
+ modifier = Modifier
+ .weight(1f)
+ .verticalScroll(rememberScrollState())
+ .padding(horizontal = 24.dp),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ ) {
+ Spacer(Modifier.height(40.dp))
+
+ Icon(
+ imageVector = Icons.Default.Memory,
+ contentDescription = null,
+ modifier = Modifier.size(64.dp),
+ tint = MaterialTheme.colorScheme.primary,
+ )
+
+ Spacer(Modifier.height(20.dp))
+
+ Text(
+ text = "Configure Your VM",
+ style = MaterialTheme.typography.headlineMedium,
+ fontWeight = FontWeight.Bold,
+ textAlign = TextAlign.Center,
+ )
+
+ Spacer(Modifier.height(8.dp))
+
+ Text(
+ text = "Defaults are tuned for the best balance of performance and battery. Adjust anytime in Settings.",
+ style = MaterialTheme.typography.bodyLarge,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ textAlign = TextAlign.Center,
+ )
+
+ Spacer(Modifier.height(32.dp))
+
+ // Performance defaults
+ Card(
+ modifier = Modifier.fillMaxWidth(),
+ shape = RoundedCornerShape(16.dp),
+ colors = CardDefaults.cardColors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant,
+ ),
+ ) {
+ Column(modifier = Modifier.padding(20.dp)) {
+ Text(
+ "Default Performance",
+ style = MaterialTheme.typography.labelLarge,
+ color = MaterialTheme.colorScheme.primary,
+ )
+ Spacer(Modifier.height(16.dp))
+ SetupInfoRow(label = "CPU", value = "1 core")
+ Spacer(Modifier.height(8.dp))
+ SetupInfoRow(label = "RAM", value = "512 MB")
+ }
+ }
+
+ Spacer(Modifier.height(12.dp))
+
+ // SSH toggle
+ Card(
+ modifier = Modifier.fillMaxWidth(),
+ shape = RoundedCornerShape(16.dp),
+ colors = CardDefaults.cardColors(
+ containerColor = if (sshEnabled)
+ MaterialTheme.colorScheme.primaryContainer
+ else
+ MaterialTheme.colorScheme.surfaceVariant,
+ ),
+ ) {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(20.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Icon(
+ Icons.Default.Security,
+ contentDescription = null,
+ tint = if (sshEnabled)
+ MaterialTheme.colorScheme.primary
+ else
+ MaterialTheme.colorScheme.onSurfaceVariant,
+ modifier = Modifier.size(24.dp),
+ )
+ Spacer(Modifier.width(16.dp))
+ Column(modifier = Modifier.weight(1f)) {
+ Text(
+ "SSH Access",
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.SemiBold,
+ )
+ Spacer(Modifier.height(4.dp))
+ Text(
+ if (sshEnabled)
+ "ssh root@<phone-ip> -p 9922\nPassword: podroid"
+ else
+ "Connect to the VM over your local network.",
+ style = MaterialTheme.typography.bodySmall,
+ color = if (sshEnabled)
+ MaterialTheme.colorScheme.onPrimaryContainer
+ else
+ MaterialTheme.colorScheme.onSurfaceVariant,
+ )
+ }
+ Spacer(Modifier.width(12.dp))
+ Switch(
+ checked = sshEnabled,
+ onCheckedChange = onSshToggle,
+ )
+ }
+ }
+
+ Spacer(Modifier.height(16.dp))
+ }
+
+ // Fixed back + get started buttons
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 24.dp, vertical = 16.dp),
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ FilledTonalButton(
+ onClick = onBack,
+ modifier = Modifier
+ .weight(1f)
+ .height(56.dp),
+ shape = RoundedCornerShape(16.dp),
+ ) {
+ Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
+ Spacer(Modifier.width(8.dp))
+ Text("Back", style = MaterialTheme.typography.titleMedium)
+ }
+ Button(
+ onClick = onGetStarted,
+ modifier = Modifier
+ .weight(2f)
+ .height(56.dp),
+ shape = RoundedCornerShape(16.dp),
+ ) {
+ Text(
+ "Get Started",
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.SemiBold,
+ )
+ }
+ }
+ }
+}
+
+@Composable
+private fun SetupInfoRow(label: String, value: String) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Text(
+ label,
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ )
+ Text(
+ value,
+ style = MaterialTheme.typography.bodyMedium,
+ fontWeight = FontWeight.SemiBold,
+ )
+ }
+}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupViewModel.kt
new file mode 100644
index 0000000..80db247
--- /dev/null
+++ b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupViewModel.kt
@@ -0,0 +1,30 @@
+package com.excp.podroid.ui.screens.setup
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.excp.podroid.data.repository.SettingsRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class SetupViewModel @Inject constructor(
+ private val settingsRepository: SettingsRepository,
+) : ViewModel() {
+
+ private val _setupComplete = MutableStateFlow(false)
+ val setupComplete: StateFlow<Boolean> = _setupComplete.asStateFlow()
+
+ fun completeSetup(storageSizeGb: Int, sshEnabled: Boolean) {
+ viewModelScope.launch {
+ // Write all settings fully before signalling completion
+ settingsRepository.setStorageSizeGb(storageSizeGb)
+ settingsRepository.setSshEnabled(sshEnabled)
+ settingsRepository.markSetupDone()
+ _setupComplete.value = true
+ }
+ }
+}
diff --git a/init-podroid b/init-podroid
index c485540..14b5a47 100644
--- a/init-podroid
+++ b/init-podroid
@@ -1,24 +1,22 @@
#!/bin/sh
# Podroid init — persistent Alpine Linux VM with Podman
-# Uses overlayfs on persistent storage so ALL changes survive reboots.
-# Serial console (ttyAMA0) is the primary interface.
+# Two-phase: Phase 1 mounts the overlay, Phase 2 runs the main system.
-# ── Phase 2: Main init (running inside persistent overlay) ──
+# ── Phase 2: Main init (running inside persistent overlay) ──────────────────
if [ "$1" = "--main" ]; then
-# ── Core filesystems ──
-echo "[init] Mounting filesystems..."
+# ── Core 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 || \
mount -t tmpfs tmpfs /dev -o exec,nosuid,mode=0755,size=2M
mkdir -p /dev/pts /dev/shm /dev/mqueue /dev/net
mount -t devpts devpts /dev/pts -o gid=5,mode=0620,noexec,nosuid 2>/dev/null
-mount -t tmpfs tmpfs /dev/shm -o noexec,nosuid,nodev,size=64m
-mount -t tmpfs tmpfs /tmp -o noexec,nosuid,nodev
-mount -t tmpfs tmpfs /run -o noexec,nosuid,nodev,mode=0755
+mount -t tmpfs tmpfs /dev/shm -o noexec,nosuid,nodev,size=64m
+mount -t tmpfs tmpfs /tmp -o noexec,nosuid,nodev
+mount -t tmpfs tmpfs /run -o noexec,nosuid,nodev,mode=0755
-# ── cgroup2 (required by podman/crun) ──
+# ── cgroup2 ─────────────────────────────────────────────────────────────────
mkdir -p /sys/fs/cgroup
mount -t cgroup2 cgroup2 /sys/fs/cgroup 2>/dev/null
if [ -f /sys/fs/cgroup/cgroup.subtree_control ]; then
@@ -27,42 +25,40 @@ if [ -f /sys/fs/cgroup/cgroup.subtree_control ]; then
done
fi
-# ── Busybox + basic dirs ──
+# ── Busybox + dirs ──────────────────────────────────────────────────────────
/bin/busybox --install -s 2>/dev/null
mkdir -p /var/lib/containers/storage /var/log /var/tmp /root
mkdir -p /run/lock /run/containers/storage /run/libpod
chmod 700 /root
chmod 1777 /tmp /var/tmp
-# ── Hostname ──
+# ── Hostname ─────────────────────────────────────────────────────────────────
echo "podroid" > /etc/hostname
hostname podroid
-# ── Kernel modules ──
+# ── Kernel modules ───────────────────────────────────────────────────────────
echo "[init] Loading kernel modules..."
KVER=$(uname -r)
if [ -d "/lib/modules/$KVER" ]; then
depmod -a 2>/dev/null
- modprobe virtio_net 2>/dev/null
- modprobe virtio_blk 2>/dev/null
- modprobe fuse 2>/dev/null
- modprobe tun 2>/dev/null
- modprobe veth 2>/dev/null
- modprobe bridge 2>/dev/null
- modprobe br_netfilter 2>/dev/null
- modprobe overlay 2>/dev/null
- modprobe xt_addrtype 2>/dev/null
- modprobe xt_conntrack 2>/dev/null
- modprobe xt_nat 2>/dev/null
- modprobe nf_nat 2>/dev/null
- modprobe nf_conntrack 2>/dev/null
- modprobe ip_tables 2>/dev/null
+ for mod in virtio_net virtio_blk fuse tun veth bridge br_netfilter overlay \
+ xt_addrtype xt_conntrack xt_nat nf_nat nf_conntrack ip_tables; do
+ modprobe $mod 2>/dev/null
+ done
fi
-
-# Create /dev/net/tun if missing (needed by slirp4netns)
[ ! -c /dev/net/tun ] && mknod /dev/net/tun c 10 200 2>/dev/null
-# ── Networking ──
+# ── Read kernel cmdline params ───────────────────────────────────────────────
+ANDROID_IP="unknown"
+SSH_ENABLED=0
+for param in $(cat /proc/cmdline); do
+ case "$param" in
+ androidip=*) ANDROID_IP="${param#androidip=}" ;;
+ ssh=1) SSH_ENABLED=1 ;;
+ esac
+done
+
+# ── Networking ───────────────────────────────────────────────────────────────
echo "[init] Waiting for network..."
NETIF=""
for i in $(seq 1 30); do
@@ -80,13 +76,12 @@ else
echo "[init] WARNING: No network interface found!"
fi
-# 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 "nameserver 8.8.8.8" >> /etc/resolv.conf
+echo "nameserver 1.1.1.1" >> /etc/resolv.conf
+# ── Container config ─────────────────────────────────────────────────────────
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
sysctl -qw net.bridge.bridge-nf-call-iptables=1 2>/dev/null
@@ -96,14 +91,11 @@ sysctl -qw kernel.unprivileged_userns_clone=1 2>/dev/null
sysctl -qw fs.inotify.max_user_instances=256 2>/dev/null
sysctl -qw fs.inotify.max_user_watches=65536 2>/dev/null
-# ── User/group config (only if not already customized) ──
[ -f /etc/subuid ] || echo "root:100000:65536" > /etc/subuid
[ -f /etc/subgid ] || echo "root:100000:65536" > /etc/subgid
-# ── Podman configuration (only write defaults on first boot) ──
if [ ! -f /etc/containers/containers.conf ]; then
mkdir -p /etc/containers
-
cat > /etc/containers/containers.conf <<'CONF'
[containers]
cgroups = "enabled"
@@ -135,7 +127,6 @@ unqualified-search-registries = ["docker.io", "quay.io"]
CONF
fi
-# ── crun config ──
if [ ! -f /etc/crun/crun.conf ]; then
mkdir -p /etc/crun
cat > /etc/crun/crun.conf <<'CONF'
@@ -144,7 +135,44 @@ no-pivot = true
CONF
fi
-# ── Environment ──
+# ── SSH setup ────────────────────────────────────────────────────────────────
+if [ "$SSH_ENABLED" = "1" ]; then
+ echo "[init] Starting SSH server..."
+
+ # Set a default root password on first boot
+ if [ ! -f /etc/podroid-ssh-init ]; then
+ echo "root:podroid" | chpasswd 2>/dev/null
+ touch /etc/podroid-ssh-init
+ fi
+
+ # Generate host keys if missing
+ mkdir -p /etc/ssh
+ ssh-keygen -A >/dev/null 2>&1
+
+ # Write sshd config
+ cat > /etc/ssh/sshd_config <<'SSHD'
+Port 22
+PermitRootLogin yes
+PasswordAuthentication yes
+PubkeyAuthentication yes
+AuthorizedKeysFile .ssh/authorized_keys
+X11Forwarding no
+PrintMotd no
+AcceptEnv LANG LC_*
+Subsystem sftp /usr/lib/ssh/sftp-server
+SSHD
+
+ mkdir -p /root/.ssh
+ chmod 700 /root/.ssh
+
+ if /usr/sbin/sshd; then
+ echo "[init] SSH server started on port 22 (host port 9922)"
+ else
+ echo "[init] WARNING: SSH server failed to start"
+ fi
+fi
+
+# ── Environment ──────────────────────────────────────────────────────────────
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
export HOME=/root
export TERM=xterm-256color
@@ -156,14 +184,11 @@ export CONTAINERS_CONF=/etc/containers/containers.conf
export CONTAINERS_STORAGE_CONF=/etc/containers/storage.conf
export CONTAINERS_REGISTRIES_CONF=/etc/containers/registries.conf
-# ── Console settings ──
+# ── Console settings ─────────────────────────────────────────────────────────
dmesg -n 1 2>/dev/null
-# Set a sane default size. The Android app will update it via stty
-# after the terminal view is measured, but serial TTYs start at 0x0
-# which breaks TUI apps (btop, nvim) that use TIOCGWINSZ.
stty rows 24 cols 80 -ixon -ixoff -iexten 2>/dev/null
-# ── Graceful shutdown handler ──
+# ── Shutdown handler ─────────────────────────────────────────────────────────
shutdown_handler() {
echo ""
echo "[init] Shutting down..."
@@ -174,30 +199,40 @@ shutdown_handler() {
}
trap shutdown_handler TERM INT HUP
-# ── Banner ──
-IP=$(ip addr show "$NETIF" 2>/dev/null | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1)
-PERSISTENT="yes"
-[ -f /mnt/persist/.overlay-active ] || PERSISTENT="no (running from initramfs)"
-echo ""
-echo "=========================================="
-echo " Podroid - Alpine Linux + Podman"
-echo "=========================================="
-echo " IP: ${IP:-no network}"
-echo " DNS: 8.8.8.8"
-echo " Persistent: ${PERSISTENT}"
-echo ""
-
-# Quick connectivity check (synchronous so output doesn't overlap shell prompt)
+# ── Internet check ───────────────────────────────────────────────────────────
+INTERNET="no"
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"
+ INTERNET="yes"
+fi
+
+# ── MOTD ─────────────────────────────────────────────────────────────────────
+VM_IP=$(ip addr show "$NETIF" 2>/dev/null | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1)
+STORAGE_GB=$(df -BG / 2>/dev/null | awk 'NR==2 {gsub(/G/,"",$2); print $2}')
+
+SSH_LINE=""
+if [ "$SSH_ENABLED" = "1" ]; then
+ SSH_LINE=" ssh root@${ANDROID_IP} -p 9922 (pass: podroid)"
fi
-echo ""
-echo " Ready! Try: podman run --rm alpine echo hello"
-echo ""
-# ── Profile configuration ──
+cat > /etc/motd <<MOTD
+
+ ____ _ _ _
+ | _ \ ___ __| |_ __ ___ (_) __| |
+ | |_) / _ \/ _\` | '__/ _ \| |/ _\` |
+ | __/ (_) | (_| | | | (_) | | (_| |
+ |_| \___/ \__,_|_| \___/|_|\__,_|
+
+ Alpine 3.23 · Podman · QEMU
+
+ ip ${VM_IP:-10.0.2.15} · internet ${INTERNET} · storage ${STORAGE_GB:-?} GB
+${SSH_LINE}
+
+ podman run --rm -it alpine sh
+ podman run -d -p 8080:80 nginx
+
+MOTD
+
+# ── Profile ───────────────────────────────────────────────────────────────────
cat > /etc/profile <<'PROF'
export HOME=/root
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
@@ -209,17 +244,11 @@ 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
-
-# Sane terminal settings for serial console
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.
+# ── Silent resize helper ─────────────────────────────────────────────────────
cat > /usr/local/bin/sz <<'SZ'
#!/bin/sh
stty rows "$1" cols "$2" 2>/dev/null
@@ -227,51 +256,41 @@ 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).
+# ── Login wrapper ─────────────────────────────────────────────────────────────
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.
+cat /etc/motd
resize >/dev/null 2>&1
exec /bin/sh
LOGIN
chmod +x /usr/local/bin/podroid-login
-# Set root shell and create passwd entry if missing
grep -q '^root:' /etc/passwd 2>/dev/null || echo "root:x:0:0:root:/root:/bin/sh" > /etc/passwd
-# 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 /usr/local/bin/podroid-login 0 ttyAMA0 xterm-256color
sleep 1
done
fi
-# ══════════════════════════════════════════════════════════════
-# Phase 1: Early init — mount persistent storage and overlay
-# ══════════════════════════════════════════════════════════════
+# ══════════════════════════════════════════════════════════════════════════════
+# Phase 1: Early init — mount persistent storage and pivot to overlay
+# ══════════════════════════════════════════════════════════════════════════════
-# Minimal filesystems needed to find and mount the disk
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 || \
mount -t tmpfs tmpfs /dev -o exec,nosuid,mode=0755,size=2M
-# Load virtio_blk early so the persistent disk is visible
KVER=$(uname -r)
if [ -d "/lib/modules/$KVER" ]; then
depmod -a 2>/dev/null
modprobe virtio_blk 2>/dev/null
fi
-# Silence kernel during setup
echo 1 > /proc/sys/kernel/printk 2>/dev/null
-# ── Find and mount persistent storage ──
mkdir -p /mnt/persist
PERSIST_DEV=""
for dev in /dev/vda /dev/vdb; do
@@ -282,7 +301,6 @@ done
OVERLAY_OK=false
if [ -n "$PERSIST_DEV" ]; then
- # 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
e2fsck -y "$PERSIST_DEV" >/dev/null 2>&1
@@ -294,28 +312,19 @@ if [ -n "$PERSIST_DEV" ]; then
fi
if mountpoint -q /mnt/persist 2>/dev/null; then
- # Create overlay directories on persistent disk
mkdir -p /mnt/persist/upper /mnt/persist/work /mnt/overlay
- # Mount overlay: lower=initramfs, upper=persistent disk
mount -t overlay overlay \
-o lowerdir=/,upperdir=/mnt/persist/upper,workdir=/mnt/persist/work \
/mnt/overlay 2>/dev/null
if mountpoint -q /mnt/overlay 2>/dev/null; then
- # Bind the persistent disk into the overlay for direct access
mkdir -p /mnt/overlay/mnt/persist
mount --bind /mnt/persist /mnt/overlay/mnt/persist
-
- # Mark overlay as active
touch /mnt/persist/.overlay-active
-
- # Unmount early mounts (will be re-created in phase 2)
umount /dev 2>/dev/null
umount /sys 2>/dev/null
umount /proc 2>/dev/null
-
- # Enter overlay and run main init
exec chroot /mnt/overlay /init --main
else
echo "[init] WARNING: Overlay mount failed! Running without persistence."
@@ -323,7 +332,6 @@ if [ -n "$PERSIST_DEV" ]; then
fi
fi
-# ── Fallback: no persistent storage, run directly ──
echo "[init] WARNING: No persistent storage — changes will be lost on reboot!"
umount /dev 2>/dev/null
umount /sys 2>/dev/null