mirror of
https://gitlab.com/cryptsetup/cryptsetup.git
synced 2025-12-11 19:00:02 +01:00
install cryptsetup_tmpfiles.conf
add --with-tmpfilesdir configuration option. Use the option either to override default systemd tmpfiles.d directory location or to specify install location for systems without systemd.
This commit is contained in:
committed by
Milan Broz
parent
3bc124d9d3
commit
9bcc97bc5e
@@ -3,6 +3,7 @@ SUBDIRS = po tests
|
|||||||
TESTS =
|
TESTS =
|
||||||
CLEANFILES =
|
CLEANFILES =
|
||||||
DISTCLEAN_TARGETS =
|
DISTCLEAN_TARGETS =
|
||||||
|
INSTALL_DATA_HOOKS =
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-include config.h \
|
-include config.h \
|
||||||
@@ -16,9 +17,12 @@ AM_CPPFLAGS = \
|
|||||||
AM_CFLAGS = -Wall
|
AM_CFLAGS = -Wall
|
||||||
AM_LDFLAGS =
|
AM_LDFLAGS =
|
||||||
|
|
||||||
|
tmpfilesddir = @DEFAULT_TMPFILESDIR@
|
||||||
|
|
||||||
noinst_LTLIBRARIES =
|
noinst_LTLIBRARIES =
|
||||||
sbin_PROGRAMS =
|
sbin_PROGRAMS =
|
||||||
man8_MANS =
|
man8_MANS =
|
||||||
|
tmpfilesd_DATA =
|
||||||
|
|
||||||
include man/Makemodule.am
|
include man/Makemodule.am
|
||||||
|
|
||||||
@@ -44,3 +48,5 @@ distclean-local:
|
|||||||
|
|
||||||
clean-local:
|
clean-local:
|
||||||
-rm -rf docs/doxygen_api_docs
|
-rm -rf docs/doxygen_api_docs
|
||||||
|
|
||||||
|
install-data-hook: $(INSTALL_DATA_HOOKS)
|
||||||
|
|||||||
12
configure.ac
12
configure.ac
@@ -425,6 +425,8 @@ if test x$enable_static_cryptsetup = xyes; then
|
|||||||
PKG_CONFIG=$saved_PKG_CONFIG
|
PKG_CONFIG=$saved_PKG_CONFIG
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no])
|
||||||
|
|
||||||
AC_SUBST([DEVMAPPER_LIBS])
|
AC_SUBST([DEVMAPPER_LIBS])
|
||||||
AC_SUBST([DEVMAPPER_STATIC_LIBS])
|
AC_SUBST([DEVMAPPER_STATIC_LIBS])
|
||||||
|
|
||||||
@@ -525,6 +527,16 @@ CS_NUM_WITH([verity-hash-block], [hash block size for verity mode], [4096])
|
|||||||
CS_NUM_WITH([verity-salt-size], [salt size for verity mode], [32])
|
CS_NUM_WITH([verity-salt-size], [salt size for verity mode], [32])
|
||||||
CS_NUM_WITH([verity-fec-roots], [parity bytes for verity FEC], [2])
|
CS_NUM_WITH([verity-fec-roots], [parity bytes for verity FEC], [2])
|
||||||
|
|
||||||
|
CS_STR_WITH([tmpfilesdir], [override default path to directory with systemd temporary files], [$systemd_tmpfilesdir])
|
||||||
|
test -z "$with_tmpfilesdir" && with_tmpfilesdir=$systemd_tmpfilesdir
|
||||||
|
test "x$with_tmpfilesdir" == "xno" || {
|
||||||
|
test "${with_tmpfilesdir:0:1}" = "/" || AC_MSG_ERROR([--with-tmpfilesdir argument must be an absolute path.])
|
||||||
|
DEFAULT_TMPFILESDIR=$with_tmpfilesdir
|
||||||
|
AC_SUBST(DEFAULT_TMPFILESDIR)
|
||||||
|
}
|
||||||
|
AM_CONDITIONAL(CRYPTSETUP_TMPFILE, test -n "$DEFAULT_TMPFILESDIR")
|
||||||
|
|
||||||
|
|
||||||
CS_STR_WITH([luks2-lock-path], [path to directory for LUKSv2 locks], [/run/lock/cryptsetup])
|
CS_STR_WITH([luks2-lock-path], [path to directory for LUKSv2 locks], [/run/lock/cryptsetup])
|
||||||
test -z "$with_luks2_lock_path" && with_luks2_lock_path=/run/lock/cryptsetup
|
test -z "$with_luks2_lock_path" && with_luks2_lock_path=/run/lock/cryptsetup
|
||||||
test "${with_luks2_lock_path:0:1}" = "/" || AC_MSG_ERROR([--with-luks2-lock-path argument must be an absolute path.])
|
test "${with_luks2_lock_path:0:1}" = "/" || AC_MSG_ERROR([--with-luks2-lock-path argument must be an absolute path.])
|
||||||
|
|||||||
@@ -1 +1,10 @@
|
|||||||
DISTCLEAN_TARGETS += cryptsetup_tmpfiles.conf
|
DISTCLEAN_TARGETS += scripts/cryptsetup_tmpfiles.conf
|
||||||
|
|
||||||
|
if CRYPTSETUP_TMPFILE
|
||||||
|
tmpfilesd_DATA += scripts/cryptsetup_tmpfiles.conf
|
||||||
|
|
||||||
|
install-data-hooks-tmpfiles:
|
||||||
|
mv $(DESTDIR)$(tmpfilesddir)/cryptsetup_tmpfiles.conf $(DESTDIR)$(tmpfilesddir)/cryptsetup.conf
|
||||||
|
|
||||||
|
INSTALL_DATA_HOOKS += install-data-hooks-tmpfiles
|
||||||
|
endif
|
||||||
|
|||||||
Reference in New Issue
Block a user