mirror of
https://github.com/vdsm/virtual-dsm.git
synced 2026-08-29 20:26:57 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
799649e78c | ||
|
|
12060c72b2 | ||
|
|
6eadd1b953 | ||
|
|
342ca4da03 | ||
|
|
b0b6190560 | ||
|
|
075410e4cf | ||
|
|
2a388b434b | ||
|
|
280c4037f3 | ||
|
|
007bdc735d | ||
|
|
41fc0a6a10 | ||
|
|
7753e4ac74 | ||
|
|
f74bf35202 | ||
|
|
aa472c96c6 | ||
|
|
0dcb880800 | ||
|
|
8daa6973b7 | ||
|
|
3884befa56 | ||
|
|
85b83f8eb1 | ||
|
|
f395dfaa66 | ||
|
|
b3124075ea | ||
|
|
aed909bdee | ||
|
|
d4cf5778e2 | ||
|
|
48de7dd00b | ||
|
|
686e64da3f | ||
|
|
7517dc8b3e | ||
|
|
660fe715e4 | ||
|
|
04ea29ec77 | ||
|
|
02c891cb16 | ||
|
|
0b5d21357e |
@@ -28,7 +28,7 @@ jobs:
|
|||||||
-
|
-
|
||||||
name: Docker metadata
|
name: Docker metadata
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v6
|
||||||
with:
|
with:
|
||||||
context: git
|
context: git
|
||||||
images: |
|
images: |
|
||||||
@@ -43,23 +43,23 @@ jobs:
|
|||||||
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
|
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
|
||||||
-
|
-
|
||||||
name: Set up Docker Buildx
|
name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v4
|
||||||
-
|
-
|
||||||
name: Login into Docker Hub
|
name: Login into Docker Hub
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v4
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
-
|
-
|
||||||
name: Login to GitHub Container Registry
|
name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v4
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
-
|
-
|
||||||
name: Build Docker image
|
name: Build Docker image
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v7
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
|
|||||||
@@ -24,6 +24,6 @@ jobs:
|
|||||||
failure-threshold: warning
|
failure-threshold: warning
|
||||||
-
|
-
|
||||||
name: Validate JSON and YML files
|
name: Validate JSON and YML files
|
||||||
uses: GrantBirki/json-yaml-validate@v4
|
uses: GrantBirki/json-yaml-validate@v5.0.0
|
||||||
with:
|
with:
|
||||||
yaml_exclude_regex: ".*\\kubernetes\\.yml$"
|
yaml_exclude_regex: ".*\\kubernetes\\.yml$"
|
||||||
|
|||||||
+4
-2
@@ -14,6 +14,8 @@ FROM debian:trixie-slim
|
|||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
ARG VERSION_ARG="0.0"
|
ARG VERSION_ARG="0.0"
|
||||||
|
ARG VERSION_PASST="2026_05_07"
|
||||||
|
|
||||||
ARG DEBCONF_NOWARNINGS="yes"
|
ARG DEBCONF_NOWARNINGS="yes"
|
||||||
ARG DEBIAN_FRONTEND="noninteractive"
|
ARG DEBIAN_FRONTEND="noninteractive"
|
||||||
ARG DEBCONF_NONINTERACTIVE_SEEN="true"
|
ARG DEBCONF_NONINTERACTIVE_SEEN="true"
|
||||||
@@ -39,7 +41,7 @@ RUN set -eu && \
|
|||||||
iproute2 \
|
iproute2 \
|
||||||
dnsmasq \
|
dnsmasq \
|
||||||
fakeroot \
|
fakeroot \
|
||||||
apt-utils \
|
apt-utils \
|
||||||
net-tools \
|
net-tools \
|
||||||
e2fsprogs \
|
e2fsprogs \
|
||||||
qemu-utils \
|
qemu-utils \
|
||||||
@@ -49,7 +51,7 @@ RUN set -eu && \
|
|||||||
ca-certificates \
|
ca-certificates \
|
||||||
netcat-openbsd \
|
netcat-openbsd \
|
||||||
qemu-system-x86 && \
|
qemu-system-x86 && \
|
||||||
wget "https://github.com/qemus/passt/releases/download/v2025_09_19/passt_2025_09_19_${TARGETARCH}.deb" -O /tmp/passt.deb -q && \
|
wget "https://github.com/qemus/passt/releases/download/v${VERSION_PASST}/passt_${VERSION_PASST}_${TARGETARCH}.deb" -O /tmp/passt.deb -q --timeout=10 && \
|
||||||
dpkg -i /tmp/passt.deb && \
|
dpkg -i /tmp/passt.deb && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
pip3 install --no-cache-dir --break-system-packages --root-user-action=ignore dissect.cstruct && \
|
pip3 install --no-cache-dir --break-system-packages --root-user-action=ignore dissect.cstruct && \
|
||||||
|
|||||||
+26
-47
@@ -269,12 +269,14 @@ convertDisk() {
|
|||||||
local TMP_FILE="$DISK_BASE.tmp"
|
local TMP_FILE="$DISK_BASE.tmp"
|
||||||
rm -f "$TMP_FILE"
|
rm -f "$TMP_FILE"
|
||||||
|
|
||||||
|
local DIR
|
||||||
|
DIR=$(dirname "$TMP_FILE")
|
||||||
|
|
||||||
if [[ "$ALLOCATE" != [Nn]* ]]; then
|
if [[ "$ALLOCATE" != [Nn]* ]]; then
|
||||||
|
|
||||||
local DIR CUR_SIZE SPACE GB
|
local CUR_SIZE SPACE GB
|
||||||
|
|
||||||
# Check free diskspace
|
# Check free diskspace
|
||||||
DIR=$(dirname "$TMP_FILE")
|
|
||||||
CUR_SIZE=$(getSize "$SOURCE_FILE")
|
CUR_SIZE=$(getSize "$SOURCE_FILE")
|
||||||
SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
|
SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
|
||||||
|
|
||||||
@@ -536,16 +538,15 @@ addDisk () {
|
|||||||
GB=$(formatBytes "$FREE")
|
GB=$(formatBytes "$FREE")
|
||||||
LEFT=$(formatBytes "$LEFT")
|
LEFT=$(formatBytes "$LEFT")
|
||||||
CUR_SIZE=$(formatBytes "$CUR_SIZE")
|
CUR_SIZE=$(formatBytes "$CUR_SIZE")
|
||||||
msg="the virtual size of the ${DISK_DESC,,} is $CUR_SIZE"
|
msg="The virtual size of the ${DISK_DESC,,} is $CUR_SIZE"
|
||||||
|
|
||||||
if [[ "$USED" == "0" ]]; then
|
if [ -n "$USED" ] && [[ "$USED" != "0" ]]; then
|
||||||
msg+=","
|
|
||||||
else
|
|
||||||
USED=$(formatBytes "$USED")
|
USED=$(formatBytes "$USED")
|
||||||
msg+=" (of which $USED is used),"
|
msg+=" (of which $USED is used)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
warn "$msg but there is only $GB of free space left in $DIR, make at least $LEFT more room available!"
|
info "$msg, but there is only $GB of free space remaining in $DIR now."
|
||||||
|
info "Please consider making at least $LEFT more space available in $DIR for future expansions."
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -573,18 +574,25 @@ addDevice () {
|
|||||||
[ ! -b "$DISK_DEV" ] && error "Device $DISK_DEV cannot be found! Please add it to the 'devices' section of your compose file." && exit 55
|
[ ! -b "$DISK_DEV" ] && error "Device $DISK_DEV cannot be found! Please add it to the 'devices' section of your compose file." && exit 55
|
||||||
|
|
||||||
local sectors=""
|
local sectors=""
|
||||||
local result logical physical
|
local dev_type=""
|
||||||
result=$(fdisk -l "$DISK_DEV" | grep -m 1 -o "(logical/physical): .*" | cut -c 21-)
|
dev_type=$(lsblk -no TYPE "$DISK_DEV" 2>/dev/null | head -n1)
|
||||||
logical="${result%% *}"
|
|
||||||
physical=$(echo "$result" | grep -m 1 -o "/ .*" | cut -c 3-)
|
|
||||||
physical="${physical%% *}"
|
|
||||||
|
|
||||||
if [ -n "$physical" ]; then
|
# Only detect and apply sector sizes for partitions, not whole disks
|
||||||
if [[ "$physical" != "512" ]]; then
|
# Whole disk passthrough with explicit sector sizes causes DSM not to recognize the disk
|
||||||
sectors=",logical_block_size=$logical,physical_block_size=$physical"
|
if [[ "$dev_type" == "part" ]]; then
|
||||||
|
local result logical physical
|
||||||
|
result=$(fdisk -l "$DISK_DEV" | grep -m 1 -o "(logical/physical): .*" | cut -c 21-)
|
||||||
|
logical="${result%% *}"
|
||||||
|
physical=$(echo "$result" | grep -m 1 -o "/ .*" | cut -c 3-)
|
||||||
|
physical="${physical%% *}"
|
||||||
|
|
||||||
|
if [ -n "$physical" ]; then
|
||||||
|
if [[ "$physical" != "512" ]]; then
|
||||||
|
sectors=",logical_block_size=$logical,physical_block_size=$physical"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
warn "Failed to determine the sector size for $DISK_DEV"
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
warn "Failed to determine the sector size for $DISK_DEV"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DISK_OPTS+=$(createDevice "$DISK_DEV" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "raw" "$DISK_IO" "$DISK_CACHE" "" "$sectors")
|
DISK_OPTS+=$(createDevice "$DISK_DEV" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "raw" "$DISK_IO" "$DISK_CACHE" "" "$sectors")
|
||||||
@@ -621,37 +629,8 @@ DISK_OPTS+=$(createDevice "$BOOT" "$DISK_TYPE" "1" "0xa" "raw" "$DISK_IO" "$DISK
|
|||||||
DISK_OPTS+=$(createDevice "$SYSTEM" "$DISK_TYPE" "2" "0xb" "raw" "$DISK_IO" "$DISK_CACHE" "" "")
|
DISK_OPTS+=$(createDevice "$SYSTEM" "$DISK_TYPE" "2" "0xb" "raw" "$DISK_IO" "$DISK_CACHE" "" "")
|
||||||
|
|
||||||
DISK1_FILE="$STORAGE/${DISK_NAME}"
|
DISK1_FILE="$STORAGE/${DISK_NAME}"
|
||||||
if [ ! -f "$DISK1_FILE.img" ] && [ -f "$STORAGE/data${DISK_SIZE}.img" ]; then
|
|
||||||
# Fallback for legacy installs
|
|
||||||
mv "$STORAGE/data${DISK_SIZE}.img" "$DISK1_FILE.img"
|
|
||||||
fi
|
|
||||||
|
|
||||||
DISK2_FILE="/storage2/${DISK_NAME}2"
|
DISK2_FILE="/storage2/${DISK_NAME}2"
|
||||||
if [ ! -f "$DISK2_FILE.img" ]; then
|
|
||||||
# Fallback for legacy installs
|
|
||||||
FALLBACK="/storage2/data.img"
|
|
||||||
if [[ -f "$DISK1_FILE.img" && -f "$FALLBACK" ]]; then
|
|
||||||
SIZE1=$(stat -c%s "$FALLBACK")
|
|
||||||
SIZE2=$(stat -c%s "$DISK1_FILE.img")
|
|
||||||
if [[ SIZE1 -ne SIZE2 ]]; then
|
|
||||||
mv "$FALLBACK" "$DISK2_FILE.img"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
DISK3_FILE="/storage3/${DISK_NAME}3"
|
DISK3_FILE="/storage3/${DISK_NAME}3"
|
||||||
if [ ! -f "$DISK3_FILE.img" ]; then
|
|
||||||
# Fallback for legacy installs
|
|
||||||
FALLBACK="/storage3/data.img"
|
|
||||||
if [[ -f "$DISK1_FILE.img" && -f "$FALLBACK" ]]; then
|
|
||||||
SIZE1=$(stat -c%s "$FALLBACK")
|
|
||||||
SIZE2=$(stat -c%s "$DISK1_FILE.img")
|
|
||||||
if [[ SIZE1 -ne SIZE2 ]]; then
|
|
||||||
mv "$FALLBACK" "$DISK3_FILE.img"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
DISK4_FILE="/storage4/${DISK_NAME}4"
|
DISK4_FILE="/storage4/${DISK_NAME}4"
|
||||||
|
|
||||||
: "${DISK2_SIZE:=""}"
|
: "${DISK2_SIZE:=""}"
|
||||||
|
|||||||
+36
-44
@@ -1,14 +1,18 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -Eeuo pipefail
|
set -Eeuo pipefail
|
||||||
|
|
||||||
|
msg="Checking memory..."
|
||||||
|
[[ "$DEBUG" == [Yy1]* ]] && echo "$msg"
|
||||||
|
|
||||||
RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
|
RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
|
||||||
|
AVAIL_MEM=$(formatBytes "$RAM_AVAIL")
|
||||||
|
|
||||||
if [[ "$RAM_CHECK" != [Nn]* && "${RAM_SIZE,,}" != "max" && "${RAM_SIZE,,}" != "half" ]]; then
|
if [[ "$RAM_CHECK" != [Nn]* && "${RAM_SIZE,,}" != "max" && "${RAM_SIZE,,}" != "half" ]]; then
|
||||||
|
|
||||||
AVAIL_MEM=$(formatBytes "$RAM_AVAIL")
|
wanted=$(numfmt --from=iec "$RAM_SIZE")
|
||||||
|
|
||||||
if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
|
if (( (wanted + RAM_SPARE) > RAM_AVAIL )); then
|
||||||
msg="Your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is too high for the $AVAIL_MEM of memory available,"
|
msg="Your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is too high for the $AVAIL_MEM of free memory available,"
|
||||||
if [[ "${FS,,}" == "zfs" ]]; then
|
if [[ "${FS,,}" == "zfs" ]]; then
|
||||||
info "$msg but since ZFS is active this will be ignored."
|
info "$msg but since ZFS is active this will be ignored."
|
||||||
else
|
else
|
||||||
@@ -16,8 +20,8 @@ if [[ "$RAM_CHECK" != [Nn]* && "${RAM_SIZE,,}" != "max" && "${RAM_SIZE,,}" != "h
|
|||||||
warn "$msg it will automatically be adjusted to a lower amount."
|
warn "$msg it will automatically be adjusted to a lower amount."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if (( (RAM_WANTED + (RAM_SPARE * 3)) > RAM_AVAIL )); then
|
if (( (wanted + (RAM_SPARE * 3)) > RAM_AVAIL )); then
|
||||||
msg="your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is very close to the $AVAIL_MEM of memory available,"
|
msg="your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is very close to the $AVAIL_MEM of free memory available,"
|
||||||
if [[ "${FS,,}" == "zfs" ]]; then
|
if [[ "${FS,,}" == "zfs" ]]; then
|
||||||
info "$msg but since ZFS is active this will be ignored."
|
info "$msg but since ZFS is active this will be ignored."
|
||||||
else
|
else
|
||||||
@@ -30,57 +34,45 @@ fi
|
|||||||
|
|
||||||
if [[ "${RAM_SIZE,,}" == "half" ]]; then
|
if [[ "${RAM_SIZE,,}" == "half" ]]; then
|
||||||
|
|
||||||
RAM_WANTED=$(( RAM_AVAIL / 2 ))
|
if (( (RAM_AVAIL / 2) > RAM_SPARE )); then
|
||||||
RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
|
wanted=$(( (RAM_AVAIL / 2) / 1048577 ))
|
||||||
|
RAM_SIZE="${wanted}M"
|
||||||
if (( "$RAM_WANTED" < 1 )); then
|
info "Allocated $wanted MB of RAM for the virtual machine."
|
||||||
RAM_WANTED=$(( RAM_AVAIL / 2 ))
|
|
||||||
RAM_WANTED=$(( RAM_WANTED / 1048577 ))
|
|
||||||
RAM_SIZE="${RAM_WANTED}M"
|
|
||||||
else
|
else
|
||||||
RAM_SIZE="${RAM_WANTED}G"
|
RAM_SIZE="max"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${RAM_SIZE,,}" == "max" ]]; then
|
if [[ "${RAM_SIZE,,}" == "max" ]]; then
|
||||||
|
|
||||||
RAM_WANTED=$(( RAM_AVAIL - (RAM_SPARE * 3) ))
|
if (( RAM_AVAIL < (RAM_SPARE * 2) )); then
|
||||||
RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
|
|
||||||
|
|
||||||
if (( "$RAM_WANTED" < 1 )); then
|
wanted=$(( RAM_AVAIL / 2 ))
|
||||||
|
|
||||||
RAM_WANTED=$(( RAM_AVAIL - (RAM_SPARE * 2) ))
|
|
||||||
RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
|
|
||||||
|
|
||||||
if (( "$RAM_WANTED" < 1 )); then
|
|
||||||
|
|
||||||
RAM_WANTED=$(( RAM_AVAIL - RAM_SPARE ))
|
|
||||||
RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
|
|
||||||
|
|
||||||
if (( "$RAM_WANTED" < 1 )); then
|
|
||||||
|
|
||||||
RAM_WANTED=$(( RAM_AVAIL - RAM_SPARE ))
|
|
||||||
RAM_WANTED=$(( RAM_WANTED / 1048577 ))
|
|
||||||
|
|
||||||
if (( "$RAM_WANTED" < 1 )); then
|
|
||||||
|
|
||||||
RAM_WANTED=$(( RAM_AVAIL ))
|
|
||||||
RAM_WANTED=$(( RAM_WANTED / 1048577 ))
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
RAM_SIZE="${RAM_WANTED}M"
|
|
||||||
else
|
|
||||||
RAM_SIZE="${RAM_WANTED}G"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
RAM_SIZE="${RAM_WANTED}G"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
RAM_SIZE="${RAM_WANTED}G"
|
|
||||||
|
wanted=$(( RAM_AVAIL - (RAM_SPARE * 3) ))
|
||||||
|
|
||||||
|
if (( wanted < (RAM_SPARE * 6) )); then
|
||||||
|
wanted=$(( RAM_AVAIL - RAM_SPARE ))
|
||||||
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
wanted=$(( wanted / 1048577 ))
|
||||||
|
RAM_SIZE="${wanted}M"
|
||||||
|
|
||||||
|
info "Allocated $wanted MB of RAM for the virtual machine."
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
wanted=$(numfmt --from=iec "$RAM_SIZE")
|
||||||
|
|
||||||
|
if [ "$wanted" -lt "$RAM_MINIMUM" ]; then
|
||||||
|
wanted=$(( wanted / 1048577 ))
|
||||||
|
error "Not enough memory available, there is only $wanted MB left!"
|
||||||
|
exit 16
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
+44
-24
@@ -117,7 +117,7 @@ configureDHCP() {
|
|||||||
|
|
||||||
configureDNS() {
|
configureDNS() {
|
||||||
|
|
||||||
local if="$1"
|
local fa="$1"
|
||||||
local ip="$2"
|
local ip="$2"
|
||||||
local mac="$3"
|
local mac="$3"
|
||||||
local host="$4"
|
local host="$4"
|
||||||
@@ -155,9 +155,12 @@ configureDNS() {
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# Set interfaces
|
# Set interfaces
|
||||||
arguments+=" --interface=$if"
|
arguments+=" --interface=$fa"
|
||||||
arguments+=" --bind-interfaces"
|
arguments+=" --bind-interfaces"
|
||||||
|
|
||||||
|
# Workaround NET_RAW capability
|
||||||
|
arguments+=" --no-ping"
|
||||||
|
|
||||||
# Add DNS entry for container
|
# Add DNS entry for container
|
||||||
arguments+=" --address=/host.lan/$gateway"
|
arguments+=" --address=/host.lan/$gateway"
|
||||||
|
|
||||||
@@ -172,9 +175,11 @@ configureDNS() {
|
|||||||
arguments=$(echo "$arguments" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')
|
arguments=$(echo "$arguments" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')
|
||||||
[[ "$DEBUG" == [Yy1]* ]] && printf "Dnsmasq arguments:\n\n%s\n\n" "${arguments// -/$'\n-'}"
|
[[ "$DEBUG" == [Yy1]* ]] && printf "Dnsmasq arguments:\n\n%s\n\n" "${arguments// -/$'\n-'}"
|
||||||
|
|
||||||
if ! $DNSMASQ ${arguments:+ $arguments}; then
|
{ $DNSMASQ ${arguments:+ $arguments}; rc=$?; } || :
|
||||||
|
|
||||||
local msg="Failed to start Dnsmasq, reason: $?"
|
if (( rc != 0 )); then
|
||||||
|
|
||||||
|
local msg="Failed to start Dnsmasq, reason: $rc"
|
||||||
|
|
||||||
if [[ "${NETWORK,,}" == "slirp" || "${NETWORK,,}" == "passt" || "$ROOTLESS" != [Yy1]* || "$DEBUG" == [Yy1]* ]]; then
|
if [[ "${NETWORK,,}" == "slirp" || "${NETWORK,,}" == "passt" || "$ROOTLESS" != [Yy1]* || "$DEBUG" == [Yy1]* ]]; then
|
||||||
[ -f "$log" ] && [ -s "$log" ] && cat "$log"
|
[ -f "$log" ] && [ -s "$log" ] && cat "$log"
|
||||||
@@ -243,14 +248,13 @@ getUserPorts() {
|
|||||||
done
|
done
|
||||||
|
|
||||||
# Remove duplicates
|
# Remove duplicates
|
||||||
ports=$(echo "${ports//,,/,}," | awk 'BEGIN{RS=ORS=","} !seen[$0]++' | sed 's/,*$//g')
|
echo "${ports//,,/,}," | awk 'BEGIN{RS=ORS=","} !seen[$0]++' | sed 's/,*$//g'
|
||||||
|
|
||||||
echo "$ports"
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
getSlirp() {
|
getSlirp() {
|
||||||
|
|
||||||
|
local ip="$1"
|
||||||
local args=""
|
local args=""
|
||||||
local list=""
|
local list=""
|
||||||
|
|
||||||
@@ -266,17 +270,15 @@ getSlirp() {
|
|||||||
proto="udp"
|
proto="udp"
|
||||||
num="${port%/udp}"
|
num="${port%/udp}"
|
||||||
elif [[ "$port" != *"/tcp" ]]; then
|
elif [[ "$port" != *"/tcp" ]]; then
|
||||||
args+="hostfwd=$proto::$num-$VM_NET_IP:$num,"
|
args+="hostfwd=$proto::$num-$ip:$num,"
|
||||||
proto="udp"
|
proto="udp"
|
||||||
num="${port%/udp}"
|
num="${port%/udp}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
args+="hostfwd=$proto::$num-$VM_NET_IP:$num,"
|
args+="hostfwd=$proto::$num-$ip:$num,"
|
||||||
done
|
done
|
||||||
|
|
||||||
args=$(echo "$args" | sed 's/,*$//g')
|
echo "$args" | sed 's/,*$//g'
|
||||||
|
|
||||||
echo "${args%?}"
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -297,7 +299,7 @@ configureSlirp() {
|
|||||||
NET_OPTS="-netdev user,id=hostnet0,ipv4=on,host=$gateway,net=${gateway%.*}.0/24,dhcpstart=$ip,${ipv6}hostname=$VM_NET_HOST"
|
NET_OPTS="-netdev user,id=hostnet0,ipv4=on,host=$gateway,net=${gateway%.*}.0/24,dhcpstart=$ip,${ipv6}hostname=$VM_NET_HOST"
|
||||||
|
|
||||||
local forward=""
|
local forward=""
|
||||||
forward=$(getSlirp)
|
forward=$(getSlirp "$ip")
|
||||||
[ -n "$forward" ] && NET_OPTS+=",$forward"
|
[ -n "$forward" ] && NET_OPTS+=",$forward"
|
||||||
|
|
||||||
if [[ "${DNSMASQ_DISABLE:-}" == [Yy1]* ]]; then
|
if [[ "${DNSMASQ_DISABLE:-}" == [Yy1]* ]]; then
|
||||||
@@ -351,7 +353,7 @@ configurePasst() {
|
|||||||
|
|
||||||
PASST_OPTS+=" -H $VM_NET_HOST"
|
PASST_OPTS+=" -H $VM_NET_HOST"
|
||||||
PASST_OPTS+=" -M $GATEWAY_MAC"
|
PASST_OPTS+=" -M $GATEWAY_MAC"
|
||||||
PASST_OPTS+=" -P $PASST_PID"
|
PASST_OPTS+=" -P $PASST_PID"
|
||||||
PASST_OPTS+=" -l $log"
|
PASST_OPTS+=" -l $log"
|
||||||
PASST_OPTS+=" -q"
|
PASST_OPTS+=" -q"
|
||||||
|
|
||||||
@@ -361,7 +363,10 @@ configurePasst() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
PASST_OPTS=$(echo "$PASST_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')
|
PASST_OPTS=$(echo "$PASST_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')
|
||||||
[[ "$DEBUG" == [Yy1]* ]] && printf "Passt arguments:\n\n%s\n\n" "${PASST_OPTS// -/$'\n-'}"
|
|
||||||
|
if [[ "$DEBUG" == [Yy1]* || "$PASST_DEBUG" == [Yy1]* ]]; then
|
||||||
|
printf "Passt arguments:\n\n%s\n\n" "${PASST_OPTS// -/$'\n-'}"
|
||||||
|
fi
|
||||||
|
|
||||||
[ ! -f "$PASST" ] && cp /usr/bin/passt* /run
|
[ ! -f "$PASST" ] && cp /usr/bin/passt* /run
|
||||||
|
|
||||||
@@ -484,7 +489,7 @@ configureNAT() {
|
|||||||
warn "failed to set master bridge!" && return 1
|
warn "failed to set master bridge!" && return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if grep -wq "nf_tables" /proc/modules; then
|
if command -v iptables-nft >/dev/null 2>&1 && iptables-nft -V >/dev/null 2>&1; then
|
||||||
update-alternatives --set iptables /usr/sbin/iptables-nft > /dev/null
|
update-alternatives --set iptables /usr/sbin/iptables-nft > /dev/null
|
||||||
update-alternatives --set ip6tables /usr/sbin/ip6tables-nft > /dev/null
|
update-alternatives --set ip6tables /usr/sbin/ip6tables-nft > /dev/null
|
||||||
else
|
else
|
||||||
@@ -550,11 +555,11 @@ closeBridge() {
|
|||||||
"user"* | "passt" | "slirp" ) return 0 ;;
|
"user"* | "passt" | "slirp" ) return 0 ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
ip link set "$VM_NET_TAP" down promisc off &> null || true
|
ip link set "$VM_NET_TAP" down promisc off &> /dev/null || true
|
||||||
ip link delete "$VM_NET_TAP" &> null || true
|
ip link delete "$VM_NET_TAP" &> /dev/null || true
|
||||||
|
|
||||||
ip link set "$VM_NET_BRIDGE" down &> null || true
|
ip link set "$VM_NET_BRIDGE" down &> /dev/null || true
|
||||||
ip link delete "$VM_NET_BRIDGE" &> null || true
|
ip link delete "$VM_NET_BRIDGE" &> /dev/null || true
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
@@ -614,21 +619,22 @@ cleanUp() {
|
|||||||
|
|
||||||
checkOS() {
|
checkOS() {
|
||||||
|
|
||||||
local kernel
|
|
||||||
local os=""
|
local os=""
|
||||||
local if="macvlan"
|
local kernel=""
|
||||||
|
local iface="macvlan"
|
||||||
|
|
||||||
kernel=$(uname -a)
|
kernel=$(uname -a)
|
||||||
|
|
||||||
[[ "${kernel,,}" == *"darwin"* ]] && os="$ENGINE Desktop for macOS"
|
[[ "${kernel,,}" == *"darwin"* ]] && os="$ENGINE Desktop for macOS"
|
||||||
[[ "${kernel,,}" == *"microsoft"* ]] && os="$ENGINE Desktop for Windows"
|
[[ "${kernel,,}" == *"microsoft"* ]] && os="$ENGINE Desktop for Windows"
|
||||||
|
|
||||||
if [[ "$DHCP" == [Yy1]* ]]; then
|
if [[ "$DHCP" == [Yy1]* ]]; then
|
||||||
if="macvtap"
|
iface="macvtap"
|
||||||
[[ "${kernel,,}" == *"synology"* ]] && os="Synology Container Manager"
|
[[ "${kernel,,}" == *"synology"* ]] && os="Synology Container Manager"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$os" ]; then
|
if [ -n "$os" ]; then
|
||||||
warn "you are using $os which does not support $if, please revert to bridge networking!"
|
warn "you are using $os which does not support $iface, please revert to bridge networking!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
@@ -693,6 +699,20 @@ getInfo() {
|
|||||||
exit 29
|
exit 29
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if uname -a | grep -Eqi 'unraid|truenas'; then
|
||||||
|
|
||||||
|
# Check if host exposes the bridge-nf sysctl
|
||||||
|
# (only visible if br_netfilter is loaded and /proc/sys is accessible)
|
||||||
|
|
||||||
|
BNF="/proc/sys/net/bridge/bridge-nf-call-iptables"
|
||||||
|
|
||||||
|
if [[ -r "$BNF" ]] && [[ "$(cat "$BNF")" != "0" ]]; then
|
||||||
|
warn "external LAN clients may not be able to reach this container, because net.bridge.bridge-nf-call-iptables=1."
|
||||||
|
warn "you can fix this issue by running 'sysctl -w net.bridge.bridge-nf-call-iptables=0' on the host system."
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
if [[ "$IP" != "172."* && "$IP" != "10.8"* && "$IP" != "10.9"* ]]; then
|
if [[ "$IP" != "172."* && "$IP" != "10.8"* && "$IP" != "10.9"* ]]; then
|
||||||
|
|||||||
+1
-3
@@ -10,8 +10,6 @@ API_CMD=6
|
|||||||
API_HOST="127.0.0.1:$COM_PORT"
|
API_HOST="127.0.0.1:$COM_PORT"
|
||||||
|
|
||||||
QEMU_TERM=""
|
QEMU_TERM=""
|
||||||
QEMU_DIR="/run/shm"
|
|
||||||
QEMU_PID="$QEMU_DIR/qemu.pid"
|
|
||||||
QEMU_LOG="$QEMU_DIR/qemu.log"
|
QEMU_LOG="$QEMU_DIR/qemu.log"
|
||||||
QEMU_OUT="$QEMU_DIR/qemu.out"
|
QEMU_OUT="$QEMU_DIR/qemu.out"
|
||||||
QEMU_END="$QEMU_DIR/qemu.end"
|
QEMU_END="$QEMU_DIR/qemu.end"
|
||||||
@@ -52,7 +50,7 @@ finish() {
|
|||||||
# Workaround for zombie pid
|
# Workaround for zombie pid
|
||||||
[ ! -s "$QEMU_PID" ] && break
|
[ ! -s "$QEMU_PID" ] && break
|
||||||
|
|
||||||
if [ "$cnt" == "5" ]; then
|
if [ "$cnt" -eq 5 ]; then
|
||||||
echo && error "QEMU did not terminate itself, forcefully killing process..."
|
echo && error "QEMU did not terminate itself, forcefully killing process..."
|
||||||
{ kill -9 "$pid" || true; } 2>/dev/null
|
{ kill -9 "$pid" || true; } 2>/dev/null
|
||||||
fi
|
fi
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ CLOCKSOURCE="tsc"
|
|||||||
CLOCK="/sys/devices/system/clocksource/clocksource0/current_clocksource"
|
CLOCK="/sys/devices/system/clocksource/clocksource0/current_clocksource"
|
||||||
|
|
||||||
if [ ! -f "$CLOCK" ]; then
|
if [ ! -f "$CLOCK" ]; then
|
||||||
warn "file \"$CLOCK\" cannot not found?"
|
warn "file \"$CLOCK\" cannot be found?"
|
||||||
else
|
else
|
||||||
result=$(<"$CLOCK")
|
result=$(<"$CLOCK")
|
||||||
result="${result//[![:print:]]/}"
|
result="${result//[![:print:]]/}"
|
||||||
|
|||||||
+20
-12
@@ -64,6 +64,7 @@ TEMPLATE="/var/www/index.html"
|
|||||||
FOOTER1="$APP for $ENGINE v$(</run/version)"
|
FOOTER1="$APP for $ENGINE v$(</run/version)"
|
||||||
FOOTER2="<a href='$SUPPORT'>$SUPPORT</a>"
|
FOOTER2="<a href='$SUPPORT'>$SUPPORT</a>"
|
||||||
|
|
||||||
|
SOCKETS=1
|
||||||
CPU=$(cpu)
|
CPU=$(cpu)
|
||||||
SYS=$(uname -r)
|
SYS=$(uname -r)
|
||||||
HOST=$(hostname -s)
|
HOST=$(hostname -s)
|
||||||
@@ -72,31 +73,37 @@ MINOR=$(echo "$SYS" | cut -d '.' -f2)
|
|||||||
ARCH=$(dpkg --print-architecture)
|
ARCH=$(dpkg --print-architecture)
|
||||||
CORES=$(grep -c '^processor' /proc/cpuinfo)
|
CORES=$(grep -c '^processor' /proc/cpuinfo)
|
||||||
|
|
||||||
if ! grep -qi "socket(s)" <<< "$(lscpu)"; then
|
if grep -qi "socket(s)" <<< "$(lscpu)"; then
|
||||||
SOCKETS=1
|
SOCKETS=$(lscpu | grep -m 1 -i 'socket(s)' | awk '{print $2}')
|
||||||
else
|
[ -z "${SOCKETS##*[!0-9]*}" ] && SOCKETS=1
|
||||||
SOCKETS=$(lscpu | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')
|
[ "$SOCKETS" -lt "1" ] && SOCKETS=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CPU_CORES="${CPU_CORES// /}"
|
CPU_CORES="${CPU_CORES// /}"
|
||||||
|
[ -z "$CPU_CORES" ] && CPU_CORES=2
|
||||||
[[ "${CPU_CORES,,}" == "max" ]] && CPU_CORES="$CORES"
|
[[ "${CPU_CORES,,}" == "max" ]] && CPU_CORES="$CORES"
|
||||||
[[ "${CPU_CORES,,}" == "half" ]] && CPU_CORES=$(( CORES / 2 ))
|
[[ "${CPU_CORES,,}" == "half" ]] && CPU_CORES=$(( CORES / 2 ))
|
||||||
[[ "${CPU_CORES,,}" == "0" ]] && CPU_CORES="1"
|
[ -z "${CPU_CORES##*[!0-9]*}" ] && error "Invalid amount of CPU_CORES: $CPU_CORES" && exit 15
|
||||||
[ -n "${CPU_CORES//[0-9 ]}" ] && error "Invalid amount of CPU_CORES: $CPU_CORES" && exit 15
|
|
||||||
|
|
||||||
|
[ "$CPU_CORES" -lt "1" ] && CPU_CORES=1
|
||||||
if [ "$CPU_CORES" -gt "$CORES" ]; then
|
if [ "$CPU_CORES" -gt "$CORES" ]; then
|
||||||
warn "The amount for CPU_CORES (${CPU_CORES}) exceeds the amount of logical cores available, so will be limited to ${CORES}."
|
warn "The amount for CPU_CORES (${CPU_CORES}) exceeds the amount of logical cores available (${CORES}) and will be limited."
|
||||||
CPU_CORES="$CORES"
|
CPU_CORES="$CORES"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check system
|
# Check system
|
||||||
|
|
||||||
|
QEMU_DIR="/run/shm"
|
||||||
|
|
||||||
if [ ! -d "/dev/shm" ]; then
|
if [ ! -d "/dev/shm" ]; then
|
||||||
error "Directory /dev/shm not found!" && exit 14
|
error "Directory /dev/shm not found!" && exit 14
|
||||||
else
|
else
|
||||||
[ ! -d "/run/shm" ] && ln -s /dev/shm /run/shm
|
[ ! -d "$QEMU_DIR" ] && ln -s /dev/shm "$QEMU_DIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
QEMU_PID="$QEMU_DIR/qemu.pid"
|
||||||
|
rm -f "$QEMU_PID"
|
||||||
|
|
||||||
# Check folder
|
# Check folder
|
||||||
|
|
||||||
if [[ "${STORAGE,,}" != "/storage" ]]; then
|
if [[ "${STORAGE,,}" != "/storage" ]]; then
|
||||||
@@ -122,12 +129,13 @@ if [[ "${FS,,}" == "ecryptfs" || "${FS,,}" == "tmpfs" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Read memory
|
# Read memory
|
||||||
RAM_SPARE=500000000
|
|
||||||
RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
|
RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
|
||||||
RAM_TOTAL=$(free -b | grep -m 1 Mem: | awk '{print $2}')
|
RAM_TOTAL=$(free -b | grep -m 1 Mem: | awk '{print $2}')
|
||||||
|
|
||||||
|
RAM_SPARE=500000000
|
||||||
|
RAM_MINIMUM=136314880
|
||||||
RAM_SIZE="${RAM_SIZE// /}"
|
RAM_SIZE="${RAM_SIZE// /}"
|
||||||
[ -z "$RAM_SIZE" ] && error "RAM_SIZE not specified!" && exit 16
|
[ -z "$RAM_SIZE" ] && RAM_SIZE="2G"
|
||||||
|
|
||||||
if [[ "${RAM_SIZE,,}" != "max" && "${RAM_SIZE,,}" != "half" ]]; then
|
if [[ "${RAM_SIZE,,}" != "max" && "${RAM_SIZE,,}" != "half" ]]; then
|
||||||
|
|
||||||
@@ -137,8 +145,8 @@ if [[ "${RAM_SIZE,,}" != "max" && "${RAM_SIZE,,}" != "half" ]]; then
|
|||||||
|
|
||||||
RAM_SIZE=$(echo "${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
|
RAM_SIZE=$(echo "${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
|
||||||
! numfmt --from=iec "$RAM_SIZE" &>/dev/null && error "Invalid RAM_SIZE: $RAM_SIZE" && exit 16
|
! numfmt --from=iec "$RAM_SIZE" &>/dev/null && error "Invalid RAM_SIZE: $RAM_SIZE" && exit 16
|
||||||
RAM_WANTED=$(numfmt --from=iec "$RAM_SIZE")
|
wanted=$(numfmt --from=iec "$RAM_SIZE")
|
||||||
[ "$RAM_WANTED" -lt "136314880 " ] && error "RAM_SIZE is too low: $RAM_SIZE" && exit 16
|
[ "$wanted" -lt "$RAM_MINIMUM" ] && error "RAM_SIZE is too low: $RAM_SIZE" && exit 16
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user