forked from Mirrors/flatpak-builder
flatpak-system-helper: remove dangling reference to EXTERNAL_INSTALL_DIR
If EXTERNAL_INSTALL_DIR wasn't defined (which is likely, since nothing in the build system does), then we would tell the system helper to search /exports/share, which is not Flatpak's territory (but is a semi-commonly-used path for site-specific NFS shares, which might have contents that are inappropriate to search here). Installations that do define an external installation directory (Endless OS?) can easily override the Environment to include it by placing a drop-in in /etc/systemd/user/flatpak-system-helper.service.d/external.conf or similar.tingping/wmclass
parent
cc0c6354a2
commit
1d6834db4d
|
@ -25,7 +25,6 @@ SUBDIRS += po
|
|||
%.service: %.service.in config.log
|
||||
$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" \
|
||||
-e "s|\@localstatedir\@|$(localstatedir)|" \
|
||||
-e "s|\@externalinstalldir\@|$(EXTERNAL_INSTALL_DIR)|" \
|
||||
-e "s|\@extraargs\@||" $< > $@
|
||||
|
||||
dbus_servicedir = $(DBUS_SERVICE_DIR)
|
||||
|
|
|
@ -3,6 +3,6 @@ Description=flatpak system helper
|
|||
|
||||
[Service]
|
||||
BusName=org.freedesktop.Flatpak.SystemHelper
|
||||
Environment=XDG_DATA_DIRS=@localstatedir@/lib/flatpak/exports/share/:@externalinstalldir@/exports/share/:/usr/local/share/:/usr/share/
|
||||
Environment=XDG_DATA_DIRS=@localstatedir@/lib/flatpak/exports/share/:/usr/local/share/:/usr/share/
|
||||
ExecStart=@libexecdir@/flatpak-system-helper
|
||||
Type=dbus
|
||||
|
|
Loading…
Reference in New Issue