From b667b975bcd8b97662b0ca7974f036905cf3177b Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sat, 9 Nov 2013 20:18:43 +0159
Subject: use /usr/libexec/drakrpm-addmedia directly in stage2 (colin, #11319)

---
 NEWS            | 2 ++
 polkit/Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 34fd046a..2e23125a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- use /usr/libexec/drakrpm-addmedia directly under stage2
+
 Version 5.51 - 13 October 2013, Colin Guthrie
 
 - tidy up polkit support
diff --git a/polkit/Makefile b/polkit/Makefile
index 34e81069..182070ae 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  [[ "$(id -u)" != "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
-- 
cgit v1.2.1