aboutsummaryrefslogtreecommitdiff
path: root/common/hooks
diff options
context:
space:
mode:
authorq66 <daniel@octaforge.org>2021-02-28 01:00:31 +0000
committerq66 <daniel@octaforge.org>2021-02-28 01:05:33 +0000
commit1ea593eedad80474affa21f221b88a9efb28ee36 (patch)
treeff0026ed18be6f01dc138b525bfae0c030fbcf53 /common/hooks
parent59493921256775b577b21d1775bd9c1a744ae603 (diff)
downloadvoid-packages-1ea593eedad80474affa21f221b88a9efb28ee36.tar
void-packages-1ea593eedad80474affa21f221b88a9efb28ee36.tar.gz
void-packages-1ea593eedad80474affa21f221b88a9efb28ee36.tar.bz2
void-packages-1ea593eedad80474affa21f221b88a9efb28ee36.tar.lz
void-packages-1ea593eedad80474affa21f221b88a9efb28ee36.tar.xz
void-packages-1ea593eedad80474affa21f221b88a9efb28ee36.tar.zst
void-packages-1ea593eedad80474affa21f221b88a9efb28ee36.zip
base-files: fix conf files replacing each other wrong
Diffstat (limited to 'common/hooks')
-rw-r--r--common/hooks/pre-pkg/99-pkglint.sh17
1 files changed, 6 insertions, 11 deletions
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 330df6d2454..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -83,17 +83,12 @@ hook() {
# Prevent packages from installing to these paths in etc, they should use
# their equivalent in usr/lib
- #
- # But base-files is a special case, since it may contains suggested but
- # still user-alterable default files (particularly sysctl.d)
- if [ "${pkgname}" != "base-files" ]; then
- for f in udev/{rules.d,hwdb.d} modprobe.d sysctl.d; do
- if [ -d ${PKGDESTDIR}/etc/${f} ]; then
- msg_red "${pkgver}: /etc/${f} is forbidden. Use /usr/lib/${f}.\n"
- error=1
- fi
- done
- fi
+ for f in udev/{rules.d,hwdb.d} modprobe.d sysctl.d; do
+ if [ -d ${PKGDESTDIR}/etc/${f} ]; then
+ msg_red "${pkgver}: /etc/${f} is forbidden. Use /usr/lib/${f}.\n"
+ error=1
+ fi
+ done
# Likewise with the comment above but for usr/share
for f in X11/xorg.conf.d gconf/schemas; do