diff options
| author | Thomas Backlund <tmb@mageia.org> | 2013-11-09 20:18:43 +0159 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2013-11-09 20:18:43 +0159 |
| commit | b667b975bcd8b97662b0ca7974f036905cf3177b (patch) | |
| tree | b5d6a0bd48bb6acf025329ecb9a4194c6c4fc96b | |
| parent | e08cedd72a8482178c0d0bfe528fd3ba83924c80 (diff) | |
| download | rpmdrake-b667b975bcd8b97662b0ca7974f036905cf3177b.tar rpmdrake-b667b975bcd8b97662b0ca7974f036905cf3177b.tar.gz rpmdrake-b667b975bcd8b97662b0ca7974f036905cf3177b.tar.bz2 rpmdrake-b667b975bcd8b97662b0ca7974f036905cf3177b.tar.xz rpmdrake-b667b975bcd8b97662b0ca7974f036905cf3177b.zip | |
use /usr/libexec/drakrpm-addmedia directly in stage2 (colin, #11319)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | polkit/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 |