diff options
| author | Juan RP <xtraeme@gmail.com> | 2012-11-22 17:02:10 +0100 |
|---|---|---|
| committer | Juan RP <xtraeme@gmail.com> | 2012-11-22 17:02:10 +0100 |
| commit | 5090e851130fe4ae15d1d87b7d0c3a1a3a6dac2b (patch) | |
| tree | 3a5c0def7bea8c2ec8779e7f48d58da1f191c3a1 | |
| parent | 183ef04078b6296d5186f9493935202c3b1b63ce (diff) | |
| download | hrmpf-5090e851130fe4ae15d1d87b7d0c3a1a3a6dac2b.tar.gz hrmpf-5090e851130fe4ae15d1d87b7d0c3a1a3a6dac2b.tar.xz hrmpf-5090e851130fe4ae15d1d87b7d0c3a1a3a6dac2b.zip | |
dracut: drop polkit script, doesn't work with polkit>=0.106.
| -rw-r--r-- | dracut/module-setup.sh | 3 | ||||
| -rw-r--r-- | dracut/polkit.sh | 46 |
2 files changed, 1 insertions, 48 deletions
diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh index 90de164..48db546 100644 --- a/dracut/module-setup.sh +++ b/dracut/module-setup.sh @@ -15,6 +15,5 @@ install() { inst /usr/bin/sed inst_hook pre-pivot 01 "$moddir/adduser.sh" inst_hook pre-pivot 02 "$moddir/conf.sh" - inst_hook pre-pivot 03 "$moddir/polkit.sh" - inst_hook pre-pivot 04 "$moddir/display-manager-autologin.sh" + inst_hook pre-pivot 03 "$moddir/display-manager-autologin.sh" } diff --git a/dracut/polkit.sh b/dracut/polkit.sh deleted file mode 100644 index c6dfd7f..0000000 --- a/dracut/polkit.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- -# ex: ts=8 sw=4 sts=4 et filetype=sh - -type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh - -USERNAME=$(getarg live.user) -[ -z "$USERNAME" ] && USERNAME=anon - -# Check that polkit is installed. -if [ ! -x ${NEWROOT}/usr/libexec/polkitd ]; then - exit 0 -fi - -# configure PolicyKit in live session -mkdir -m0755 -p ${NEWROOT}/etc/PolicyKit -cat << EOF > ${NEWROOT}/etc/PolicyKit/PolicyKit.conf -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- --> - -<!DOCTYPE pkconfig PUBLIC "-//freedesktop//DTD PolicyKit Configuration 1.0//EN" -"http://hal.freedesktop.org/releases/PolicyKit/1.0/config.dtd"> - -<!-- 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"/> -</config> -EOF - -mkdir -m0750 -p ${NEWROOT}/var/lib/polkit-1/localauthority/10-vendor.d -cat << EOF > ${NEWROOT}/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 |