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

fix: QNAP permission errors (#964)

parent e8ec5fb8

src/install.sh

+3 −2
Original line number Diff line number Diff line
@@ -272,10 +272,10 @@ rm -f "$MOUNT/.SynoUpgradePackages/ActiveInsight-"* 


[ -s "$HDP.txz" ] && tar xpfJ "$HDP.txz" --absolute-names -C "$MOUNT/"



INDEX_DB=""

if [ -s "$IDB.txz" ]; then

  INDEX_DB="$MOUNT/usr/syno/synoman/indexdb/"

  INDEX_DB="$MOUNT/usr/syno/synoman/indexdb"

  mkdir -p "$INDEX_DB"

  tar xpfJ "$IDB.txz" --absolute-names -C "$INDEX_DB"

fi



LABEL="1.44.1-42218"
@@ -284,6 +284,7 @@ NUMBLOCKS="2097152" # (16777216 * 512) / 4096 
MSG="Installing system partition..."



fakeroot -- bash -c "set -Eeu;\

  [ -d $INDEX_DB ] && tar xpfJ $IDB.txz --absolute-names -C $INDEX_DB/;\

  tar xpfJ $HDA.txz --absolute-names --skip-old-files -C $MOUNT/;\

  printf '%b%s%b' '\E[1;34m❯ \E[1;36m' 'Install: $MSG' '\E[0m\n';\

  mke2fs -q -t ext4 -b 4096 -d $MOUNT/ -L $LABEL -F -E offset=$OFFSET $SYSTEM $NUMBLOCKS"

src/network.sh

+5 −5
Original line number Diff line number Diff line
@@ -338,17 +338,17 @@ closeNetwork() { 


checkOS() {



  local name

  local kernel

  local os=""

  local if="macvlan"

  name=$(uname -a)

  kernel=$(uname -a)



  [[ "${name,,}" == *"darwin"* ]] && os="Docker Desktop for macOS"

  [[ "${name,,}" == *"microsoft"* ]] && os="Docker Desktop for Windows"

  [[ "${kernel,,}" == *"darwin"* ]] && os="Docker Desktop for macOS"

  [[ "${kernel,,}" == *"microsoft"* ]] && os="Docker Desktop for Windows"



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

    if="macvtap"

    [[ "${name,,}" == *"synology"* ]] && os="Synology Container Manager"

    [[ "${kernel,,}" == *"synology"* ]] && os="Synology Container Manager"

  fi



  if [ -n "$os" ]; then

src/proc.sh

+11 −3
Original line number Diff line number Diff line
@@ -54,8 +54,16 @@ if [[ "$KVM" != [Nn]* ]]; then 
    if [[ "$OSTYPE" =~ ^darwin ]]; then

      warn "you are using macOS which has no KVM support, this will cause a major loss of performance."

    else      

      kernel=$(uname -a)

      case "${kernel,,}" in

        *"microsoft"* )

          error "Please bind '/dev/kvm' as a volume in the optional container settings when using Docker Desktop." ;;

        *"synology"* )

          error "Please make sure that Synology VMM (Virtual Machine Manager) is installed and that '/dev/kvm' is binded to this container." ;;

        *)

          error "KVM acceleration not available $KVM_ERR, this will cause a major loss of performance."

      error "See the FAQ on how to diagnose the cause, or continue without KVM by setting KVM=N (not recommended)."

          error "See the FAQ on how to diagnose the cause, or continue without KVM by setting KVM=N (not recommended)." ;;

      esac

      [[ "$DEBUG" != [Yy1]* ]] && exit 88

    fi

  fi