Re: [PATCH] Port from PolicyKit to polkit

David Cantrell <dcantrell@xxxxxxxxxx> · Thu, 17 Sep 2009 13:30:50 -1000 (HST)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ack.

On Thu, 17 Sep 2009, Jesse Keating wrote:

A few path changes, a few new files, and a few less files
---
scripts/mk-images    |   21 ++++++++++-----------
scripts/upd-instroot |   13 ++++++-------
2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index 225f383..4dfd9e4 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -560,9 +560,9 @@ makeinitrd() {
    mkdir -p $MBD_DIR/etc/NetworkManager/dispatcher.d
    mkdir -p $MBD_DIR/$LIBDIR/dbus-1
    mkdir -p $MBD_DIR/etc/sysconfig/network-scripts
-    mkdir -p $MBD_DIR/usr/share/PolicyKit/policy
-    mkdir -p $MBD_DIR/etc/PolicyKit
-    mkdir -p $MBD_DIR/var/lib/misc
+    mkdir -p $MBD_DIR/usr/share/polkit-1/actions
+    mkdir -p $MBD_DIR/etc/polkit-1/localauthority.conf.d
+    mkdir -p $MBD_DIR/etc/polkit-1/nullbackend.conf.d
    mkdir -p $MBD_DIR/etc/hal/fdi
    mkdir -p $MBD_DIR/usr/share/hal/fdi
    mkdir -p $MBD_DIR/usr/share/hwdata
@@ -708,17 +708,16 @@ makeinitrd() {
    cp -a $IMGPATH/etc/dbus-1/system.d/hal.conf $MBD_DIR/etc/dbus-1/system.d

    # PolicyKit
-    ( cd $IMGPATH/etc/PolicyKit
-      cp -a PolicyKit.conf $MBD_DIR/etc/PolicyKit
+    ( cd $IMGPATH/etc/polkit-1
+      cp -a localauthority.conf.d/50-localauthority.conf $MBD_DIR/etc/polkit-1/localauthority.conf.d
+      cp -a localauthority.conf.d/60-desktop-policy.conf $MBD_DIR/etc/polkit-1/localauthority.conf.d
+      cp -a nullbackend.conf.d/50-nullbackend.conf $MBD_DIR/etc/polkit-1/nullbackend.conf.d
    )
    ( cd $IMGPATH/usr/share/dbus-1/system-services
-      cp -a org.freedesktop.PolicyKit.service $MBD_DIR/usr/share/dbus-1/system-services
+      cp -a org.freedesktop.PolicyKit1.service $MBD_DIR/usr/share/dbus-1/system-services
    )
-    ( cd $IMGPATH/usr/share/PolicyKit/policy
-      cp -a org.freedesktop.policykit.policy $MBD_DIR/usr/share/PolicyKit/policy
-    )
-    ( cd $IMGPATH/var/lib/misc
-      cp -a PolicyKit.reload $MBD_DIR/var/lib/misc
+    ( cd $IMGPATH/usr/share/polkit/actions
+      cp -a org.freedesktop.policykit.policy $MBD_DIR/usr/share/polkit-1/actions
    )

    # dbus
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 9594716..94a70d9 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -155,7 +155,7 @@ die () {
    exit 1
}

-PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit acl anaconda
+PACKAGES="GConf2 NetworkManager ORBit2 acl anaconda
    anaconda-yum-plugins at-spi atk attr audit-libs bash bitmap-fonts-cjk
    btrfs-progs bzip2 bzip2-libs ca-certificates cairo cjkuni-uming-fonts
    comps-extras coreutils cpio cracklib cracklib-dicts cracklib-python
@@ -182,7 +182,7 @@ PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit acl anaconda
    lohit-telugu-fonts lvm2 madan-fonts mdadm
    mesa-dri-drivers mkinitrd module-init-tools nash ncurses neon net-tools
    newt newt-python nfs-utils nspr nss ntfs-3g pam pango parted pciutils pcre
-    policycoreutils popt prelink procps pycairo pygobject2 pygtk2
+    policycoreutils polkit popt prelink procps pycairo pygobject2 pygtk2
    pygtk2-libglade pykickstart pyparted python python-bugzilla python-decorator
    python-libs python-nss python-pyblock python-sqlite
    python-urlgrabber python-volume_key pyxf86config readline redhat-artwork
@@ -347,7 +347,6 @@ boot/efika.forth
boot/memtest86*
etc/NetworkManager/nm-system-settings.conf
etc/NetworkManager/dispatcher.d
-etc/PolicyKit/*
etc/dbus-1/*
etc/dbus-1/system.d/*
etc/fb.modes
@@ -366,6 +365,8 @@ etc/pango
etc/passwd
etc/pcmcia
etc/pki/tls/certs/ca-bundle.crt
+etc/polkit-1/localauthority.conf.d/*
+etc/polkit-1/nullbackend.conf.d/*
etc/prelink.conf
etc/protocols
etc/rc.d/init.d/functions
@@ -574,7 +575,7 @@ usr/sbin/xfs_check
usr/sbin/xfs_copy
usr/sbin/xfs_db
usr/sbin/ybin
-usr/share/PolicyKit/policy/*
+usr/share/polkit-1/actions/*
usr/share/X11/XKeysymDB
usr/share/X11/fonts/TTF/GohaTibebZemen.ttf
usr/share/X11/fonts/misc/6x13*
@@ -653,11 +654,9 @@ usr/share/xorg/vesamodes
usr/share/zenity
usr/share/zoneinfo
var/cache/hald
-var/lib/PolicyKit*
+var/lib/polkit-1
var/lib/dbus
var/lib/hal
-var/lib/misc/PolicyKit*
-var/run/PolicyKit
var/run/dbus
EOF



- -- 
David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkqyxqsACgkQ5hsjjIy1Vkm2gwCgkxBd4RN3WPlQ6D3nchA32VDK
NMUAn3FgSngOko1SDRqTbowSxkoi7ovq
=5MV/
-----END PGP SIGNATURE-----

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list




