diff options
| author |  Christian Hesse <mail@eworm.de> | 2018-07-05 14:44:30 +0200 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2018-07-05 14:44:30 +0200 |
| commit | eeb439db30c82c429a7a02bb0287713556ef7785 (patch) | |
| tree | 1fa776df51ae5b41f2dcd65472458fa806f4d12e /initcpio/hooks/pacredir | |
| parent | ad79ff8b22318c22eb25a157d5e2a210afa77de6 (diff) | |
| parent | b8aeafb0377321d8443fc36a7a1ae660f407cfd2 (diff) | |
| download | pacredir-eeb439db30c82c429a7a02bb0287713556ef7785.tar.gz pacredir-eeb439db30c82c429a7a02bb0287713556ef7785.tar.zst | |
Merge branch 'bind-mount'
Diffstat (limited to 'initcpio/hooks/pacredir')
| -rw-r--r-- | initcpio/hooks/pacredir | 19 |
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 |