mirror of
https://github.com/vdsm/virtual-dsm.git
synced 2025-11-07 02:23:42 +08:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
682e0a9952 | ||
|
|
9a97dfdc70 | ||
|
|
2f383699f9 | ||
|
|
8137a137b3 | ||
|
|
1339d51796 | ||
|
|
dce447c974 |
13
src/check.sh
13
src/check.sh
@@ -10,7 +10,18 @@ file="/run/dsm.url"
|
|||||||
location=$(cat "$file")
|
location=$(cat "$file")
|
||||||
|
|
||||||
if ! curl -m 20 -ILfSs "http://$location/" > /dev/null; then
|
if ! curl -m 20 -ILfSs "http://$location/" > /dev/null; then
|
||||||
echo "Failed to reach page at http://$location" && exit 1
|
|
||||||
|
if [[ "$location" == "20.20"* ]]; then
|
||||||
|
ip="20.20.20.1"
|
||||||
|
port="${location##*:}"
|
||||||
|
echo "Failed to reach DSM at port $port"
|
||||||
|
else
|
||||||
|
echo "Failed to reach DSM at http://$location"
|
||||||
|
ip=$(ip address show dev eth0 | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "You might need to whitelist IP $ip in the DSM firewall." && exit 1
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Healthcheck OK"
|
echo "Healthcheck OK"
|
||||||
|
|||||||
64
src/disk.sh
64
src/disk.sh
@@ -8,7 +8,7 @@ set -Eeuo pipefail
|
|||||||
: ${DISK_CACHE:='none'} # Caching mode, can be set to 'writeback' for better performance
|
: ${DISK_CACHE:='none'} # Caching mode, can be set to 'writeback' for better performance
|
||||||
: ${DISK_DISCARD:='on'} # Controls whether unmap (TRIM) commands are passed to the host.
|
: ${DISK_DISCARD:='on'} # Controls whether unmap (TRIM) commands are passed to the host.
|
||||||
: ${DISK_ROTATION:='1'} # Rotation rate, set to 1 for SSD storage and increase for HDD
|
: ${DISK_ROTATION:='1'} # Rotation rate, set to 1 for SSD storage and increase for HDD
|
||||||
: ${DISK_FLAGS:='nocow=on'} # Specifies the options for use with the qcow2 disk format
|
: ${DISK_FLAGS:=''} # Specifies the options for use with the qcow2 disk format
|
||||||
|
|
||||||
BOOT="$STORAGE/$BASE.boot.img"
|
BOOT="$STORAGE/$BASE.boot.img"
|
||||||
SYSTEM="$STORAGE/$BASE.system.img"
|
SYSTEM="$STORAGE/$BASE.system.img"
|
||||||
@@ -259,6 +259,45 @@ convertDisk() {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
checkFS () {
|
||||||
|
local DISK_FILE=$1
|
||||||
|
local DIR FS FA
|
||||||
|
|
||||||
|
DIR=$(dirname "$DISK_FILE")
|
||||||
|
[ ! -d "$DIR" ] && return 0
|
||||||
|
|
||||||
|
FS=$(stat -f -c %T "$DIR")
|
||||||
|
|
||||||
|
if [[ "$FS" == "overlay"* ]]; then
|
||||||
|
info "Warning: the filesystem of $DIR is OverlayFS, this usually means it was binded to an invalid path!"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$FS" == "xfs" || "$FS" == "zfs" || "$FS" == "btrfs" || "$FS" == "bcachefs" ]]; then
|
||||||
|
local FLAG="nocow"
|
||||||
|
if [[ "$DISK_FLAGS" != *"$FLAG="* ]]; then
|
||||||
|
if [ -z "$DISK_FLAGS" ]; then
|
||||||
|
DISK_FLAGS="$FLAG=on"
|
||||||
|
else
|
||||||
|
DISK_FLAGS="$DISK_FLAGS,$FLAG=on"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f "$DISK_FILE" ] ; then
|
||||||
|
FA=$(lsattr "$DISK_FILE")
|
||||||
|
[[ "$FA" == *"C"* ]] && FA=$(lsattr -d "$DIR")
|
||||||
|
else
|
||||||
|
FA=$(lsattr -d "$DIR")
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$FA" != *"C"* ]]; then
|
||||||
|
info "Warning: the filesystem of $DIR is ${FS^^}, and COW (copy on write) is not disabled for that folder!"
|
||||||
|
info "This will negatively affect performance, please empty the folder and disable COW (chattr +C <path>)."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
addDisk () {
|
addDisk () {
|
||||||
local DISK_ID=$1
|
local DISK_ID=$1
|
||||||
local DISK_BASE=$2
|
local DISK_BASE=$2
|
||||||
@@ -269,30 +308,13 @@ addDisk () {
|
|||||||
local DISK_ADDRESS=$7
|
local DISK_ADDRESS=$7
|
||||||
local DISK_FMT=$8
|
local DISK_FMT=$8
|
||||||
local DISK_FILE="$DISK_BASE.$DISK_EXT"
|
local DISK_FILE="$DISK_BASE.$DISK_EXT"
|
||||||
local DIR FS FA DATA_SIZE PREV_FMT PREV_EXT CUR_SIZE
|
local DIR DATA_SIZE PREV_FMT PREV_EXT CUR_SIZE
|
||||||
|
|
||||||
DIR=$(dirname "$DISK_FILE")
|
DIR=$(dirname "$DISK_FILE")
|
||||||
[ ! -d "$DIR" ] && return 0
|
[ ! -d "$DIR" ] && return 0
|
||||||
|
|
||||||
FS=$(stat -f -c %T "$DIR")
|
|
||||||
if [[ "$FS" == "overlay"* ]]; then
|
|
||||||
info "Warning: the filesystem of $DIR is OverlayFS, this usually means it was binded to an invalid path!"
|
|
||||||
fi
|
|
||||||
if [[ "$FS" == "btrfs"* ]]; then
|
|
||||||
if [ -f "$DISK_FILE" ] ; then
|
|
||||||
FA=$(lsattr "$DISK_FILE")
|
|
||||||
[[ "$FA" == *"C"* ]] && FA=$(lsattr -d "$DIR")
|
|
||||||
else
|
|
||||||
FA=$(lsattr -d "$DIR")
|
|
||||||
fi
|
|
||||||
if [[ "$FA" != *"C"* ]]; then
|
|
||||||
info "Warning: the filesystem of $DIR is BTRFS, and COW (copy on write) is not disabled for that folder!"
|
|
||||||
info "This will negatively affect write performance, please empty the folder and disable COW (chattr +C <path>)."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
[ -z "$DISK_SPACE" ] && DISK_SPACE="16G"
|
[ -z "$DISK_SPACE" ] && DISK_SPACE="16G"
|
||||||
DISK_SPACE=$(echo "$DISK_SPACE" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
|
DISK_SPACE=$(echo "${DISK_SPACE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
|
||||||
DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
|
DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
|
||||||
|
|
||||||
if (( DATA_SIZE < 6442450944 )); then
|
if (( DATA_SIZE < 6442450944 )); then
|
||||||
@@ -303,6 +325,8 @@ addDisk () {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
checkFS "$DISK_FILE" || exit $?
|
||||||
|
|
||||||
if ! [ -f "$DISK_FILE" ] ; then
|
if ! [ -f "$DISK_FILE" ] ; then
|
||||||
|
|
||||||
if [[ "${DISK_FMT,,}" != "raw" ]]; then
|
if [[ "${DISK_FMT,,}" != "raw" ]]; then
|
||||||
|
|||||||
@@ -55,11 +55,11 @@ FS=$(stat -f -c %T "$STORAGE")
|
|||||||
if [[ "$FS" == "overlay"* ]]; then
|
if [[ "$FS" == "overlay"* ]]; then
|
||||||
info "Warning: the filesystem of $STORAGE is OverlayFS, this usually means it was binded to an invalid path!"
|
info "Warning: the filesystem of $STORAGE is OverlayFS, this usually means it was binded to an invalid path!"
|
||||||
fi
|
fi
|
||||||
if [[ "$FS" == "btrfs"* ]]; then
|
if [[ "$FS" == "xfs" || "$FS" == "zfs" || "$FS" == "btrfs" || "$FS" == "bcachefs" ]]; then
|
||||||
FA=$(lsattr -d "$STORAGE")
|
FA=$(lsattr -d "$STORAGE")
|
||||||
if [[ "$FA" != *"C"* ]]; then
|
if [[ "$FA" != *"C"* ]]; then
|
||||||
info "Warning: the filesystem of $STORAGE is BTRFS, and COW (copy on write) is not disabled for that folder!"
|
info "Warning: the filesystem of $STORAGE is ${FS^^}, and COW (copy on write) is not disabled for that folder!"
|
||||||
info "This will negatively affect write performance, please empty the folder and disable COW (chattr +C <path>)."
|
info "This will negatively affect performance, please empty the folder and disable COW (chattr +C <path>)."
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -70,6 +70,7 @@ else
|
|||||||
TMP="/tmp/dsm"
|
TMP="/tmp/dsm"
|
||||||
SPACE=$(df --output=avail -B 1 /tmp | tail -n 1)
|
SPACE=$(df --output=avail -B 1 /tmp | tail -n 1)
|
||||||
if (( MIN_SPACE > SPACE )); then
|
if (( MIN_SPACE > SPACE )); then
|
||||||
|
DEV="N"
|
||||||
TMP="$STORAGE/tmp"
|
TMP="$STORAGE/tmp"
|
||||||
info "Warning: the $FS filesystem of $STORAGE does not support UNIX permissions.."
|
info "Warning: the $FS filesystem of $STORAGE does not support UNIX permissions.."
|
||||||
fi
|
fi
|
||||||
@@ -199,15 +200,14 @@ if ((SIZE<250000000)); then
|
|||||||
error "The specified PAT file is probably an update pack as it's too small." && exit 62
|
error "The specified PAT file is probably an update pack as it's too small." && exit 62
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
info "Install: Extracting downloaded image..."
|
||||||
|
|
||||||
if { tar tf "$PAT"; } >/dev/null 2>&1; then
|
if { tar tf "$PAT"; } >/dev/null 2>&1; then
|
||||||
|
|
||||||
info "Install: Extracting downloaded image..."
|
|
||||||
tar xpf "$PAT" -C "$TMP/."
|
tar xpf "$PAT" -C "$TMP/."
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
info "Install: Extracting downloaded image..."
|
|
||||||
|
|
||||||
export LD_LIBRARY_PATH="/run/extract"
|
export LD_LIBRARY_PATH="/run/extract"
|
||||||
|
|
||||||
if [ "$ARCH" == "amd64" ]; then
|
if [ "$ARCH" == "amd64" ]; then
|
||||||
|
|||||||
@@ -67,9 +67,10 @@ _graceful_shutdown() {
|
|||||||
|
|
||||||
if [ "$(cat $QEMU_COUNT)" -ge "$QEMU_TIMEOUT" ]; then
|
if [ "$(cat $QEMU_COUNT)" -ge "$QEMU_TIMEOUT" ]; then
|
||||||
echo && error "Shutdown timeout reached, forcefully quitting.."
|
echo && error "Shutdown timeout reached, forcefully quitting.."
|
||||||
|
else
|
||||||
|
echo && echo "❯ Quitting..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo && echo "❯ Quitting..."
|
|
||||||
echo 'quit' | nc -q 1 -w 1 localhost "$QEMU_PORT" >/dev/null 2>&1 || true
|
echo 'quit' | nc -q 1 -w 1 localhost "$QEMU_PORT" >/dev/null 2>&1 || true
|
||||||
|
|
||||||
{ pkill -f print.sh || true; } 2>/dev/null
|
{ pkill -f print.sh || true; } 2>/dev/null
|
||||||
|
|||||||
Reference in New Issue
Block a user