From 59776c3e93d792dd921e2c5d23975cc984cdac86 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 12 Jan 2023 14:58:57 +0100
Subject: [lightdm-greeter-bwlp] Replace polkit .pkla by equivalent .rules file

---
 .../50-local.d/enable-lightdm-poweroptions.pkla               |  6 ------
 .../data/etc/polkit-1/rules.d/50-slx-lightdm-powerctl.rules   | 11 +++++++++++
 data/kernel.wanted.config                                     |  9 ++++-----
 3 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 core/modules/lightdm-greeter-bwlp/data/etc/polkit-1/localauthority/50-local.d/enable-lightdm-poweroptions.pkla
 create mode 100644 core/modules/lightdm-greeter-bwlp/data/etc/polkit-1/rules.d/50-slx-lightdm-powerctl.rules

diff --git a/core/modules/lightdm-greeter-bwlp/data/etc/polkit-1/localauthority/50-local.d/enable-lightdm-poweroptions.pkla b/core/modules/lightdm-greeter-bwlp/data/etc/polkit-1/localauthority/50-local.d/enable-lightdm-poweroptions.pkla
deleted file mode 100644
index ad458b91..00000000
--- a/core/modules/lightdm-greeter-bwlp/data/etc/polkit-1/localauthority/50-local.d/enable-lightdm-poweroptions.pkla
+++ /dev/null
@@ -1,6 +0,0 @@
-[Enable Lightdm PowerOptions]
-Identity=unix-user:lightdm
-Action=org.freedesktop.login1.reboot;org.freedesktop.login1.reboot-multiple-sessions;org.freedesktop.login1.power-off;org.freedesktop.login1.power-off-multiple-sessions;org.freedesktop.login1.suspend;org.freedesktop.login1.suspend-multiple-sessions;org.freedesktop.login1.hibernate;org.freedesktop.login1.hibernate-multiple-sessions
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/core/modules/lightdm-greeter-bwlp/data/etc/polkit-1/rules.d/50-slx-lightdm-powerctl.rules b/core/modules/lightdm-greeter-bwlp/data/etc/polkit-1/rules.d/50-slx-lightdm-powerctl.rules
new file mode 100644
index 00000000..ec842b7b
--- /dev/null
+++ b/core/modules/lightdm-greeter-bwlp/data/etc/polkit-1/rules.d/50-slx-lightdm-powerctl.rules
@@ -0,0 +1,11 @@
+polkit.addRule(function(action, subject) {
+    if (action.id == "org.freedesktop.login1.power-off" ||
+        action.id == "org.freedesktop.login1.power-off-multiple-sessions" ||
+        action.id == "org.freedesktop.login1.reboot" ||
+        action.id == "org.freedesktop.login1.reboot-multiple-sessions"
+    ) {
+        if (subject.user === "lightdm")
+            return polkit.Result.YES;
+        return polkit.Result.NOT_HANDLED;
+    }
+});
diff --git a/data/kernel.wanted.config b/data/kernel.wanted.config
index 1977d8b3..d94f7d35 100644
--- a/data/kernel.wanted.config
+++ b/data/kernel.wanted.config
@@ -114,9 +114,9 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_FILE_FMT_QCOW=y
 CONFIG_BLK_DEV_LOOP_FILE_FMT_RAW=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_MD=y
-CONFIG_BLK_DEV_NBD=y
-CONFIG_BLK_DEV_NVME=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_BLK_MQ_VIRTIO=y
@@ -546,7 +546,6 @@ CONFIG_NETWORK_PHY_TIMESTAMPING=y
 CONFIG_NETXEN_NIC=m
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_CORE=y
-CONFIG_NET_FAILOVER=y
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_TULIP=y
 CONFIG_NET_VENDOR_3COM=n
@@ -1204,6 +1203,6 @@ CONFIG_X86_MSR=m
 CONFIG_XFS_FS=y
 CONFIG_ZNET=y
 CONFIG_ZRAM=m
-CONFIG_ZRAM_MEMORY_TRACKING=y
+CONFIG_ZRAM_MEMORY_TRACKING=n
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZSMALLOC=y
-- 
cgit v1.2.3-55-g7522