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

feat: Added option to disable data disks (#1171)

parent 03167442

src/disk.sh

+9 −0
Original line number Diff line number Diff line
@@ -607,6 +607,7 @@ html "$msg" 
[ -z "${DISK_OPTS:-}" ] && DISK_OPTS=""

[ -z "${DISK_TYPE:-}" ] && DISK_TYPE="scsi"

[ -z "${DISK_NAME:-}" ] && DISK_NAME="data"

[ -z "${DISK_DISABLE:-}" ] && DISK_DISABLE=""



case "${DISK_TYPE,,}" in

  "ide" | "sata" | "nvme" | "usb" | "scsi" | "blk" | "auto" | "none" ) ;;
@@ -628,6 +629,14 @@ fi 
DISK_OPTS+=$(createDevice "$BOOT" "$DISK_TYPE" "1" "0xa" "raw" "$DISK_IO" "$DISK_CACHE" "" "")

DISK_OPTS+=$(createDevice "$SYSTEM" "$DISK_TYPE" "2" "0xb" "raw" "$DISK_IO" "$DISK_CACHE" "" "")



if [[ "$DISK_DISABLE" == [Yy1]* ]]; then

  case "${DISK_TYPE,,}" in

    "blk" | "scsi" | "virtio-blk" | "virtio-scsi" )

      DISK_OPTS+=" -object iothread,id=io2" ;;

  esac

  return 0

fi



DISK1_FILE="$STORAGE/${DISK_NAME}"

DISK2_FILE="/storage2/${DISK_NAME}2"

DISK3_FILE="/storage3/${DISK_NAME}3"

src/utils.sh

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ cpu() { 


hasDisk() {



  [[ "${DISK_DISABLED:-}" == [Yy1]* ]] && return 1



  [ -b "/disk" ] && return 0

  [ -b "/disk1" ] && return 0

  [ -b "/dev/disk1" ] && return 0