eric/gitlab-instance-0a899031_sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s

Browse Source
This commit is contained in:
root
2026-05-18 08:36:28 +00:00
parent e638a4656c
commit efa5533032
20 changed files with 368 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

213
d2ypp2/scripts/linux/lib/common.sh
View File

@@ -370,6 +370,121 @@ resolve_neko_profile_dir_for_instance() {
esac
}
redroid_binderfs_ready() {
[ -e /dev/binderfs/binder-control ]
}
redroid_legacy_binder_devices_ready() {
[ -e /dev/binder ] && [ -e /dev/hwbinder ] && [ -e /dev/vndbinder ]
}
redroid_binder_mode() {
if redroid_binderfs_ready; then
printf '%s\n' binderfs
return 0
fi
if redroid_legacy_binder_devices_ready; then
printf '%s\n' legacy
return 0
fi
return 1
}
redroid_binder_is_provisionable() {
redroid_binder_mode >/dev/null 2>&1 && return 0
grep -qw binder /proc/filesystems 2>/dev/null
}
redroid_support_detail() {
if redroid_binderfs_ready; then
printf '%s' "binderfs mounted"
return 0
fi
if redroid_legacy_binder_devices_ready; then
printf '%s' "legacy binder devices available"
return 0
fi
if grep -qw binder /proc/filesystems 2>/dev/null; then
printf '%s' "binder filesystem supported but not mounted"
return 0
fi
printf '%s' "binder kernel support unavailable"
}
ensure_redroid_host_support() {
if redroid_binder_mode >/dev/null 2>&1; then
return 0
fi
if have modprobe; then
modprobe binder_linux devices=binder,hwbinder,vndbinder >/dev/null 2>&1 || \
modprobe binder_linux >/dev/null 2>&1 || true
fi
if redroid_binder_mode >/dev/null 2>&1; then
return 0
fi
if grep -qw binder /proc/filesystems 2>/dev/null; then
mkdir -p /dev/binderfs
if have mountpoint; then
if ! mountpoint -q /dev/binderfs 2>/dev/null; then
mount -t binder binder /dev/binderfs >/dev/null 2>&1 || \
mount -t binderfs binderfs /dev/binderfs >/dev/null 2>&1 || true
fi
elif ! grep -qE '[[:space:]]/dev/binderfs[[:space:]]' /proc/mounts 2>/dev/null; then
mount -t binder binder /dev/binderfs >/dev/null 2>&1 || \
mount -t binderfs binderfs /dev/binderfs >/dev/null 2>&1 || true
fi
fi
redroid_binder_mode >/dev/null 2>&1
}
install_redroid_host_service() {
mkdir -p /etc/modules-load.d /etc/modprobe.d
cat >/etc/modules-load.d/live-redroid.conf <<EOF
binder_linux
EOF
cat >/etc/modprobe.d/live-redroid.conf <<EOF
options binder_linux devices=binder,hwbinder,vndbinder
EOF
cat >/etc/systemd/system/live-redroid-host.service <<'UNIT'
[Unit]
Description=Live Redroid binder host preparation
After=systemd-modules-load.service local-fs.target
Wants=systemd-modules-load.service
Before=docker.service
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/bash -lc 'modprobe binder_linux devices=binder,hwbinder,vndbinder >/dev/null 2>&1 || modprobe binder_linux >/dev/null 2>&1 || true; mkdir -p /dev/binderfs; if command -v mountpoint >/dev/null 2>&1; then mountpoint -q /dev/binderfs || mount -t binder binder /dev/binderfs >/dev/null 2>&1 || mount -t binderfs binderfs /dev/binderfs >/dev/null 2>&1; else grep -qE "[[:space:]]/dev/binderfs[[:space:]]" /proc/mounts || mount -t binder binder /dev/binderfs >/dev/null 2>&1 || mount -t binderfs binderfs /dev/binderfs >/dev/null 2>&1; fi; test -e /dev/binderfs/binder-control || { test -e /dev/binder && test -e /dev/hwbinder && test -e /dev/vndbinder; }'
[Install]
WantedBy=multi-user.target
UNIT
systemctl daemon-reload
if systemctl enable --now live-redroid-host.service >/dev/null 2>&1; then
return 0
fi
log "WARN: live-redroid-host.service failed; Redroid will require preconfigured binder devices"
return 1
}
redroid_container_matches_host_support() {
local name="$1"
case "$(redroid_binder_mode 2>/dev/null || true)" in
binderfs)
docker inspect -f '{{range .Mounts}}{{println .Destination}}{{end}}' "$name" 2>/dev/null | grep -qx '/dev/binderfs'
;;
legacy)
docker inspect -f '{{range .HostConfig.Devices}}{{println .PathOnHost}}{{end}}' "$name" 2>/dev/null | grep -qx '/dev/binder' && \
docker inspect -f '{{range .HostConfig.Devices}}{{println .PathOnHost}}{{end}}' "$name" 2>/dev/null | grep -qx '/dev/hwbinder' && \
docker inspect -f '{{range .HostConfig.Devices}}{{println .PathOnHost}}{{end}}' "$name" 2>/dev/null | grep -qx '/dev/vndbinder'
;;
*)
return 1
;;
esac
}
resolve_neko_instance_count() {
local requested="${NEKO_INSTANCE_COUNT:-2}"
local cpu count
@@ -568,8 +683,18 @@ install_docker_stack() {
fi
fi
log "Installing Docker"
apt_install docker.io docker-compose docker-compose-plugin
if ! apt_install docker.io docker-compose docker-compose-plugin; then
log "docker-compose-plugin package unavailable; retrying without it"
apt_install docker.io docker-compose || apt_install docker.io
fi
systemctl enable --now docker
if ! docker compose version >/dev/null 2>&1; then
log "Docker installed without Compose v2 package; trying Compose v2 binary"
install_docker_compose_plugin_binary || true
fi
if ! docker compose version >/dev/null 2>&1 && have docker-compose; then
log "WARN: falling back to docker-compose v1; some stacks may need docker-compose-plugin"
fi
usermod -aG docker live || true
}
@@ -761,27 +886,46 @@ configure_mdns() {
log "Configuring hostname and mDNS"
hostnamectl set-hostname "$HOSTNAME_ALIAS"
local mdns_interfaces
local mdns_interfaces preferred_lan_ip
mdns_interfaces="$(detect_mdns_interfaces)"
preferred_lan_ip="$(detect_preferred_lan_ip || true)"
python3 - <<PY
from pathlib import Path
import re
hosts = Path("/etc/hosts")
hosts_text = hosts.read_text(encoding="utf-8")
if f"127.0.1.1\t${HOSTNAME_ALIAS}" not in hosts_text and f"127.0.1.1 ${HOSTNAME_ALIAS}" not in hosts_text:
lines = []
replaced = False
for raw in hosts_text.splitlines():
if raw.startswith("127.0.1.1"):
lines.append(f"127.0.1.1\t${HOSTNAME_ALIAS}")
replaced = True
else:
lines.append(raw)
if not replaced:
lines.append(f"127.0.1.1\t${HOSTNAME_ALIAS}")
hosts.write_text("\n".join(lines) + "\n", encoding="utf-8")
host_alias = "${HOSTNAME_ALIAS}"
preferred_lan_ip = "${preferred_lan_ip}".strip()
host_lines = hosts.read_text(encoding="utf-8").splitlines()
next_host_lines = []
loopback_written = False
lan_written = False
for raw in host_lines:
stripped = raw.strip()
if not stripped or stripped.startswith("#"):
next_host_lines.append(raw)
continue
parts = raw.split()
names = parts[1:]
if parts[0] == "127.0.1.1":
next_host_lines.append(f"127.0.1.1\t{host_alias}")
loopback_written = True
continue
if f"{host_alias}.local" in names:
if preferred_lan_ip and not lan_written:
next_host_lines.append(f"{preferred_lan_ip}\t{host_alias}.local")
lan_written = True
continue
next_host_lines.append(raw)
if not loopback_written:
next_host_lines.append(f"127.0.1.1\t{host_alias}")
if preferred_lan_ip and not lan_written:
next_host_lines.append(f"{preferred_lan_ip}\t{host_alias}.local")
hosts.write_text("\n".join(next_host_lines) + "\n", encoding="utf-8")
path = Path("/etc/avahi/avahi-daemon.conf")
raw_lines = path.read_text(encoding="utf-8").splitlines()
@@ -909,7 +1053,11 @@ install_browser_stack() {
apt_install "$chrome_deb" || dpkg -i "$chrome_deb" || apt-get -f install -y || true
fi
fi
apt_install chromium || apt_install chromium-browser || true
if have google-chrome || have google-chrome-stable; then
log "Google Chrome is available; skipping Chromium install on x86"
else
apt_install chromium || apt_install chromium-browser || true
fi
;;
*)
apt_install chromium || apt_install chromium-browser || true
@@ -1024,16 +1172,34 @@ install_redroid() {
esac
name="${REDROID_INSTANCE_PREFIX}-1"
data_dir="${REDROID_DATA_PREFIX}-${name}"
install_redroid_host_service || true
if ! ensure_redroid_host_support; then
log "Redroid skipped: $(redroid_support_detail)"
if docker ps -a --format '{{.Names}}' 2>/dev/null | grep -qx "$name"; then
log "Removing incompatible Redroid container (${name})"
docker rm -f "$name" >/dev/null 2>&1 || true
fi
return 0
fi
mkdir -p "$data_dir"
allow_tcp_port_if_firewall_active "$REDROID_DEFAULT_PORT"
if docker ps --format '{{.Names}}' 2>/dev/null | grep -qx "$name"; then
log "Redroid already running"
return 0
if redroid_container_matches_host_support "$name"; then
log "Redroid already running"
return 0
fi
log "Recreating running Redroid container to apply binder mounts"
docker rm -f "$name" >/dev/null 2>&1 || true
fi
if docker ps -a --format '{{.Names}}' 2>/dev/null | grep -qx "$name"; then
log "Starting existing Redroid container"
docker start "$name" >/dev/null 2>&1 || true
return 0
if ! redroid_container_matches_host_support "$name"; then
log "Recreating existing Redroid container to apply binder mounts"
docker rm -f "$name" >/dev/null 2>&1 || true
else
log "Starting existing Redroid container"
docker start "$name" >/dev/null 2>&1 || true
return 0
fi
fi
log "Installing Redroid container (${image})"
docker run -d \
@@ -1045,9 +1211,12 @@ install_redroid() {
-v "${data_dir}:/data" \
-e "REDROID_GPU_MODE=${REDROID_GPU_MODE}" \
-e "REDROID_DEVICE_PROFILE=${REDROID_DEVICE_PROFILE}" \
$( [ "${REDROID_ADB_INSECURE:-1}" = "1" ] && printf '%s ' '-e' 'REDROID_ADB_INSECURE=1' ) \
$( [ -e /dev/kvm ] && printf '%s ' '--device' '/dev/kvm' ) \
$( [ -d /dev/dri ] && printf '%s ' '-v /dev/dri:/dev/dri' ) \
$( [ -d /dev/dma_heap ] && printf '%s ' '-v /dev/dma_heap:/dev/dma_heap' ) \
$( [ -d /dev/binderfs ] && printf '%s ' '-v /dev/binderfs:/dev/binderfs' ) \
$( redroid_binderfs_ready && printf '%s ' '-v' '/dev/binderfs:/dev/binderfs' ) \
$( redroid_legacy_binder_devices_ready && printf '%s ' '--device' '/dev/binder' '--device' '/dev/hwbinder' '--device' '/dev/vndbinder' ) \
$( [ -e /dev/rga ] && printf '%s ' '--device /dev/rga' ) \
$( [ -e /dev/mpp_service ] && printf '%s ' '--device /dev/mpp_service' ) \
"$image" ${REDROID_BOOT_ARGS:-} >/dev/null 2>&1 || log "WARN: Redroid create failed; check /dev/kvm, binderfs, and image availability"