diff --git a/run/disk.sh b/run/disk.sh index e61eb88..90865a2 100644 --- a/run/disk.sh +++ b/run/disk.sh @@ -154,8 +154,7 @@ DISK_OPTS="\ -drive file=${DATA},if=none,id=drive-userdata,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},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" -STORAGE2="/storage2" -DATA2="${STORAGE2}/data.img" +DATA2="/storage2/data.img" if [ -f "${DATA2}" ]; then @@ -166,8 +165,7 @@ if [ -f "${DATA2}" ]; then fi -STORAGE3="/storage3" -DATA3="${STORAGE3}/data.img" +DATA3="/storage3/data.img" if [ -f "${DATA3}" ]; then @@ -177,3 +175,14 @@ if [ -f "${DATA3}" ]; then -device scsi-hd,bus=hw-userdata3.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata3,id=userdata3,rotation_rate=${DISK_ROTATION},bootindex=5" fi + +DEVICE="/device" + +if [ -d "${DEVICE}" ]; then + + DISK_OPTS="${DISK_OPTS} \ + -device virtio-scsi-pci,id=hw-userdata4,bus=pcie.0,addr=0xf \ + -drive file=${DEVICE},if=none,id=drive-userdata4,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \ + -device scsi-hd,bus=hw-userdata4.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata4,id=userdata4,rotation_rate=${DISK_ROTATION},bootindex=6" + +fi diff --git a/run/gpu.sh b/run/gpu.sh index c3e8675..9e63474 100644 --- a/run/gpu.sh +++ b/run/gpu.sh @@ -19,7 +19,7 @@ DEF_OPTS="${DEF_OPTS} -device virtio-vga,id=video0,max_outputs=1,bus=pcie.0,addr if ! apt-mark showinstall | grep -q "xserver-xorg-video-intel"; then - info "Installing GPU drivers..." + info "Installing Intel GPU drivers..." export DEBCONF_NOWARNINGS="yes" export DEBIAN_FRONTEND="noninteractive"