mirror of
https://github.com/dockersrc/archlinux
synced 2024-11-21 11:23:05 -05:00
🗃️ Committing everything that changed 🗃️
Some checks failed
release-tag / release-image (push) Failing after 1h12m40s
Some checks failed
release-tag / release-image (push) Failing after 1h12m40s
rootfs/root/docker/setup/01-system.sh rootfs/root/docker/setup/03-files.sh rootfs/root/docker/setup/06-post.sh
This commit is contained in:
parent
67ba964106
commit
59475126f6
@ -24,18 +24,10 @@ set -o pipefail
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Set env variables
|
||||
exitCode=0
|
||||
update_conf_files="$(find '/etc' -iname '*.pacnew')"
|
||||
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Main script
|
||||
if [ -n "$update_conf_files" ]; then
|
||||
for conf in $update_conf_files; do
|
||||
name="${conf//.pacnew/}"
|
||||
mv -f "$conf" "$name"
|
||||
done
|
||||
fi
|
||||
if grep -Rsqi 'DisableSandbox' /etc/pacman.conf*; then
|
||||
sed -i 's|.*DisableSandbox|DisableSandbox|g' /etc/pacman.conf*
|
||||
fi
|
||||
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Set the exit code
|
||||
exitCode=$?
|
||||
|
@ -24,10 +24,15 @@ set -o pipefail
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Set env variables
|
||||
exitCode=0
|
||||
|
||||
update_conf_files="$(find '/etc' -iname '*.pacnew')"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Main script
|
||||
|
||||
if [ -n "$update_conf_files" ]; then
|
||||
for conf in $update_conf_files; do
|
||||
name="${conf//.pacnew/}"
|
||||
mv -f "$conf" "$name"
|
||||
done
|
||||
fi
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Set the exit code
|
||||
exitCode=$?
|
||||
|
@ -27,7 +27,9 @@ exitCode=0
|
||||
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Main script
|
||||
|
||||
if grep -Rsqi 'DisableSandbox' /etc/pacman.conf*; then
|
||||
sed -i 's|.*DisableSandbox|DisableSandbox|g' /etc/pacman.conf*
|
||||
fi
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Set the exit code
|
||||
exitCode=$?
|
||||
|
Loading…
Reference in New Issue
Block a user