mirror of
https://github.com/vdsm/virtual-dsm.git
synced 2025-02-24 13:30:02 +08:00
Fixes
This commit is contained in:
parent
e066ef9329
commit
c483a65ddc
12
Dockerfile
12
Dockerfile
@ -27,6 +27,7 @@ COPY generate-dhcpd-conf /run/
|
|||||||
COPY qemu-ifdown /run/
|
COPY qemu-ifdown /run/
|
||||||
COPY qemu-ifup /run/
|
COPY qemu-ifup /run/
|
||||||
COPY run.sh /run/
|
COPY run.sh /run/
|
||||||
|
COPY serial.sh /run/
|
||||||
COPY server.sh /run/
|
COPY server.sh /run/
|
||||||
COPY --from=builder /src/serial/main /run/serial.bin
|
COPY --from=builder /src/serial/main /run/serial.bin
|
||||||
|
|
||||||
@ -34,6 +35,7 @@ RUN ["chmod", "+x", "/run/generate-dhcpd-conf"]
|
|||||||
RUN ["chmod", "+x", "/run/qemu-ifdown"]
|
RUN ["chmod", "+x", "/run/qemu-ifdown"]
|
||||||
RUN ["chmod", "+x", "/run/qemu-ifup"]
|
RUN ["chmod", "+x", "/run/qemu-ifup"]
|
||||||
RUN ["chmod", "+x", "/run/run.sh"]
|
RUN ["chmod", "+x", "/run/run.sh"]
|
||||||
|
RUN ["chmod", "+x", "/run/serial.sh"]
|
||||||
RUN ["chmod", "+x", "/run/server.sh"]
|
RUN ["chmod", "+x", "/run/server.sh"]
|
||||||
RUN ["chmod", "+x", "/run/serial.bin"]
|
RUN ["chmod", "+x", "/run/serial.bin"]
|
||||||
|
|
||||||
@ -43,18 +45,22 @@ RUN ["chmod", "+x", "/run/syno_extract_system_patch"]
|
|||||||
|
|
||||||
COPY disks/template.img.xz /data/
|
COPY disks/template.img.xz /data/
|
||||||
|
|
||||||
VOLUME /images
|
VOLUME /storage
|
||||||
|
|
||||||
|
EXPOSE 22
|
||||||
|
EXPOSE 80
|
||||||
|
EXPOSE 139
|
||||||
|
EXPOSE 443
|
||||||
|
EXPOSE 445
|
||||||
EXPOSE 5000
|
EXPOSE 5000
|
||||||
EXPOSE 5001
|
EXPOSE 5001
|
||||||
|
|
||||||
ENV RAM_SIZE 512M
|
ENV RAM_SIZE 512M
|
||||||
ENV DISK_SIZE 16G
|
ENV DISK_SIZE 16G
|
||||||
ENV URL https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat
|
|
||||||
|
|
||||||
#ENV URL https://global.synologydownload.com/download/DSM/beta/7.2/64216/DSM_VirtualDSM_64216.pat
|
#ENV URL https://global.synologydownload.com/download/DSM/beta/7.2/64216/DSM_VirtualDSM_64216.pat
|
||||||
#ENV URL https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat
|
#ENV URL https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat
|
||||||
#ENV URL https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_VirtualDSM_42962.pat
|
ENV URL https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_VirtualDSM_42962.pat
|
||||||
|
|
||||||
ENTRYPOINT ["/run/run.sh"]
|
ENTRYPOINT ["/run/run.sh"]
|
||||||
|
|
||||||
|
136
run.sh
136
run.sh
@ -9,95 +9,96 @@ fi
|
|||||||
|
|
||||||
/run/server.sh 5000 "<HTML><BODY><H1><CENTER>Please wait while Synology is installing...</CENTER></H1></BODY></HTML>" > /dev/null &
|
/run/server.sh 5000 "<HTML><BODY><H1><CENTER>Please wait while Synology is installing...</CENTER></H1></BODY></HTML>" > /dev/null &
|
||||||
|
|
||||||
[ ! -f "/images/boot.img" ] && rm -f /images/dsm.pat
|
IMG="/storage"
|
||||||
[ ! -f "/images/system.img" ] && rm -f /images/dsm.pat
|
|
||||||
|
[ ! -f "$IMG/boot.img" ] && rm -f $IMG/system.img
|
||||||
|
|
||||||
|
if [ ! -f "$IMG/system.img" ]; then
|
||||||
|
|
||||||
FILE="/images/dsm.pat"
|
|
||||||
if [ ! -f "$FILE" ]; then
|
|
||||||
echo "Downloading Synology DSM from $URL..."
|
echo "Downloading Synology DSM from $URL..."
|
||||||
|
|
||||||
|
TMP="$IMG/tmp"
|
||||||
|
rm -rf $TMP
|
||||||
|
mkdir -p $TMP
|
||||||
|
|
||||||
|
FILE="$TMP/dsm.pat"
|
||||||
|
rm -rf $FILE
|
||||||
wget $URL -O $FILE -q --show-progress
|
wget $URL -O $FILE -q --show-progress
|
||||||
|
|
||||||
echo "Extracting DSM boot image..."
|
echo "Extracting DSM boot image..."
|
||||||
|
|
||||||
rm -rf /images/out
|
|
||||||
mkdir -p /images/out
|
|
||||||
|
|
||||||
if { tar tf "$FILE"; } >/dev/null 2>&1; then
|
if { tar tf "$FILE"; } >/dev/null 2>&1; then
|
||||||
tar xpf $FILE -C /images/out/.
|
tar xpf $FILE -C $TMP/.
|
||||||
else
|
else
|
||||||
export LD_LIBRARY_PATH="/run"
|
export LD_LIBRARY_PATH="/run"
|
||||||
/run/syno_extract_system_patch $FILE /images/out/.
|
/run/syno_extract_system_patch $FILE $TMP/.
|
||||||
export LD_LIBRARY_PATH=""
|
export LD_LIBRARY_PATH=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
BOOT=$(find /images/out -name "*.bin.zip")
|
rm $FILE
|
||||||
|
|
||||||
|
BOOT=$(find $TMP -name "*.bin.zip")
|
||||||
BOOT=$(echo $BOOT | head -c -5)
|
BOOT=$(echo $BOOT | head -c -5)
|
||||||
|
|
||||||
unzip -q $BOOT.zip -d /images/out
|
unzip -q $BOOT.zip -d $TMP
|
||||||
rm $BOOT.zip
|
rm $BOOT.zip
|
||||||
|
|
||||||
echo "Extracting DSM system image..."
|
echo "Extracting DSM system image..."
|
||||||
|
|
||||||
HDA="/images/out/hda1"
|
HDA="$TMP/hda1"
|
||||||
mv $HDA.tgz $HDA.xz
|
mv $HDA.tgz $HDA.xz
|
||||||
unxz $HDA.xz
|
unxz $HDA.xz
|
||||||
mv $HDA $HDA.tar
|
mv $HDA $HDA.tar
|
||||||
|
|
||||||
echo "Extracting DSM disk template..."
|
echo "Extracting DSM disk template..."
|
||||||
|
|
||||||
TEMP="/images/temp.img"
|
SYSTEM="$TMP/temp.img"
|
||||||
PLATE="/data/template.img"
|
PLATE="/data/template.img"
|
||||||
|
|
||||||
rm -f $PLATE
|
rm -f $PLATE
|
||||||
unxz $PLATE.xz
|
unxz $PLATE.xz
|
||||||
mv $PLATE $TEMP
|
mv -f $PLATE $SYSTEM
|
||||||
|
|
||||||
echo "Mounting disk template..."
|
echo "Mounting disk template..."
|
||||||
|
MOUNT="/mnt/tmp"
|
||||||
|
|
||||||
rm -rf /mnt/tmp
|
rm -rf $MOUNT
|
||||||
mkdir -p /mnt/tmp
|
mkdir -p $MOUNT
|
||||||
guestmount -a $TEMP -m /dev/sda1:/ --rw /mnt/tmp
|
guestmount -a $SYSTEM -m /dev/sda1:/ --rw $MOUNT
|
||||||
|
rm -rf $MOUNT/{,.[!.],..?}*
|
||||||
|
|
||||||
echo "Preparing disk template..."
|
echo -n "Installing system partition.."
|
||||||
|
|
||||||
rm -rf /mnt/tmp/{,.[!.],..?}*
|
tar xpf $HDA.tar --absolute-names --checkpoint=.5000 -C $MOUNT/
|
||||||
|
|
||||||
echo -n "Installing system partition..."
|
|
||||||
|
|
||||||
tar xpf $HDA.tar --absolute-names --checkpoint=.2000 -C /mnt/tmp/
|
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "Unmounting disk template..."
|
echo "Unmounting disk template..."
|
||||||
|
|
||||||
rm $HDA.tar
|
rm $HDA.tar
|
||||||
|
guestunmount $MOUNT
|
||||||
|
rm -rf $MOUNT
|
||||||
|
|
||||||
guestunmount /mnt/tmp
|
mv -f $BOOT $IMG/boot.img
|
||||||
rm -rf /mnt/tmp
|
mv -f $SYSTEM $IMG/system.img
|
||||||
|
|
||||||
mv -f $BOOT /images/boot.img
|
rm -rf $TMP
|
||||||
mv -f $TEMP /images/system.img
|
|
||||||
|
|
||||||
rm -rf /images/out
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Booting Synology DSM for Docker..."
|
echo "Booting Synology DSM for Docker..."
|
||||||
|
|
||||||
FILE="/images/boot.img"
|
FILE="$IMG/boot.img"
|
||||||
if [ ! -f "$FILE" ]; then
|
if [ ! -f "$FILE" ]; then
|
||||||
echo "ERROR: Synology DSM boot-image does not exist ($FILE)"
|
echo "ERROR: Synology DSM boot-image does not exist ($FILE)"
|
||||||
rm -f /images/dsm.pat
|
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
FILE="/images/system.img"
|
FILE="$IMG/system.img"
|
||||||
if [ ! -f "$FILE" ]; then
|
if [ ! -f "$FILE" ]; then
|
||||||
echo "ERROR: Synology DSM system-image does not exist ($FILE)"
|
echo "ERROR: Synology DSM system-image does not exist ($FILE)"
|
||||||
rm -f /images/dsm.pat
|
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
FILE="/images/data.img"
|
FILE="$IMG/data.img"
|
||||||
if [ ! -f "$FILE" ]; then
|
if [ ! -f "$FILE" ]; then
|
||||||
truncate -s $DISK_SIZE $FILE
|
truncate -s $DISK_SIZE $FILE
|
||||||
mkfs.ext4 -q $FILE
|
mkfs.ext4 -q $FILE
|
||||||
@ -157,38 +158,71 @@ udhcpd -I $DUMMY_DHCPD_IP -f $DHCPD_CONF_FILE 2>&1 &
|
|||||||
|
|
||||||
echo "Launching Synology Serial Emulator..."
|
echo "Launching Synology Serial Emulator..."
|
||||||
|
|
||||||
# Start the Synology Serial Emulator
|
# Start the Serial Emulator
|
||||||
./run/serial.bin -cpu 1 \
|
|
||||||
-vmmversion "2.6.1-12139" \
|
HOST_SERIAL=$(/run/serial.sh)
|
||||||
-buildnumber 42962 \
|
GUEST_SERIAL=$(/run/serial.sh)
|
||||||
-vmmts 1650802981032 \
|
|
||||||
-cpu_arch string "QEMU, Virtual CPU, X86_64" \
|
./run/serial.bin -cpu=1 \
|
||||||
-guestsn "0000000000000" \
|
-vmmversion="2.6.1-12139" \
|
||||||
-hostsn "0000000000000" \
|
-buildnumber=42962 \
|
||||||
-guestuuid "ba13a19a-c0c1-4fef-9346-915ed3b98341" > /dev/null 2>&1 &
|
-vmmts="1679863686" \
|
||||||
|
-cpu_arch string="VirtualDSM" \
|
||||||
|
-guestsn="$GUEST_SERIAL" \
|
||||||
|
-hostsn="$HOST_SERIAL" \
|
||||||
|
-guestuuid="ba13a19a-c0c1-4fef-9346-915ed3b98341" > /dev/null 2>&1 &
|
||||||
|
|
||||||
# Stop the webserver
|
# Stop the webserver
|
||||||
pkill -f server.sh
|
pkill -f server.sh
|
||||||
|
|
||||||
echo "Booting OS..."
|
echo "Booting OS..."
|
||||||
|
|
||||||
|
# Configure QEMU for graceful shutdown
|
||||||
|
|
||||||
|
QEMU_MONPORT=7100
|
||||||
|
QEMU_POWERDOWN_TIMEOUT=30
|
||||||
|
|
||||||
|
_graceful_shutdown() {
|
||||||
|
|
||||||
|
local COUNT=0
|
||||||
|
local QEMU_MONPORT="${QEMU_MONPORT:-7100}"
|
||||||
|
local QEMU_POWERDOWN_TIMEOUT="${QEMU_POWERDOWN_TIMEOUT:-120}"
|
||||||
|
|
||||||
|
set +e
|
||||||
|
echo "Trying to shut down the VM gracefully"
|
||||||
|
echo 'system_powerdown' | nc -q 1 localhost ${QEMU_MONPORT}>/dev/null 2>&1
|
||||||
|
echo ""
|
||||||
|
while echo 'info version'|nc -q 1 localhost ${QEMU_MONPORT:-7100}>/dev/null 2>&1 && [ "${COUNT}" -lt "${QEMU_POWERDOWN_TIMEOUT}" ]; do
|
||||||
|
let COUNT++
|
||||||
|
echo "QEMU still running. Retrying... (${COUNT}/${QEMU_POWERDOWN_TIMEOUT})"
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
|
if echo 'info version'|nc -q 1 localhost ${QEMU_MONPORT:-7100}>/dev/null 2>&1; then
|
||||||
|
echo "Killing the VM"
|
||||||
|
echo 'quit' | nc -q 1 localhost ${QEMU_MONPORT}>/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
|
echo "Exiting..."
|
||||||
|
}
|
||||||
|
|
||||||
|
trap _graceful_shutdown SIGINT SIGTERM SIGHUP
|
||||||
|
|
||||||
# And run the VM! A brief explaination of the options here:
|
# And run the VM! A brief explaination of the options here:
|
||||||
# -enable-kvm: Use KVM for this VM (much faster for our case).
|
# -enable-kvm: Use KVM for this VM (much faster for our case).
|
||||||
# -nographic: disable SDL graphics.
|
# -nographic: disable SDL graphics.
|
||||||
# -serial mon:stdio: use "monitored stdio" as our serial output.
|
# -serial mon:stdio: use "monitored stdio" as our serial output.
|
||||||
exec qemu-system-x86_64 -name Synology -m $RAM_SIZE -enable-kvm -nographic -serial mon:stdio \
|
exec qemu-system-x86_64 -name Synology -m $RAM_SIZE -machine accel=kvm -cpu host -nographic -serial mon:stdio \
|
||||||
"$@" \
|
-monitor telnet:localhost:${QEMU_MONPORT:-7100},server,nowait,nodelay \
|
||||||
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 \
|
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 \
|
||||||
-device isa-serial,chardev=charserial0,id=serial0 -chardev socket,id=charchannel0,host=127.0.0.1,port=12345,reconnect=10 \
|
-device isa-serial,chardev=charserial0,id=serial0 -chardev socket,id=charchannel0,host=127.0.0.1,port=12345,reconnect=10 \
|
||||||
-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=vchannel \
|
-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=vchannel \
|
||||||
-device virtio-net,netdev=tap0 -netdev tap,id=tap0,ifname=Tap,script=$QEMU_IFUP,downscript=$QEMU_IFDOWN \
|
-device virtio-net,netdev=tap0 -netdev tap,id=tap0,ifname=Tap,script=$QEMU_IFUP,downscript=$QEMU_IFDOWN \
|
||||||
-device virtio-scsi-pci,id=hw-synoboot,bus=pci.0,addr=0xa -drive file=/images/boot.img,if=none,id=drive-synoboot,format=raw,cache=none,aio=native,detect-zeroes=on \
|
-device virtio-scsi-pci,id=hw-synoboot,bus=pci.0,addr=0xa -drive file=$IMG/boot.img,if=none,id=drive-synoboot,format=raw,cache=none,aio=native,detect-zeroes=on \
|
||||||
-device scsi-hd,bus=hw-synoboot.0,channel=0,scsi-id=0,lun=0,drive=drive-synoboot,id=synoboot0,bootindex=1 \
|
-device scsi-hd,bus=hw-synoboot.0,channel=0,scsi-id=0,lun=0,drive=drive-synoboot,id=synoboot0,bootindex=1 \
|
||||||
-device virtio-scsi-pci,id=hw-synosys,bus=pci.0,addr=0xb -drive file=/images/system.img,if=none,id=drive-synosys,format=raw,cache=none,aio=native,detect-zeroes=on \
|
-device virtio-scsi-pci,id=hw-synosys,bus=pci.0,addr=0xb -drive file=$IMG/system.img,if=none,id=drive-synosys,format=raw,cache=none,aio=native,detect-zeroes=on \
|
||||||
-device scsi-hd,bus=hw-synosys.0,channel=0,scsi-id=0,lun=0,drive=drive-synosys,id=synosys0,bootindex=2 \
|
-device scsi-hd,bus=hw-synosys.0,channel=0,scsi-id=0,lun=0,drive=drive-synosys,id=synosys0,bootindex=2 \
|
||||||
-device virtio-scsi-pci,id=hw-userdata,bus=pci.0,addr=0xc -drive file=/images/data.img,if=none,id=drive-userdata,format=raw,cache=none,aio=native,detect-zeroes=on \
|
-device virtio-scsi-pci,id=hw-userdata,bus=pci.0,addr=0xc -drive file=$IMG/data.img,if=none,id=drive-userdata,format=raw,cache=none,aio=native,detect-zeroes=on \
|
||||||
-device scsi-hd,bus=hw-userdata.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata,id=userdata0,bootindex=3 \
|
-device scsi-hd,bus=hw-userdata.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata,id=userdata0,bootindex=3 \
|
||||||
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2
|
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 &
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
|
wait $!
|
||||||
|
Loading…
x
Reference in New Issue
Block a user