summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--polkit/Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index affae58..313fe1b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- polkit: only use pkexec when not already root
+
Version 0.112 - 13 October 2013
- 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