base-files: fix conf files replacing each other wrong

This commit is contained in:
q66 2021-02-28 02:00:31 +01:00
parent 5949392125
commit 1ea593eeda
4 changed files with 11 additions and 17 deletions

View file

@ -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