Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 88 additions & 0 deletions Android/app/src/main/assets/chkrunit.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
#!/bin/sh
# chkrunit.sh - runit service query tool

ACTIVE_DIR=""
for dir in /etc/service /service /var/service; do
if [ -d "$dir" ]; then
ACTIVE_DIR="$dir"
break
fi
done

SV_DIR=""
for dir in /etc/sv /etc/runit/sv /usr/local/etc/sv; do
if [ -d "$dir" ]; then
SV_DIR="$dir"
break
fi
done

_all_running() {
[ -n "$ACTIVE_DIR" ] || return 0
for path in "$ACTIVE_DIR"/*; do
[ -e "$path" ] || [ -L "$path" ] || continue
[ -d "$path" ] || continue
name=$(basename "$path")
status=$(sv status "$path" 2>/dev/null) || status=""

case "$status" in
run:*)
printf '%s|%s\n' "$name" "$status"
;;
esac
done
}

_all_enabled() {
[ -n "$ACTIVE_DIR" ] || return 0
for path in "$ACTIVE_DIR"/*; do
[ -e "$path" ] || [ -L "$path" ] || continue
[ -d "$path" ] || continue
name=$(basename "$path")
status=$([ -f "$path/down" ] && printf "run-at-boot: disabled" || printf "run-at-boot: enabled" )

printf '%s|%s\n' "$name" "$status"
done
}

_all_disabled() {
[ -n "$ACTIVE_DIR" ] || return 0
[ -n "$SV_DIR" ] || return 0
for path in "$SV_DIR"/*; do
[ -e "$path" ] || [ -L "$path" ] || continue
[ -d "$path" ] || continue
name=$(basename "$path")
[ -e "$ACTIVE_DIR/$name" ] && continue
status=$([ -f "$path/down" ] && printf "run-at-boot: disabled" || printf "run-at-boot: enabled" )

printf '%s|%s\n' "$name" "$status"
done
}

_all_services() {
[ -n "$ACTIVE_DIR" ] || return 0
[ -n "$SV_DIR" ] || return 0
for path in "$SV_DIR"/*; do
[ -e "$path" ] || [ -L "$path" ] || continue
[ -d "$path" ] || continue
name=$(basename "$path")
status=$([ -e "$ACTIVE_DIR/$name" ] && printf "enabled" || printf "disabled" )

printf '%s|%s\n' "$name" "$status"
done
}

case "$1" in
--running)
_all_running
;;
--enabled)
_all_enabled
;;
--disabled)
_all_disabled
;;
--all)
_all_services
;;
esac
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import com.droidspaces.app.ui.screen.UnitDetailScreen
import com.droidspaces.app.ui.screen.OverrideEditorScreen
import com.droidspaces.app.ui.screen.ProcdScreen
import com.droidspaces.app.ui.screen.OpenRCScreen
import com.droidspaces.app.ui.screen.RunitScreen
import com.droidspaces.app.ui.screen.ContainerTerminalScreen
import com.droidspaces.app.ui.viewmodel.ContainerInstallationViewModel
import com.droidspaces.app.ui.viewmodel.ContainerViewModel
Expand Down Expand Up @@ -121,6 +122,9 @@ sealed class Screen(val route: String) {
data object OpenRC : Screen("openrc/{containerName}") {
fun createRoute(containerName: String) = "openrc/${Uri.encode(containerName)}"
}
data object Runit : Screen("runit/{containerName}") {
fun createRoute(containerName: String) = "runit/${Uri.encode(containerName)}"
}

data object Terminal : Screen("terminal/{containerName}") {
fun createRoute(containerName: String) = "terminal/${Uri.encode(containerName)}"
Expand Down Expand Up @@ -670,6 +674,8 @@ fun DroidspacesNavigation(
navController.navigate(Screen.Procd.createRoute(containerName))
com.droidspaces.app.ui.screen.InitSystem.OPENRC ->
navController.navigate(Screen.OpenRC.createRoute(containerName))
com.droidspaces.app.ui.screen.InitSystem.RUNIT ->
navController.navigate(Screen.Runit.createRoute(containerName))
}
},
onNavigateToTerminal = {
Expand Down Expand Up @@ -785,6 +791,21 @@ fun DroidspacesNavigation(
)
}

composable(
route = Screen.Runit.route,
arguments = listOf(
navArgument("containerName") { type = NavType.StringType }
),
enterTransition = defaultEnterTransition,
exitTransition = defaultExitTransition
) { backStackEntry ->
val containerName = backStackEntry.arguments?.getString("containerName") ?: ""
RunitScreen(
containerName = containerName,
onNavigateBack = { navController.popBackStack() }
)
}

composable(
route = Screen.Terminal.route,
arguments = listOf(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ fun ContainerDetailsScreen(
"systemd" -> InitSystemCardState.Available(InitSystem.SYSTEMD)
"procd" -> InitSystemCardState.Available(InitSystem.PROCD)
"openrc" -> InitSystemCardState.Available(InitSystem.OPENRC)
"runit" -> InitSystemCardState.Available(InitSystem.RUNIT)
else -> InitSystemCardState.NotAvailable
}
}
Expand Down Expand Up @@ -279,7 +280,7 @@ fun ContainerDetailsScreen(
/**
* Which init system is available in the container.
*/
enum class InitSystem { SYSTEMD, PROCD, OPENRC }
enum class InitSystem { SYSTEMD, PROCD, OPENRC, RUNIT }

/**
* Init system card state - sealed for type safety and stability
Expand Down Expand Up @@ -601,6 +602,7 @@ private fun PremiumInitSystemCard(
InitSystem.SYSTEMD -> context.getString(R.string.systemd)
InitSystem.PROCD -> context.getString(R.string.openwrt)
InitSystem.OPENRC -> context.getString(R.string.openrc)
InitSystem.RUNIT -> context.getString(R.string.runit)
}
else -> context.getString(R.string.init_system)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package com.droidspaces.app.ui.screen

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.PowerSettingsNew
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import com.droidspaces.app.R
import com.droidspaces.app.util.ContainerRunitManager

private fun ContainerRunitManager.CommandResult.toInit() = InitCommandResult(isSuccess, output, error)

private fun ContainerRunitManager.ServiceInfo.toRow(containerName: String): InitServiceRow {
val uiStatus = when (status) {
ContainerRunitManager.ServiceStatus.ENABLED_RUNNING -> InitServiceUiStatus.ENABLED_RUNNING
ContainerRunitManager.ServiceStatus.ENABLED_STOPPED -> InitServiceUiStatus.ENABLED_STOPPED
ContainerRunitManager.ServiceStatus.DISABLED_STOPPED -> InitServiceUiStatus.DISABLED_STOPPED
ContainerRunitManager.ServiceStatus.ABNORMAL -> InitServiceUiStatus.ABNORMAL
}
return InitServiceRow(
name = name,
description = description,
isRunning = isRunning,
isEnabled = isEnabled,
isMasked = false,
isStatic = false,
status = uiStatus,
startStop = { (if (isRunning) ContainerRunitManager.stopService(containerName, name) else ContainerRunitManager.startService(containerName, name)).toInit() },
enableDisable = { (if (isEnabled) ContainerRunitManager.disableService(containerName, name) else ContainerRunitManager.enableService(containerName, name)).toInit() },
unmask = null,
menu = buildList {
if (isRunning) add(InitServiceMenuAction.Command(R.string.restart_service, Icons.Default.Refresh) { ContainerRunitManager.restartService(containerName, name).toInit() })
add(InitServiceMenuAction.Command(R.string.toggle_run_at_boot, Icons.Rounded.PowerSettingsNew) { ContainerRunitManager.toggleDefaultState(containerName, name).toInit() })
}
)
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun RunitScreen(
containerName: String,
onNavigateBack: () -> Unit
) {
val context = LocalContext.current
LaunchedEffect(Unit) { ContainerRunitManager.initialize(context) }

val filters = listOf(
InitServiceFilterChip("RUNNING", R.string.running, statusColorFor(InitServiceUiStatus.ENABLED_RUNNING), R.string.no_running_services) { it.isRunning && it.isEnabled },
InitServiceFilterChip("ENABLED", R.string.enabled_legend, statusColorFor(InitServiceUiStatus.ENABLED_STOPPED), R.string.no_enabled_services) { it.isEnabled && !it.isRunning },
InitServiceFilterChip("DISABLED", R.string.disabled_legend, statusColorFor(InitServiceUiStatus.DISABLED_STOPPED), R.string.no_disabled_services) { !it.isEnabled && !it.isRunning },
InitServiceFilterChip("ABNORMAL", R.string.abnormal_legend, statusColorFor(InitServiceUiStatus.ABNORMAL), R.string.no_abnormal_services) { it.isRunning && !it.isEnabled },
InitServiceFilterChip("ALL", R.string.all_legend, null, R.string.no_services_found) { true },
)

InitServiceScreen(
containerName = containerName,
titleRes = R.string.runit_services,
onNavigateBack = onNavigateBack,
isAvailable = { cn -> ContainerRunitManager.isRunitAvailable(cn) },
fetchRows = { cn -> ContainerRunitManager.getAllServices(cn).map { it.toRow(cn) } },
filters = filters,
defaultFilterId = "RUNNING",
)
}
Loading