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

feat: Use bsdtar to extract driver archive (#805)

parent 16c3a047

Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ RUN set -eu && \ 
        dos2unix \

        cabextract \

        genisoimage \

        libxml2-utils && \

        libxml2-utils \

        libarchive-tools && \

    apt-get clean && \

    echo "$VERSION_ARG" > /run/version && \

    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

src/define.sh

+1 −1
Original line number Diff line number Diff line
@@ -1704,7 +1704,7 @@ prepareInstall() { 
  local msg="Adding drivers to image..."

  info "$msg" && html "$msg"



  if ! tar -xf /drivers.txz -C "$drivers" --warning=no-timestamp; then

  if ! bsdtar -xf /drivers.txz -C "$drivers"; then

    error "Failed to extract drivers!" && return 1

  fi

src/install.sh

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ addDrivers() { 
  local msg="Adding drivers to image..."

  info "$msg" && html "$msg"



  if ! tar -xf /drivers.txz -C "$drivers" --warning=no-timestamp; then

  if ! bsdtar -xf /drivers.txz -C "$drivers"; then

    error "Failed to extract drivers from archive!" && return 1

  fi