trivial: allow configuring ESP location (#94)

This commit is contained in:
Mario Limonciello 2017-02-27 10:37:19 -06:00
parent ec7f3ab02e
commit 5b6103ce97
4 changed files with 10 additions and 1 deletions

View File

@ -57,6 +57,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
--enable-uefi \
--enable-dell \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
--with-bootdir=$$dc_install_base/$(bootdir) \
--with-systemdunitdir=$$dc_install_base/$(systemdunitdir)
GITIGNOREFILES = \

View File

@ -335,6 +335,13 @@ AC_ARG_WITH([systemdunitdir],
[with_systemdunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
AC_SUBST([systemdunitdir], [$with_systemdunitdir])
# EFI system partition location
AC_ARG_WITH([bootdir],
AS_HELP_STRING([--with-bootdir=DIR], [Directory for EFI system partition]),
[],
[with_bootdir=/boot/efi])
AC_SUBST([bootdir], [$with_bootdir])
# udev rules
AC_ARG_WITH([udevrulesdir],
AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]),

View File

@ -19,6 +19,7 @@ $(dbusservicemain_DATA): $(dbusservicemain_in_files) Makefile
%.service: %.service.in Makefile
$(AM_V_GEN)sed -e 's|\@servicedir\@|$(libexecdir)|' \
-e 's|\@localstatedir\@|$(localstatedir)|' \
-e 's|\@bootdir\@|$(bootdir)|' \
-e 's|\@bindir\@|$(bindir)|' \
-e 's|\@daemon_user\@|$(daemon_user)|' $< > $@.tmp && mv $@.tmp $@

View File

@ -16,4 +16,4 @@ ProtectKernelModules=yes
ProtectSystem=full
RestrictAddressFamilies=AF_NETLINK AF_UNIX
RestrictRealtime=yes
ReadWritePaths=@localstatedir@/lib/fwupd /boot/efi
ReadWritePaths=@localstatedir@/lib/fwupd @bootdir@