summaryrefslogtreecommitdiffstats
path: root/source/a/elogind
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-12-20 03:10:57 +0000
committer Eric Hameleers <alien@slackware.com>2020-12-20 08:59:51 +0100
commit98f1ac1fd7a1b5643d4040c9d18276576a7d759a (patch)
treeed148154f5e837b482889bf99527bbc97aa707c0 /source/a/elogind
parentc9a25f18230e4de74520105a1310ca50c9f30239 (diff)
downloadcurrent-98f1ac1fd7a1b5643d4040c9d18276576a7d759a.tar.gz
current-98f1ac1fd7a1b5643d4040c9d18276576a7d759a.tar.xz
Sun Dec 20 03:10:57 UTC 202020201220031057
Linus didn't think this was a scary kernel and in spite of skipping a few branches here before getting to this one, I don't either. Not scary enough to make me think I need to start it out in /testing, anyway. I have a good feeling about this kernel. Enjoy! :-) a/bash-5.1.004-x86_64-1.txz: Upgraded. a/elogind-246.9-x86_64-1.txz: Upgraded. Don't make 10-enable-session-power.rules a .new file. Thanks to Robby Workman. a/kernel-firmware-20201218_646f159-noarch-1.txz: Upgraded. a/kernel-generic-5.10.1-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.1-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.1-x86_64-1.txz: Upgraded. a/ndctl-71-x86_64-1.txz: Upgraded. a/sysvinit-scripts-2.1-noarch-37.txz: Rebuilt. rc.S: don't start cgmanager/cgproxy. rc.6: don't stop cgmanager/cgproxy. d/kernel-headers-5.10.1-x86-1.txz: Upgraded. k/kernel-source-5.10.1-noarch-1.txz: Upgraded. l/libtiff-4.2.0-x86_64-1.txz: Upgraded. l/zstd-1.4.8-x86_64-1.txz: Upgraded. n/ca-certificates-20201219-noarch-1.txz: Upgraded. This update provides the latest CA certificates to check for the authenticity of SSL connections. xap/libnma-1.8.30-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/a/elogind')
-rw-r--r--source/a/elogind/doinst.sh13
-rwxr-xr-xsource/a/elogind/elogind.SlackBuild7
2 files changed, 3 insertions, 17 deletions
diff --git a/source/a/elogind/doinst.sh b/source/a/elogind/doinst.sh
index d920f6641..3f15bbd8d 100644
--- a/source/a/elogind/doinst.sh
+++ b/source/a/elogind/doinst.sh
@@ -28,22 +28,9 @@ preserve_perms() {
# Preserve permissions while moving into place:
preserve_perms etc/rc.d/rc.elogind.new
config etc/elogind/logind.conf.new
-config usr/share/polkit-1/rules.d/10-enable-session-power.rules.new
if pgrep -f elogind-daemon | grep -q 'elogind-daemon'; then
echo "Reloading elogind-daemon..."
pkill -HUP -f elogind-daemon
fi
-## Now taken care of in Slackware's /etc/rc.d/rc.M:
-##
-## Update rc.local so that elogind will be functional after boot:
-#if ! grep "rc.elogind" etc/rc.d/rc.local 1>/dev/null 2>/dev/null ; then
-# cat <<_EOM_ >> etc/rc.d/rc.local
-#
-#if [ -x /etc/rc.d/rc.elogind ]; then
-# # Create runtime for elogind (standalone logind extracted from systemd):
-# /etc/rc.d/rc.elogind start
-#fi
-#_EOM_
-#fi
diff --git a/source/a/elogind/elogind.SlackBuild b/source/a/elogind/elogind.SlackBuild
index 1cf2e5c62..9438d08b6 100755
--- a/source/a/elogind/elogind.SlackBuild
+++ b/source/a/elogind/elogind.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=elogind
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -169,9 +169,8 @@ mkdir -p $PKG/etc/elogind/logind.conf.d/ $PKG/etc/elogind/sleep.conf.d/
# Add login1 policy file that allows users in the 'power' group
# to shutdown/reboot the computer:
mkdir -p $PKG/usr/share/polkit-1/rules.d
-install -m 0644 -o root \
- $CWD/10-enable-elogind-power.rules \
- $PKG/usr/share/polkit-1/rules.d/10-enable-session-power.rules.new
+zcat $CWD/10-enable-elogind-power.rules.gz > \
+ $PKG/usr/share/polkit-1/rules.d/10-enable-session-power.rules
# We don't need the hidden files to make inferior package managers keep dirs:
find $PKG -type f -name ".keep_dir" -exec rm -f {} \;