summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAliaksandr Stelmachonak2019-09-22 01:05:06 -0400
committerAliaksandr Stelmachonak2019-09-22 01:05:06 -0400
commit37d1a568659acd9905d7817e595d4d9e3aaa9c14 (patch)
tree2a5b6bd3b4ff783f8d4966488dfb2799a77f514f
parentc7e7892c7eb033e4faf8d868b2b3b9cf106a9bb1 (diff)
downloadaur-37d1a568659acd9905d7817e595d4d9e3aaa9c14.tar.gz
Updated to last version
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD24
-rw-r--r--cros-nopasswd.rules7
3 files changed, 24 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 58588988939a..bf03c2952aa1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cros-container-guest-tools-git
pkgdesc = Guest tools for the Crostini containers on ChromeOS
- pkgver = r198.48dd2aa
+ pkgver = r203.43213c8
pkgrel = 1
url = https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools
install = cros-container-guest-tools.install
@@ -19,12 +19,14 @@ pkgbase = cros-container-guest-tools-git
source = cros-locale.sh
source = cros-garcon.hook
source = cros-logind-override.conf
+ source = cros-nopasswd.rules
sha1sums = SKIP
sha1sums = 0827ce6d673949a995be2d69d4974ddd9bdf16f1
sha1sums = d326cd35dcf150f9f9c8c7d6336425ec08ad2433
sha1sums = 8586cf72dacdcca82022519467065f70fe4a3294
sha1sums = 9a68893cadf9190e99cadc4c781ba43e45104b1e
sha1sums = 0c21f6c85ecbe8f822c378c7e4d5b3165e56eb3a
+ sha1sums = 089ba58bc504146b29035a8efe70045eb2495fb5
pkgname = cros-container-guest-tools-git
diff --git a/PKGBUILD b/PKGBUILD
index 2782b06d0ae9..88bab42ba8db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
_pkgname=cros-container-guest-tools
pkgname=${_pkgname}-git
-pkgver=r198.48dd2aa
+pkgver=r203.43213c8
pkgrel=1
pkgdesc="Guest tools for the Crostini containers on ChromeOS"
arch=('any')
@@ -8,13 +8,14 @@ license=('custom')
depends=('openssh' 'xdg-utils' 'xkeyboard-config' 'pulseaudio' 'xxd' 'packagekit' 'dbus')
install=cros-container-guest-tools.install
url="https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools"
-source=("git+${url}" 'cros-sftp-conditions.conf' 'cros-garcon-conditions.conf' 'cros-locale.sh' 'cros-garcon.hook' 'cros-logind-override.conf')
+source=("git+${url}" 'cros-sftp-conditions.conf' 'cros-garcon-conditions.conf' 'cros-locale.sh' 'cros-garcon.hook' 'cros-logind-override.conf' 'cros-nopasswd.rules' )
sha1sums=('SKIP'
'0827ce6d673949a995be2d69d4974ddd9bdf16f1'
'd326cd35dcf150f9f9c8c7d6336425ec08ad2433'
'8586cf72dacdcca82022519467065f70fe4a3294'
'9a68893cadf9190e99cadc4c781ba43e45104b1e'
- '0c21f6c85ecbe8f822c378c7e4d5b3165e56eb3a')
+ '0c21f6c85ecbe8f822c378c7e4d5b3165e56eb3a'
+ '089ba58bc504146b29035a8efe70045eb2495fb5')
pkgver() {
cd ${srcdir}/${_pkgname}
@@ -35,7 +36,7 @@ package() {
### cros-adapta -> included into cros-container-guest-tools.install
-# Uncomment after https://bugs.archlinux.org/task/58701 is fixed
+# Uncomment after https://bugs.archlinux.org/task/58701 is fixed
#
# mkdir -p ${pkgdir}/usr/share/themes
# ln -sf /opt/google/cros-containers/cros-adapta ${pkgdir}/usr/share/themes/CrosAdapta
@@ -107,22 +108,25 @@ package() {
sed -i '$ s|$|\nEnvironment="LIBGL_DRIVERS_PATH=/opt/google/cros-containers/lib"|' ${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-x-override.conf
install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-override.conf \
- ${pkgdir}/usr/lib/systemd/user/sommelier@0.service.d/cros-sommelier-override.conf
+ ${pkgdir}/usr/lib/systemd/user/sommelier@0.service.d/cros-sommelier-override.conf
install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-override.conf \
- ${pkgdir}/usr/lib/systemd/user/sommelier@1.service.d/cros-sommelier-override.conf
+ ${pkgdir}/usr/lib/systemd/user/sommelier@1.service.d/cros-sommelier-override.conf
install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-low-density-override.conf \
- ${pkgdir}/usr/lib/systemd/user/sommelier@1.service.d/cros-sommelier-low-density-override.conf
+ ${pkgdir}/usr/lib/systemd/user/sommelier@1.service.d/cros-sommelier-low-density-override.conf
install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-x-override.conf \
- ${pkgdir}/usr/lib/systemd/user/sommelier-x@0.service.d/cros-sommelier-x-override.conf
+ ${pkgdir}/usr/lib/systemd/user/sommelier-x@0.service.d/cros-sommelier-x-override.conf
install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-x-override.conf \
- ${pkgdir}/usr/lib/systemd/user/sommelier-x@1.service.d/cros-sommelier-x-override.conf
+ ${pkgdir}/usr/lib/systemd/user/sommelier-x@1.service.d/cros-sommelier-x-override.conf
install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-low-density-override.conf \
- ${pkgdir}/usr/lib/systemd/user/sommelier-x@1.service.d/cros-sommelier-low-density-override.conf
+ ${pkgdir}/usr/lib/systemd/user/sommelier-x@1.service.d/cros-sommelier-low-density-override.conf
### cros-sudo-config
install -m440 -D ${srcdir}/${_pkgname}/cros-sudo-config/10-cros-nopasswd ${pkgdir}/etc/sudoers.d/10-cros-nopasswd
+ # same rule as 10-cros-nopasswd.pkla but written using polkit rules syntax
+ install -m644 -D ${srcdir}/cros-nopasswd.rules ${pkgdir}/usr/share/polkit-1/rules.d/cros-nopasswd.rules
+
# replace sudo group with wheel group for no password sudo access
sed -i 's/%sudo/%wheel/1' ${pkgdir}/etc/sudoers.d/10-cros-nopasswd
diff --git a/cros-nopasswd.rules b/cros-nopasswd.rules
new file mode 100644
index 000000000000..2bfcf6916fa5
--- /dev/null
+++ b/cros-nopasswd.rules
@@ -0,0 +1,7 @@
+/* Allow users in wheel group to run commands without authentication */
+polkit.addRule(function(action, subject) {
+ if (action.id == "org.freedesktop.policykit.exec" &&
+ subject.isInGroup("wheel")) {
+ return polkit.Result.YES;
+ }
+});