twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-02-24 13:30:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: Extract files inside container

Browse Source 
fix: Extract files inside container
This commit is contained in:
Kroese 2023-10-05 15:55:49 +02:00 committed by GitHub
commit d94a9d0966
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -1,4 +1,4 @@
FROM ghcr.io/qemu-tools/qemu-host as builder FROM qemux/qemu-host as builder
# FROM golang as builder # FROM golang as builder
# WORKDIR / # WORKDIR /
@ -21,14 +21,13 @@ RUN apt-get update && apt-get -y upgrade && \
unzip \ unzip \
socat \ socat \
procps \ procps \
dnsmasq \
xz-utils \ xz-utils \
iptables \ iptables \
iproute2 \ iproute2 \
net-tools \ dnsmasq \
btrfs-progs \ net-tools \
netcat-openbsd \
ca-certificates \ ca-certificates \
netcat-openbsd \
qemu-system-x86 \ qemu-system-x86 \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

2
run/disk.sh
View File

@ -125,7 +125,7 @@ if [ ! -f "${DATA}" ]; then
fi fi
# Format as BTRFS filesystem # Format as BTRFS filesystem
mkfs.btrfs -q -L data -d single -m dup "${DATA}" > /dev/null # mkfs.btrfs -q -L data -d single -m dup "${DATA}" > /dev/null
fi fi

7
run/install.sh
View File

@ -31,7 +31,7 @@ rm -f "$STORAGE"/"$BASE".agent
rm -f "$STORAGE"/"$BASE".boot.img rm -f "$STORAGE"/"$BASE".boot.img
rm -f "$STORAGE"/"$BASE".system.img rm -f "$STORAGE"/"$BASE".system.img
TMP="$STORAGE/tmp" TMP="/tmp/dsm"
RDC="$STORAGE/dsm.rd" RDC="$STORAGE/dsm.rd"
rm -rf "$TMP" && mkdir -p "$TMP" rm -rf "$TMP" && mkdir -p "$TMP"
@ -250,6 +250,11 @@ mke2fs -q -t ext4 -b 4096 -d "$MOUNT/" -L "$LABEL" -F -E "offset=$OFFSET" "$SYST
rm -rf "$MOUNT" rm -rf "$MOUNT"
echo "$BASE" > "$STORAGE"/dsm.ver echo "$BASE" > "$STORAGE"/dsm.ver
# Check free diskspace
SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
(( 6442450944 > SPACE )) && error "Not enough free space in destination folder." && exit 94
mv -f "$PAT" "$STORAGE"/"$BASE".pat mv -f "$PAT" "$STORAGE"/"$BASE".pat
mv -f "$BOOT" "$STORAGE"/"$BASE".boot.img mv -f "$BOOT" "$STORAGE"/"$BASE".boot.img
mv -f "$SYSTEM" "$STORAGE"/"$BASE".system.img mv -f "$SYSTEM" "$STORAGE"/"$BASE".system.img