diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-11-16 12:31:44 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-11-17 11:22:53 +0000 |
| commit | fe658b9e9ad0cae32f922c0bc887636f42cf5b4c (patch) | |
| tree | 45a300f0d7c251fc4999610b37975d133c0292ba | |
| parent | 0d34100b42cc439df7f47a0032e8cf52120bb972 (diff) | |
| download | mgaonline-fe658b9e9ad0cae32f922c0bc887636f42cf5b4c.tar mgaonline-fe658b9e9ad0cae32f922c0bc887636f42cf5b4c.tar.gz mgaonline-fe658b9e9ad0cae32f922c0bc887636f42cf5b4c.tar.bz2 mgaonline-fe658b9e9ad0cae32f922c0bc887636f42cf5b4c.tar.xz mgaonline-fe658b9e9ad0cae32f922c0bc887636f42cf5b4c.zip | |
polkit: Only use pkexec when not already root
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | polkit/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,3 +1,5 @@ +- polkit: only use pkexec when not already root + Version 2.83 - 13 October 2013, Colin Guthrie - re-add polkit wrapper for urpmi.update (mga#11125) diff --git a/polkit/Makefile b/polkit/Makefile index a8b5a51d..070f4211 100644 --- a/polkit/Makefile +++ b/polkit/Makefile @@ -13,7 +13,7 @@ clean: rm -f $(WRAPPERS) $(POLICY) %: org.mageia.%.policy.in - @echo -e "#!/bin/sh\nexec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*" > $@ + @echo -e '#!/bin/sh\nif [[ "$$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ "$$''@"\nelse\n exec $(LIBEXECDIR)/$@ "$$''@"\nfi\n' > $@ %.policy: %.policy.in intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache |