schiwagoa/windows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kroese 2024-10-13 21:14:38 +02:00 committed by GitHub
parent 16c3a047c2
commit a659c1c9da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -19,7 +19,8 @@ RUN set -eu && \
dos2unix \ dos2unix \
cabextract \ cabextract \
genisoimage \ genisoimage \
libxml2-utils && \ libxml2-utils \
libarchive-tools && \
apt-get clean && \ apt-get clean && \
echo "$VERSION_ARG" > /run/version && \ echo "$VERSION_ARG" > /run/version && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

2
src/define.sh
View File

@ -1704,7 +1704,7 @@ prepareInstall() {
local msg="Adding drivers to image..." local msg="Adding drivers to image..."
info "$msg" && html "$msg" 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 error "Failed to extract drivers!" && return 1
fi fi

2
src/install.sh
View File

@ -725,7 +725,7 @@ addDrivers() {
local msg="Adding drivers to image..." local msg="Adding drivers to image..."
info "$msg" && html "$msg" 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 error "Failed to extract drivers from archive!" && return 1
fi fi