Skip to content

Commit

Permalink
fix: Extract files inside container
Browse files Browse the repository at this point in the history
fix: Extract files inside container
  • Loading branch information
kroese committed Oct 5, 2023
2 parents 6bd0cfd + 21fa68f commit 32b2703
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
9 changes: 4 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/qemu-tools/qemu-host as builder
FROM qemux/qemu-host as builder

# FROM golang as builder
# WORKDIR /
Expand All @@ -21,14 +21,13 @@ RUN apt-get update && apt-get -y upgrade && \
unzip \
socat \
procps \
dnsmasq \
xz-utils \
iptables \
iproute2 \
net-tools \
btrfs-progs \
netcat-openbsd \
dnsmasq \
net-tools \
ca-certificates \
netcat-openbsd \
qemu-system-x86 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
Expand Down
2 changes: 1 addition & 1 deletion run/disk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ if [ ! -f "${DATA}" ]; then
fi

# 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

Expand Down
7 changes: 6 additions & 1 deletion run/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rm -f "$STORAGE"/"$BASE".agent
rm -f "$STORAGE"/"$BASE".boot.img
rm -f "$STORAGE"/"$BASE".system.img

TMP="$STORAGE/tmp"
TMP="/tmp/dsm"
RDC="$STORAGE/dsm.rd"

rm -rf "$TMP" && mkdir -p "$TMP"
Expand Down Expand Up @@ -250,6 +250,11 @@ mke2fs -q -t ext4 -b 4096 -d "$MOUNT/" -L "$LABEL" -F -E "offset=$OFFSET" "$SYST
rm -rf "$MOUNT"

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 "$BOOT" "$STORAGE"/"$BASE".boot.img
mv -f "$SYSTEM" "$STORAGE"/"$BASE".system.img
Expand Down

0 comments on commit 32b2703

Please sign in to comment.