Unverified Commit a36111e8 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

Make disk parameters variable

parents f8f67fcf c8fcd875

run/disk.sh

+14 −8
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -eu



# Docker environment variabeles



: ${DISK_IO:='native'}          # I/O Mode

: ${DISK_ROTATION:='1'}    # Rotation rate

: ${DISK_CACHE:='none'}   # Caching mode



BOOT="$STORAGE/$BASE.boot.img"

SYSTEM="$STORAGE/$BASE.system.img"
@@ -42,7 +48,7 @@ if [ -f "${DATA}" ]; then 


      if (( REQ > SPACE )); then

        echo "ERROR: Not enough free space to resize virtual disk to ${DISK_SIZE}."

        echo "ERROR: Specify a smaller size or disable preallocation with ALLOCATION=N." && exit 84

        echo "ERROR: Specify a smaller size or disable preallocation with ALLOCATE=N." && exit 84

      fi



      if ! fallocate -l "${DATA_SIZE}" "${DATA}"; then
@@ -85,7 +91,7 @@ if [ ! -f "${DATA}" ]; then 


    if (( DATA_SIZE > SPACE )); then

      echo "ERROR: Not enough free space to create a virtual disk of ${DISK_SIZE}."

      echo "ERROR: Specify a smaller size or disable preallocation with ALLOCATION=N." && exit 86

      echo "ERROR: Specify a smaller size or disable preallocation with ALLOCATE=N." && exit 86

    fi



    if ! fallocate -l "${DATA_SIZE}" "${DATA}"; then
@@ -127,11 +133,11 @@ fi 


DISK_OPTS="\

    -device virtio-scsi-pci,id=hw-synoboot,bus=pcie.0,addr=0xa \

    -drive file=${BOOT},if=none,id=drive-synoboot,format=raw,cache=none,aio=native,discard=on,detect-zeroes=on \

    -device scsi-hd,bus=hw-synoboot.0,channel=0,scsi-id=0,lun=0,drive=drive-synoboot,id=synoboot0,rotation_rate=1,bootindex=1 \

    -drive file=${BOOT},if=none,id=drive-synoboot,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=on,detect-zeroes=on \

    -device scsi-hd,bus=hw-synoboot.0,channel=0,scsi-id=0,lun=0,drive=drive-synoboot,id=synoboot0,rotation_rate=${DISK_ROTATION},bootindex=1 \

    -device virtio-scsi-pci,id=hw-synosys,bus=pcie.0,addr=0xb \

    -drive file=${SYSTEM},if=none,id=drive-synosys,format=raw,cache=none,aio=native,discard=on,detect-zeroes=on \

    -device scsi-hd,bus=hw-synosys.0,channel=0,scsi-id=0,lun=0,drive=drive-synosys,id=synosys0,rotation_rate=1,bootindex=2 \

    -drive file=${SYSTEM},if=none,id=drive-synosys,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=on,detect-zeroes=on \

    -device scsi-hd,bus=hw-synosys.0,channel=0,scsi-id=0,lun=0,drive=drive-synosys,id=synosys0,rotation_rate=${DISK_ROTATION},bootindex=2 \

    -device virtio-scsi-pci,id=hw-userdata,bus=pcie.0,addr=0xc \

    -drive file=${DATA},if=none,id=drive-userdata,format=raw,cache=none,aio=native,discard=on,detect-zeroes=on \

    -device scsi-hd,bus=hw-userdata.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata,id=userdata0,rotation_rate=1,bootindex=3"
 
    -drive file=${DATA},if=none,id=drive-userdata,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=on,detect-zeroes=on \

    -device scsi-hd,bus=hw-userdata.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata,id=userdata0,rotation_rate=${DISK_ROTATION},bootindex=3"

run/run.sh

+1 −1
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ if [ -z "${KVM_OPTS}" ]; then 
  [ "$DEBUG" != "Y" ] && exit 88

fi



DEF_OPTS="-nographic -nodefaults"

KVM_OPTS="-machine type=q35,usb=off${KVM_OPTS}"

RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')

CPU_OPTS="-smp ${CPU_CORES},sockets=1,cores=${CPU_CORES},threads=1"

DEF_OPTS="-nographic -nodefaults -overcommit mem-lock=off"

EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0 -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng-pci,rng=rng0"

ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}"