Commit cf1d6461 authored by Milan Broz's avatar Milan Broz

Do not rename tmpfile config but use it directly.

parent 9bcc97bc
...@@ -3,7 +3,6 @@ SUBDIRS = po tests ...@@ -3,7 +3,6 @@ SUBDIRS = po tests
TESTS = TESTS =
CLEANFILES = CLEANFILES =
DISTCLEAN_TARGETS = DISTCLEAN_TARGETS =
INSTALL_DATA_HOOKS =
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-include config.h \ -include config.h \
...@@ -40,7 +39,7 @@ ACLOCAL_AMFLAGS = -I m4 ...@@ -40,7 +39,7 @@ ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = \ DISTCHECK_CONFIGURE_FLAGS = \
--enable-python \ --enable-python \
--enable-cryptsetup-reencrypt --with-tmpfilesdir=$$dc_install_base/$(systemd_tmpfilesdir)
distclean-local: distclean-local:
-find . -name \*~ -o -name \*.orig -o -name \*.rej | xargs rm -f -find . -name \*~ -o -name \*.orig -o -name \*.rej | xargs rm -f
...@@ -48,5 +47,3 @@ distclean-local: ...@@ -48,5 +47,3 @@ distclean-local:
clean-local: clean-local:
-rm -rf docs/doxygen_api_docs -rm -rf docs/doxygen_api_docs
install-data-hook: $(INSTALL_DATA_HOOKS)
...@@ -425,7 +425,9 @@ if test x$enable_static_cryptsetup = xyes; then ...@@ -425,7 +425,9 @@ if test x$enable_static_cryptsetup = xyes; then
PKG_CONFIG=$saved_PKG_CONFIG PKG_CONFIG=$saved_PKG_CONFIG
fi fi
AC_MSG_CHECKING([for systemd tmpfiles config directory])
PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no]) PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no])
AC_MSG_RESULT([$systemd_tmpfilesdir])
AC_SUBST([DEVMAPPER_LIBS]) AC_SUBST([DEVMAPPER_LIBS])
AC_SUBST([DEVMAPPER_STATIC_LIBS]) AC_SUBST([DEVMAPPER_STATIC_LIBS])
...@@ -527,7 +529,7 @@ CS_NUM_WITH([verity-hash-block], [hash block size for verity mode], [4096]) ...@@ -527,7 +529,7 @@ 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]) CS_STR_WITH([tmpfilesdir], [override default path to directory with systemd temporary files], [])
test -z "$with_tmpfilesdir" && with_tmpfilesdir=$systemd_tmpfilesdir test -z "$with_tmpfilesdir" && with_tmpfilesdir=$systemd_tmpfilesdir
test "x$with_tmpfilesdir" == "xno" || { test "x$with_tmpfilesdir" == "xno" || {
test "${with_tmpfilesdir:0:1}" = "/" || AC_MSG_ERROR([--with-tmpfilesdir argument must be an absolute path.]) test "${with_tmpfilesdir:0:1}" = "/" || AC_MSG_ERROR([--with-tmpfilesdir argument must be an absolute path.])
...@@ -553,7 +555,7 @@ dnl ========================================================================== ...@@ -553,7 +555,7 @@ dnl ==========================================================================
AC_CONFIG_FILES([ Makefile AC_CONFIG_FILES([ Makefile
lib/libcryptsetup.pc lib/libcryptsetup.pc
po/Makefile.in po/Makefile.in
scripts/cryptsetup_tmpfiles.conf scripts/cryptsetup.conf
tests/Makefile tests/Makefile
]) ])
AC_OUTPUT AC_OUTPUT
...@@ -38,6 +38,9 @@ Changes since version 2.0.0-RC0 ...@@ -38,6 +38,9 @@ Changes since version 2.0.0-RC0
- New --disable-cryptsetup option to disable build of cryptsetup tool. - New --disable-cryptsetup option to disable build of cryptsetup tool.
- Enable build of cryptsetup-reencrypt by default. - Enable build of cryptsetup-reencrypt by default.
* Install tmpfile.d configuration for locking directory.
You can overwrite this using --with-tmpfilesdir configure option.
* Adds limited support for offline reencryption of LUKS2 format. * Adds limited support for offline reencryption of LUKS2 format.
* Decrease size of testing images (and the whole release archive). * Decrease size of testing images (and the whole release archive).
...@@ -154,7 +157,7 @@ and for block device by using a specific lock file in /run/lock/cryptsetup. ...@@ -154,7 +157,7 @@ and for block device by using a specific lock file in /run/lock/cryptsetup.
This directory must be created by distribution (do not rely on internal This directory must be created by distribution (do not rely on internal
fallback). For systemd-based distribution, you can simply install fallback). For systemd-based distribution, you can simply install
scripts/cryptsetup_tmpfiles.conf into tmpfiles.d directory. scripts/cryptsetup.conf into tmpfiles.d directory.
For more details see LUKS2-format.txt and LUKS2-locking.txt in the docs For more details see LUKS2-format.txt and LUKS2-locking.txt in the docs
directory. (Please note this is just overview, there will be more formal directory. (Please note this is just overview, there will be more formal
......
DISTCLEAN_TARGETS += scripts/cryptsetup_tmpfiles.conf DISTCLEAN_TARGETS += scripts/cryptsetup.conf
if CRYPTSETUP_TMPFILE if CRYPTSETUP_TMPFILE
tmpfilesd_DATA += scripts/cryptsetup_tmpfiles.conf tmpfilesd_DATA += scripts/cryptsetup.conf
install-data-hooks-tmpfiles:
mv $(DESTDIR)$(tmpfilesddir)/cryptsetup_tmpfiles.conf $(DESTDIR)$(tmpfilesddir)/cryptsetup.conf
INSTALL_DATA_HOOKS += install-data-hooks-tmpfiles
endif endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment