Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

archlinux: ensure [options] section is present in all pacman drop-ins

Browse Source 
Create an empty [options] dropin by default or pacman will fail
when no dropin is present
This commit is contained in:
Olivier MEDOC 2017-10-23 20:22:04 +02:00
parent 5fdcb19685
commit 26659d4e51
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archlinux/PKGBUILD
View File

@ -24,6 +24,7 @@ changelog=
source=( source=(
PKGBUILD.qubes-ensure-lib-modules.service PKGBUILD.qubes-update-desktop-icons.hook PKGBUILD.qubes-ensure-lib-modules.service PKGBUILD.qubes-update-desktop-icons.hook
PKGBUILD-qubes-pacman-options.conf
PKGBUILD-qubes-repo-3.2.conf PKGBUILD-qubes-repo-3.2.conf
PKGBUILD-qubes-repo-4.0.conf PKGBUILD-qubes-repo-4.0.conf
) )
@ -81,6 +82,7 @@ package() {
# Install pacman.d drop-ins (at least 1 drop-in must be installed or pacman will fail) # Install pacman.d drop-ins (at least 1 drop-in must be installed or pacman will fail)
mkdir -p "${pkgdir}/etc/pacman.d" mkdir -p "${pkgdir}/etc/pacman.d"
install -m 644 "$srcdir/PKGBUILD-qubes-pacman-options.conf" "${pkgdir}/etc/pacman.d/10-qubes-options.conf"
# Install pacman repository # Install pacman repository
release=$(echo "$pkgver" | cut -d '.' -f 1,2) release=$(echo "$pkgver" | cut -d '.' -f 1,2)

1
archlinux/PKGBUILD-qubes-pacman-options.conf Normal file
View File

@ -0,0 +1 @@
[options]

2
network/update-proxy-configs
View File

@ -121,7 +121,7 @@ if [ -d /etc/pacman.d ]; then
### All modifications here will be lost. ### All modifications here will be lost.
### If you want to override some of this settings, create another file under ### If you want to override some of this settings, create another file under
### /etc/pacman.d ### /etc/pacman.d
[options]
XferCommand = http_proxy=$PROXY_ADDR /usr/bin/curl -C - -f %u > %o XferCommand = http_proxy=$PROXY_ADDR /usr/bin/curl -C - -f %u > %o
EOF EOF
else else