diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-11-16 12:28:49 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-11-17 11:19:32 +0000 |
| commit | e6e89616ca40bf416dd5c35f42dcab3bbcb8fd22 (patch) | |
| tree | 9e8cf30240219034d701bffef2fe4f7651c41aca | |
| parent | f9c82b5868f0d2fb3bf83533947a68bdfd982ee2 (diff) | |
| download | drak3d-e6e89616ca40bf416dd5c35f42dcab3bbcb8fd22.tar drak3d-e6e89616ca40bf416dd5c35f42dcab3bbcb8fd22.tar.gz drak3d-e6e89616ca40bf416dd5c35f42dcab3bbcb8fd22.tar.bz2 drak3d-e6e89616ca40bf416dd5c35f42dcab3bbcb8fd22.tar.xz drak3d-e6e89616ca40bf416dd5c35f42dcab3bbcb8fd22.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 + 1.34 - tidy up polkit support diff --git a/polkit/Makefile b/polkit/Makefile index 34e8106..dc7c4ba 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 |