summaryrefslogtreecommitdiffstats
path: root/remote/modules/policykit
diff options
context:
space:
mode:
authorSimon Rettberg2013-04-04 17:48:34 +0200
committersr2013-04-12 19:11:41 +0200
commitfc14af5d2f0696f9fef222b555aca093c6b2fe6e (patch)
tree9c26e8126220f24a533e5559db1970fbcfa4b19d /remote/modules/policykit
parentSync uids/gids by numeric value, don't remap (diff)
downloadtm-scripts-fc14af5d2f0696f9fef222b555aca093c6b2fe6e.tar.gz
tm-scripts-fc14af5d2f0696f9fef222b555aca093c6b2fe6e.tar.xz
tm-scripts-fc14af5d2f0696f9fef222b555aca093c6b2fe6e.zip
Fix Xsession startup, fix polkit+rsyslog on suse
Diffstat (limited to 'remote/modules/policykit')
-rw-r--r--remote/modules/policykit/data/etc/systemd/system/polkitd.service (renamed from remote/modules/policykit/data/lib/systemd/system/polkitd.service)2
-rw-r--r--remote/modules/policykit/policykit.build5
2 files changed, 4 insertions, 3 deletions
diff --git a/remote/modules/policykit/data/lib/systemd/system/polkitd.service b/remote/modules/policykit/data/etc/systemd/system/polkitd.service
index d3f192d1..2aeb3c48 100644
--- a/remote/modules/policykit/data/lib/systemd/system/polkitd.service
+++ b/remote/modules/policykit/data/etc/systemd/system/polkitd.service
@@ -4,4 +4,4 @@ Description=Authenticate and Authorize Users to Run Privileged Tasks
[Service]
Type=dbus
BusName=org.freedesktop.PolicyKit1
-ExecStart=/usr/lib/policykit-1/polkitd --no-debug
+ExecStart=%%POLKITD%% --no-debug
diff --git a/remote/modules/policykit/policykit.build b/remote/modules/policykit/policykit.build
index b6b70b7f..7c2f3991 100644
--- a/remote/modules/policykit/policykit.build
+++ b/remote/modules/policykit/policykit.build
@@ -6,7 +6,7 @@ fetch_source () {
}
build () {
- COPYLIST="list_dpkg_output"
+ COPYLIST="$MODULE_DIR/list_dpkg_output"
[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
list_packet_files >> "${COPYLIST}"
@@ -14,7 +14,8 @@ build () {
}
post_copy() {
-
+ local POLPATH="$(grep '/polkitd$' "$COPYLIST" | head -1 | sed -e 's/[\/&]/\\&/g')"
+ sed -i "s/%%POLKITD%%/${POLPATH}/g" "$TARGET_BUILD_DIR/etc/systemd/system/polkitd.service"
#Add Polkit User/Group/Shadow to Stage3.2
pinfo "Adding polkitd user to target system..."
add_user "polkitd"