From c95ef2daa33f39c7e8f1d4eb86595f6c4daccb95 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 9 Nov 2013 20:34:23 +0159 Subject: use /usr/libexec/drakrpm-addmedia directly in stage2 (colin, #11319) --- perl-install/install/NEWS | 1 + perl-install/standalone/polkit/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 8c06591e9..8052ab908 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- use /usr/libexec/drakrpm-addmedia directly in stage2 (colin, #11319) - debug image: o add missing python modules for latest gdb o fix building with latest gdb diff --git a/perl-install/standalone/polkit/Makefile b/perl-install/standalone/polkit/Makefile index a8b5a51da..b70cc96c4 100644 --- a/perl-install/standalone/polkit/Makefile +++ b/perl-install/standalone/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