From 2b6f4f1bcfa4643fc8e32f3ade6575bb2e97c458 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 24 May 2016 10:09:20 +0200 Subject: [PATCH] Add --with-privileged-group options This allows distros to change the wheel group into something else, for instance admin (ubuntu) or sudo (debian). --- configure.ac | 6 ++++++ system-helper/Makefile.am.inc | 11 +++++++---- ...Flatpak.rules => org.freedesktop.Flatpak.rules.in} | 0 3 files changed, 13 insertions(+), 4 deletions(-) rename system-helper/{org.freedesktop.Flatpak.rules => org.freedesktop.Flatpak.rules.in} (100%) diff --git a/configure.ac b/configure.ac index cb789533..13833f6c 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,12 @@ AX_VALGRIND_CHECK PKG_PROG_PKG_CONFIG([0.24]) +AC_ARG_WITH(privileged_group, + AS_HELP_STRING([--with-privileged-group=GROUP],[Name of privileged group, [default=wheel]]), + with_privileged_group="$withval", with_privileged_group=wheel) +PRIVILEGED_GROUP=$with_privileged_group +AC_SUBST(PRIVILEGED_GROUP) + AC_ARG_WITH(dbus_service_dir, AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]]), with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services) diff --git a/system-helper/Makefile.am.inc b/system-helper/Makefile.am.inc index 2301a874..07254983 100644 --- a/system-helper/Makefile.am.inc +++ b/system-helper/Makefile.am.inc @@ -20,15 +20,18 @@ flatpak_system_helper_SOURCES = \ flatpak_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libflatpak-common.la flatpak_system_helper_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(POLKIT_CFLAGS) +system-helper/org.freedesktop.Flatpak.rules: system-helper/org.freedesktop.Flatpak.rules.in + $(AM_V_GEN) $(SED) -e "s|\@privileged_group\@|$(PRIVILEGED_GROUP)|" $< > $@ + polkit_rulesdir = $(datadir)/polkit-1/rules.d -dist_polkit_rules_DATA = \ +polkit_rules_DATA = \ system-helper/org.freedesktop.Flatpak.rules polkit_policydir = $(datadir)/polkit-1/actions -dist_polkit_policy_DATA = \ +polkit_policy_DATA = \ system-helper/org.freedesktop.Flatpak.policy @INTLTOOL_POLICY_RULE@ -EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in system-helper/org.freedesktop.Flatpak.SystemHelper.conf -DISTCLEANFILES += system-helper/org.freedesktop.Flatpak.policy system-helper/flatpak-system-helper.service system-helper/org.freedesktop.Flatpak.SystemHelper.service +EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in system-helper/org.freedesktop.Flatpak.SystemHelper.conf system-helper/org.freedesktop.Flatpak.rules.in +DISTCLEANFILES += system-helper/org.freedesktop.Flatpak.policy system-helper/org.freedesktop.Flatpak.rules system-helper/flatpak-system-helper.service system-helper/org.freedesktop.Flatpak.SystemHelper.service diff --git a/system-helper/org.freedesktop.Flatpak.rules b/system-helper/org.freedesktop.Flatpak.rules.in similarity index 100% rename from system-helper/org.freedesktop.Flatpak.rules rename to system-helper/org.freedesktop.Flatpak.rules.in