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

feat: Rename /drivers.iso to /mount.iso (#1073)

parent 6d08062c

src/disk.sh

+7 −6
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ case "${MEDIA_TYPE,,}" in 
  * ) error "Invalid MEDIA_TYPE specified, value \"$MEDIA_TYPE\" is not recognized!" && exit 80 ;;

esac



if [ -f "$BOOT" ] && [ -s "$BOOT" ]; then

if [ -s "$BOOT" ]; then

  case "${BOOT,,}" in

    *".iso" )

        if [[ "${BOOT_MODE:-}" == "windows"* ]]; then
@@ -688,17 +688,18 @@ if [ -f "$BOOT" ] && [ -s "$BOOT" ]; then 
  esac

fi



DRIVERS="/drivers.iso"

[ ! -f "$DRIVERS" ] || [ ! -s "$DRIVERS" ] && DRIVERS="$STORAGE/drivers.iso"

DRIVERS="/mount.iso"

[ ! -s "$DRIVERS" ] && DRIVERS="/drivers.iso"

[ ! -s "$DRIVERS" ] && DRIVERS="$STORAGE/drivers.iso"



if [ -f "$DRIVERS" ] && [ -s "$DRIVERS" ]; then

if [ -s "$DRIVERS" ]; then

  DISK_OPTS+=$(addMedia "$DRIVERS" "$FALLBACK" "" "0x6")

fi



RESCUE="/start.iso"

[ ! -f "$RESCUE" ] || [ ! -s "$RESCUE" ] && RESCUE="$STORAGE/start.iso"

[ ! -s "$RESCUE" ] && RESCUE="$STORAGE/start.iso"



if [ -f "$RESCUE" ] && [ -s "$RESCUE" ]; then

if [ -s "$RESCUE" ]; then

  DISK_OPTS+=$(addMedia "$RESCUE" "$FALLBACK" "1" "0x6")

fi

src/install.sh

+5 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ getFolder() { 
  return 0

}



moveFile() {

bootFile() {



  local file="$1"

  local ext="${file##*.}"
@@ -73,7 +73,6 @@ detectType() { 
  local result=""

  local hybrid=""



  [ ! -f "$file" ] && return 1

  [ ! -s "$file" ] && return 1



  case "${file,,}" in
@@ -82,7 +81,8 @@ detectType() { 
  esac



  if [ -n "$BOOT_MODE" ] || [[ "${file,,}" == *".qcow2" ]]; then

    moveFile "$file" && return 0

    # Do not need to detect type (or cannot with .qcow2)

    bootFile "$file" && return 0

    return 1

  fi
@@ -102,7 +102,7 @@ detectType() { 
      result=$(echo "${result^^}" | grep "^/EFI")

      [ -z "$result" ] && BOOT_MODE="legacy"



      moveFile "$file" && return 0

      bootFile "$file" && return 0

      return 1



    fi
@@ -111,7 +111,7 @@ detectType() { 
  result=$(fdisk -l "$file" 2>/dev/null)

  [[ "${result^^}" != *"EFI "* ]] && BOOT_MODE="legacy"



  moveFile "$file" && return 0

  bootFile "$file" && return 0

  return 1

}