瀏覽代碼

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

Create an empty [options] dropin by default or pacman will fail
when no dropin is present
Olivier MEDOC 6 年之前
父節點
當前提交
26659d4e51
共有 3 個文件被更改,包括 4 次插入1 次删除
  1. 2 0
      archlinux/PKGBUILD
  2. 1 0
      archlinux/PKGBUILD-qubes-pacman-options.conf
  3. 1 1
      network/update-proxy-configs

+ 2 - 0
archlinux/PKGBUILD

@@ -24,6 +24,7 @@ changelog=
 
 source=(
     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-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)
     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
     release=$(echo "$pkgver" | cut -d '.' -f 1,2)

+ 1 - 0
archlinux/PKGBUILD-qubes-pacman-options.conf

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

+ 1 - 1
network/update-proxy-configs

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