From d5e90541f8e35916abc930b2da6de037b23d51a1 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 12 Aug 2024 12:41:36 +0100 Subject: [PATCH] polkit: install group rules in /usr/share/ instead of /etc/ Rules shipped by OS packages should go in /usr/share/. /etc/ is reserved for local modifications. This allows local users and admins to provide overrides. It also removes the need to fix directory permissions. Signed-off-by: Luca Boccassi Signed-off-by: Khem Raj --- .../recipes-extended/polkit/polkit-group-rule-datetime.bb | 2 +- .../recipes-extended/polkit/polkit-group-rule-network.bb | 2 +- .../recipes-extended/polkit/polkit-group-rule-udisks2.bb | 2 +- meta-oe/recipes-extended/polkit/polkit-group-rule.inc | 6 ------ 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb index 2159482ebb..c0066d5636 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb @@ -7,7 +7,7 @@ require polkit-group-rule.inc SRC_URI = "file://50-org.freedesktop.timedate1.rules" do_install() { - install -m 0755 ${UNPACKDIR}/50-org.freedesktop.timedate1.rules ${D}${sysconfdir}/polkit-1/rules.d + install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.timedate1.rules ${D}${datadir}/polkit-1/rules.d } USERADD_PACKAGES = "${PN}" diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb index bfd3361dfe..ec8ff868d4 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb @@ -7,7 +7,7 @@ require polkit-group-rule.inc SRC_URI = "file://50-org.freedesktop.NetworkManager.rules" do_install() { - install -m 0755 ${UNPACKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${sysconfdir}/polkit-1/rules.d + install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${datadir}/polkit-1/rules.d } USERADD_PACKAGES = "${PN}" diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb index 8dc8c5e255..884590d47c 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb @@ -10,7 +10,7 @@ SRC_URI = "file://50-org.freedesktop.udiskie.rules" RDEPENDS:${PN} += "udisks2" do_install() { - install -m 0755 ${UNPACKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d + install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.udiskie.rules ${D}${datadir}/polkit-1/rules.d } USERADD_PACKAGES = "${PN}" diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc index 4aeeb77d04..e2a2cecbe9 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc @@ -5,9 +5,3 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "polkit" inherit useradd - -do_install:prepend() { - install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d - chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d -} -USERADD_PARAM:${PN}:prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;"