diff --git a/Dockerfile b/Dockerfile index 58b48cf..6e4ce07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM golang:1.16 AS builder -COPY vdsm-serial/ /src/vdsm-serial/ -WORKDIR /src/vdsm-serial +COPY serial/ /src/serial/ +WORKDIR /src/serial RUN go get -d -v golang.org/x/net/html -RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /src/vdsm-serial/main . +RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /src/serial/main . FROM debian:bullseye-20230109-slim @@ -28,7 +28,7 @@ COPY qemu-ifdown /run/ COPY qemu-ifup /run/ COPY run.sh /run/ COPY server.sh /run/ -COPY --from=builder /src/vdsm-serial/main /run/serial.bin +COPY --from=builder /src/serial/main /run/serial.bin RUN ["chmod", "+x", "/run/generate-dhcpd-conf"] RUN ["chmod", "+x", "/run/qemu-ifdown"] @@ -48,6 +48,7 @@ VOLUME /images EXPOSE 5000 EXPOSE 5001 +ENV RAM_SIZE 512M ENV DISK_SIZE 16G ENV URL https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat @@ -57,6 +58,3 @@ ENV URL https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM ENTRYPOINT ["/run/run.sh"] -# Mostly users will probably want to configure memory usage. -CMD ["-m", "512M"] - diff --git a/run.sh b/run.sh index 2104268..0d9f35a 100755 --- a/run.sh +++ b/run.sh @@ -176,7 +176,7 @@ echo "Booting OS..." # -enable-kvm: Use KVM for this VM (much faster for our case). # -nographic: disable SDL graphics. # -serial mon:stdio: use "monitored stdio" as our serial output. -exec qemu-system-x86_64 -name Synology -enable-kvm -nographic -serial mon:stdio \ +exec qemu-system-x86_64 -name Synology -m $RAM_SIZE -enable-kvm -nographic -serial mon:stdio \ "$@" \ -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 \ diff --git a/vdsm-serial/doc.go b/serial/doc.go similarity index 100% rename from vdsm-serial/doc.go rename to serial/doc.go diff --git a/vdsm-serial/go.mod b/serial/go.mod similarity index 100% rename from vdsm-serial/go.mod rename to serial/go.mod diff --git a/vdsm-serial/go.sum b/serial/go.sum similarity index 100% rename from vdsm-serial/go.sum rename to serial/go.sum diff --git a/vdsm-serial/main.go b/serial/main.go similarity index 95% rename from vdsm-serial/main.go rename to serial/main.go index 29edc0d..afff42f 100644 --- a/vdsm-serial/main.go +++ b/serial/main.go @@ -29,10 +29,10 @@ var GuestSN = flag.String("guestsn", "0000000000000", "Guest SN, 13 bytes") var GuestUUID = flag.String("guestuuid", "ba13a19a-c0c1-4fef-9346-915ed3b98341", "Guest UUID") var GuestCPUs = flag.Int("cpu", 1, "Num of Guest cpu") var GuestCPU_ARCH = flag.String("cpu_arch", "QEMU, Virtual CPU, X86_64", "CPU arch") -var HostDSMBuildNumber = flag.Int("buildnumber", 42218, "Build Number of Host") +var HostDSMBuildNumber = flag.Int("buildnumber", 42962, "Build Number of Host") var HostDSMfixNumber = flag.Int("fixNumber", 0, "Fix Number of Host") -var VMMVersion = flag.String("vmmversion", "2.5.5-11487", "VMM version") -var VMMTimestamp = flag.Int("vmmts", 1650802981032, "VMM Timestamp") +var VMMVersion = flag.String("vmmversion", "2.6.1-12139", "VMM version") +var VMMTimestamp = flag.Int("vmmts", 1679863686, "VMM Timestamp") // synowebapi --exec api=SYNO.Core.Package method=get id=Virtualization