From a659c1c9da635a5f594fbb2450be3edb834a2b21 Mon Sep 17 00:00:00 2001 From: Kroese Date: Sun, 13 Oct 2024 21:14:38 +0200 Subject: [PATCH] feat: Use bsdtar to extract driver archive (#805) --- Dockerfile | 3 ++- src/define.sh | 2 +- src/install.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 74540dc..a8e4197 100644 --- a/Dockerfile +++ b/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/* diff --git a/src/define.sh b/src/define.sh index 1b4bd77..2fc1b1d 100644 --- a/src/define.sh +++ b/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 diff --git a/src/install.sh b/src/install.sh index f6cad16..b0c58ff 100644 --- a/src/install.sh +++ b/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