diff options
author | q66 <daniel@octaforge.org> | 2021-02-28 00:34:19 +0000 |
---|---|---|
committer | q66 <daniel@octaforge.org> | 2021-02-28 00:44:30 +0000 |
commit | 59493921256775b577b21d1775bd9c1a744ae603 (patch) | |
tree | d9d54f08abe8b40b5a1abb0b3492b4b9de30a1c3 /common/hooks | |
parent | be6bfce2123a238eb50254b784a15111f347817d (diff) | |
download | void-packages-59493921256775b577b21d1775bd9c1a744ae603.tar void-packages-59493921256775b577b21d1775bd9c1a744ae603.tar.gz void-packages-59493921256775b577b21d1775bd9c1a744ae603.tar.bz2 void-packages-59493921256775b577b21d1775bd9c1a744ae603.tar.lz void-packages-59493921256775b577b21d1775bd9c1a744ae603.tar.xz void-packages-59493921256775b577b21d1775bd9c1a744ae603.tar.zst void-packages-59493921256775b577b21d1775bd9c1a744ae603.zip |
base-files: make some sysctls like kexec setting user-alterable
While at it, relax the pkglint for base-files only.
Diffstat (limited to 'common/hooks')
-rw-r--r-- | common/hooks/pre-pkg/99-pkglint.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh index ada06c485ea..330df6d2454 100644 --- a/common/hooks/pre-pkg/99-pkglint.sh +++ b/common/hooks/pre-pkg/99-pkglint.sh @@ -83,12 +83,17 @@ hook() { # Prevent packages from installing to these paths in etc, they should use # their equivalent in usr/lib - 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 + # + # 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 # Likewise with the comment above but for usr/share for f in X11/xorg.conf.d gconf/schemas; do |