summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-11-16 12:32:52 +0100
committerColin Guthrie <colin@mageia.org>2013-11-17 11:30:54 +0000
commitcf32cbcf6213c38c6b05c62173b2afb3e6af304d (patch)
tree5b71a280330c77033e2775ce26f31c71b7ebc42f
parent1c2a59df289a0d9707496617cb74c1acecc178a9 (diff)
downloadurpmi-cf32cbcf6213c38c6b05c62173b2afb3e6af304d.tar
urpmi-cf32cbcf6213c38c6b05c62173b2afb3e6af304d.tar.gz
urpmi-cf32cbcf6213c38c6b05c62173b2afb3e6af304d.tar.bz2
urpmi-cf32cbcf6213c38c6b05c62173b2afb3e6af304d.tar.xz
urpmi-cf32cbcf6213c38c6b05c62173b2afb3e6af304d.zip
polkit: Only use pkexec when not already root
-rw-r--r--NEWS2
-rw-r--r--polkit/Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 3413579b..85ad0ef0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- polkit: only use pkexec when not already root
+
Version 7.28 - 5 November 2013
- library:
diff --git a/polkit/Makefile b/polkit/Makefile
index 34e81069..dc7c4ba4 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