From 198cae3e9dc52497225ef36b01279e11cc262197 Mon Sep 17 00:00:00 2001 From: WereCatf Date: Sat, 12 Mar 2016 06:35:14 +0200 Subject: [PATCH] Automounting/eject of USB, reboot/poweroff working from desktop --- config/polkit-jessie/plugdev.pkla | 6 ++++++ config/polkit-jessie/power.pkla | 6 ++++++ configuration.sh | 2 +- desktop.sh | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 config/polkit-jessie/plugdev.pkla create mode 100644 config/polkit-jessie/power.pkla diff --git a/config/polkit-jessie/plugdev.pkla b/config/polkit-jessie/plugdev.pkla new file mode 100644 index 0000000000..ba8da56a46 --- /dev/null +++ b/config/polkit-jessie/plugdev.pkla @@ -0,0 +1,6 @@ +[Allow Automount] +Identity=unix-group:plugdev +Action=org.freedesktop.udisks2.filesystem-mount;org.freedesktop.udisks2.filesystem-mount-system;org.freedesktop.udisks2.filesystem-mount-other-seat;org.freedesktop.udisks2.filesystem-unmount-others;org.freedesktop.udisks2.eject-media;org.freedesktop.udisks2.eject-media-system;org.freedesktop.udisks2.power-off-drive* +ResultAny=yes +ResultInactive=yes +ResultActive=yes diff --git a/config/polkit-jessie/power.pkla b/config/polkit-jessie/power.pkla new file mode 100644 index 0000000000..a2a6fba496 --- /dev/null +++ b/config/polkit-jessie/power.pkla @@ -0,0 +1,6 @@ +[Allow Desktopstuff] +Identity=unix-group:sudo +Action=org.freedesktop.login1.reboot;org.freedesktop.login1.reboot-multiple-session;org.freedesktop.login1.power-off;org.freedesktop.login1.power-off-multiple-sessions;org.freedesktop.login1.suspend;org.freedesktop.login1.suspend-multiple-sessions;org.freedesktop.login1.hibernate;org.freedesktop.login1.hibernate-multiple-sessions +ResultAny=yes +ResultInactive=yes +ResultActive=yes diff --git a/configuration.sh b/configuration.sh index 1557b35070..b3b07b8850 100644 --- a/configuration.sh +++ b/configuration.sh @@ -567,7 +567,7 @@ if [[ $BUILD_DESKTOP == yes ]]; then PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mozo pluma iceweasel icedove" ;; jessie) - PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mozo pluma iceweasel libreoffice-writer libreoffice-java-common icedove" + PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mozo pluma iceweasel libreoffice-writer libreoffice-java-common icedove gvfs policykit-1 policykit-1-gnome eject" ;; trusty) PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP libreoffice-writer libreoffice-java-common thunderbird firefox gnome-icon-theme-full tango-icon-theme gvfs-backends" diff --git a/desktop.sh b/desktop.sh index 0d85c112d1..c375898e06 100644 --- a/desktop.sh +++ b/desktop.sh @@ -35,6 +35,8 @@ if [[ $RELEASE == "jessie" ]]; then test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d" chroot $DEST/cache/sdcard /bin/bash -c "tar xfz /tmp/jessie-desktop.tgz -C /etc/skel/" chroot $DEST/cache/sdcard /bin/bash -c "tar xfz /tmp/jessie-desktop.tgz -C /root/" + mkdir -p $DEST/cache/sdcard/etc/polkit-1/localauthority/50-local.d + cp $SRC/lib/config/polkit-jessie/*.pkla $DEST/cache/sdcard/etc/polkit-1/localauthority/50-local.d/ fi # Ubuntu trusty