X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F44pk_allow;h=a2118804881fe717618c2dfbc82e1b5798789727;hb=613393eef8be213c8859b2d7a2f6334cb82bd52b;hp=aefde98a7c1eda38554a25226f6d94c37d71eedd;hpb=b2b8542c6a7f0dc525adfb0f3b9a5a961218ae4f;p=live-boot-grml.git

diff --git a/scripts/live-bottom/44pk_allow b/scripts/live-bottom/44pk_allow
old mode 100644
new mode 100755
index aefde98..a211880
--- a/scripts/live-bottom/44pk_allow
+++ b/scripts/live-bottom/44pk_allow
@@ -1,28 +1,34 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Grant administrative PolicyKit pivilieges to default user..."
+#set -e
+
+# initramfs-tools header
 
-. /scripts/casper-functions
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Grant administrative PolicyKit pivilieges to default user"
+
+# live-initramfs script
 
 # configure PolicyKit in live session
+mkdir -p /root/etc/PolicyKit
 cat << EOF > /root/etc/PolicyKit/PolicyKit.conf
-
 <?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
 
 <!DOCTYPE pkconfig PUBLIC "-//freedesktop//DTD PolicyKit Configuration 1.0//EN"
@@ -31,15 +37,35 @@ cat << EOF > /root/etc/PolicyKit/PolicyKit.conf
 <!-- See the manual page PolicyKit.conf(5) for file format -->
 
 <config version="0.1">
-    <match user="root">
-        <return result="yes"/>
-    </match>
-    <!-- don't ask password for user in live session -->
-    <match user="$USERNAME">
-        <return result="yes"/>
-    </match>
-    <define_admin_auth group="admin"/>
+	<match user="root">
+		<return result="yes"/>
+	</match>
+EOF
+
+if [ -n "${USERNAME}" ]
+then
+	cat << EOF >> /root/etc/PolicyKit/PolicyKit.conf
+	<!-- don't ask password for user in live session -->
+	<match user="$USERNAME">
+		<return result="yes"/>
+	</match>
+EOF
+fi
+
+cat << EOF >> /root/etc/PolicyKit/PolicyKit.conf
+	<define_admin_auth group="admin"/>
 </config>
 EOF
 
+mkdir -p /root/var/lib/polkit-1/localauthority/10-vendor.d
+cat << EOF > /root/var/lib/polkit-1/localauthority/10-vendor.d/10-live-cd.pkla
+# Policy to allow the livecd user to bypass policykit
+[Live CD user permissions]
+Identity=unix-user:$USERNAME
+Action=*
+ResultAny=no
+ResultInactive=no
+ResultActive=yes
+EOF
+
 log_end_msg