diff options
Diffstat (limited to 'source/a')
-rw-r--r-- | source/a/etc/doinst.sh | 5 | ||||
-rwxr-xr-x | source/a/pciutils/pciutils.SlackBuild | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/source/a/etc/doinst.sh b/source/a/etc/doinst.sh index cd4ed6a1f..bc68952f0 100644 --- a/source/a/etc/doinst.sh +++ b/source/a/etc/doinst.sh @@ -98,9 +98,9 @@ chroot . /usr/sbin/usermod -d /var/lib/sddm sddm > /dev/null 2> /dev/null chroot . /usr/sbin/usermod --groups video sddm > /dev/null 2> /dev/null # Also ensure ownerships/perms: -chown root.utmp var/run/utmp var/log/wtmp +chown root:utmp var/run/utmp var/log/wtmp chmod 664 var/run/utmp var/log/wtmp -chown root.shadow etc/shadow etc/gshadow +chown root:shadow etc/shadow etc/gshadow chmod 640 etc/shadow etc/gshadow # Match permissions on any leftover config z-dot-in-non-root-path scripts @@ -112,4 +112,3 @@ fi if [ -r etc/profile.d/z-dot-in-non-root-path.sh.new ]; then touch -r etc/profile.d/z-dot-in-non-root-path.sh etc/profile.d/z-dot-in-non-root-path.sh.new fi - diff --git a/source/a/pciutils/pciutils.SlackBuild b/source/a/pciutils/pciutils.SlackBuild index 2c90e8a7c..15f688b82 100755 --- a/source/a/pciutils/pciutils.SlackBuild +++ b/source/a/pciutils/pciutils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pciutils VERSION=${VERSION:-$(echo pciutils-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -103,6 +103,13 @@ mkdir $PKG/lib${LIBDIRSUFFIX} cp -a lib*.so.? ../../lib${LIBDIRSUFFIX} ) +# Add a symlink to the old location: +if [ ! -x $PKG/sbin/lspci ]; then + if [ -x $PKG/usr/bin/lspci ]; then + ( cd $PKG/sbin ; ln -sf ../usr/bin/lspci . ) + fi +fi + mkdir -p $PKG/usr/sbin mv $PKG/sbin/update-pciids $PKG/usr/sbin/update-pciids |