summaryrefslogtreecommitdiffstats
path: root/initcpio
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2018-07-04 13:59:24 +0200
committerGravatar Christian Hesse <mail@eworm.de>2018-07-04 16:19:34 +0200
commita834db5dc933a4b48c8323ae3e490448a86b448f (patch)
tree7fb8f9a7ac526633999ee47adb6f533cec3d7e5a /initcpio
parentad79ff8b22318c22eb25a157d5e2a210afa77de6 (diff)
downloadpacredir-a834db5dc933a4b48c8323ae3e490448a86b448f.tar.gz
pacredir-a834db5dc933a4b48c8323ae3e490448a86b448f.tar.zst
use private bind mounts for pacserve, remove pacdbservesystemd-v233
We want just one service to serve database files and package archives. Private bind mounts make both available to pacserve. This alse removes some complexity in pacredir.
Diffstat (limited to 'initcpio')
-rw-r--r--initcpio/hooks/pacredir19
1 files changed, 6 insertions, 13 deletions
diff --git a/initcpio/hooks/pacredir b/initcpio/hooks/pacredir
index 5f8d560..c73bb8e 100644
--- a/initcpio/hooks/pacredir
+++ b/initcpio/hooks/pacredir
@@ -4,24 +4,17 @@ run_latehook() {
local newroot="/new_root/"
if ! grep -q '^pacserve hosts' ${newroot}/etc/pacredir.conf; then
- if [[ -n "${pacserve}" ]]; then
- msg ":: Adding pacserve host '${pacserve}' to pacredir.conf..."
- echo "pacserve hosts = ${pacserve}" >> ${newroot}/etc/pacredir.conf
- fi
- fi
-
- if ! grep -q '^pacdbserve hosts' ${newroot}/etc/pacredir.conf; then
case $(uname -m) in
x86_64)
- if [[ -n "${pacdbserve_x86_64}" ]]; then
- msg ":: Adding pacdbserve host '${pacdbserve_x86_64}' to pacredir.conf..."
- echo "pacdbserve hosts = ${pacdbserve_x86_64}" >> ${newroot}/etc/pacredir.conf
+ if [[ -n "${pacserve_x86_64}" ]]; then
+ msg ":: Adding pacserve host '${pacserve_x86_64}' to pacredir.conf..."
+ echo "pacserve hosts = ${pacserve_x86_64}" >> ${newroot}/etc/pacredir.conf
fi
;;
i686)
- if [[ -n "${pacdbserve_i686}" ]]; then
- msg ":: Adding pacdbserve host '${pacdbserve_i686}' to pacredir.conf..."
- echo "pacdbserve hosts = ${pacdbserve_i686}" >> ${newroot}/etc/pacredir.conf
+ if [[ -n "${pacserve_i686}" ]]; then
+ msg ":: Adding pacserve host '${pacserve_i686}' to pacredir.conf..."
+ echo "pacserve hosts = ${pacserve_i686}" >> ${newroot}/etc/pacredir.conf
fi
;;
esac