summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2013-03-14 14:05:29 +0100
committerJonathan Bauer2013-03-14 14:05:29 +0100
commit2701ad423a2407f07b6415cf2ee70db6c66e03e1 (patch)
tree4ae906619e0a46a6334acb0a3e5103806b9c3a6c
parentbusybox: change TARGET_DIR to PREFIX (diff)
parentadd polkit.service to data (diff)
downloadtm-scripts-2701ad423a2407f07b6415cf2ee70db6c66e03e1.tar.gz
tm-scripts-2701ad423a2407f07b6415cf2ee70db6c66e03e1.tar.xz
tm-scripts-2701ad423a2407f07b6415cf2ee70db6c66e03e1.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
-rwxr-xr-xremote/core/data/init3
-rw-r--r--remote/tools/policykit/data/lib/systemd/system/polkitd.service7
-rw-r--r--remote/tools/policykit/policykit.build3
3 files changed, 13 insertions, 0 deletions
diff --git a/remote/core/data/init b/remote/core/data/init
index 25508e66..ef9c32a7 100755
--- a/remote/core/data/init
+++ b/remote/core/data/init
@@ -153,6 +153,9 @@ mount -n --move /dev/shm/uniontmp /mnt/uniontmp
if [ $DEBUG -ge 1 ]; then
echo "Starting debug shell, CTRL + D will start Stage 3.2."
setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
+else
+ #Debug is not set so hide kernel debug output
+ echo "0 0 0 0" >/proc/sys/kernel/printk
fi
for mnt in proc sys run ; do
diff --git a/remote/tools/policykit/data/lib/systemd/system/polkitd.service b/remote/tools/policykit/data/lib/systemd/system/polkitd.service
new file mode 100644
index 00000000..d3f192d1
--- /dev/null
+++ b/remote/tools/policykit/data/lib/systemd/system/polkitd.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Authenticate and Authorize Users to Run Privileged Tasks
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.PolicyKit1
+ExecStart=/usr/lib/policykit-1/polkitd --no-debug
diff --git a/remote/tools/policykit/policykit.build b/remote/tools/policykit/policykit.build
index 08f89290..8d27edcb 100644
--- a/remote/tools/policykit/policykit.build
+++ b/remote/tools/policykit/policykit.build
@@ -16,6 +16,9 @@ build () {
post_copy() {
+ # copy static policykit files to stage3.2
+ cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
+
#Add Polkit User/Group/Shadow to Stage3.2
pinfo "Adding polkitd user to target system..."
add_user "polkitd"