Prechádzať zdrojové kódy

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

Kroese 9 mesiacov pred
rodič
commit
a659c1c9da
3 zmenil súbory, kde vykonal 4 pridanie a 3 odobranie
  1. 2 1
      Dockerfile
  2. 1 1
      src/define.sh
  3. 1 1
      src/install.sh

+ 2 - 1
Dockerfile

@@ -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/*

+ 1 - 1
src/define.sh

@@ -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
 

+ 1 - 1
src/install.sh

@@ -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