shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Add configure --with-tmpfilesdir and lvm2 tmpfiles.d configuration file itself.

Browse Source 
/etc/tmpfiles.d directory holds configuration files for temporary/volatile
files and directories that should be automatically managed. For example,
if we have some parts of the fs hierarchy on tmpfs, we'd like to recreate
some files or directories on every boot so they're always prepared for use.

Systemd can read such configuration files. For now, the lock and run directory
are the ones that are most probably placed on tmpfs. If this is the case, we
can install the configuration by 'make install_tmpfiles_configuration'.
This commit is contained in:
Peter Rajnoha 2012-02-22 17:55:10 +00:00
parent e8eb64c878
commit 4417a8bd40
6 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@ -97,6 +97,9 @@ install_initscripts:
install_systemd_units: install_systemd_units:
$(MAKE) -C scripts install_systemd_units $(MAKE) -C scripts install_systemd_units
install_tmpfiles_configuration:
$(MAKE) -C scripts install_tmpfiles_configuration
LCOV_TRACES = libdm.info lib.info tools.info \ LCOV_TRACES = libdm.info lib.info tools.info \
daemons/dmeventd.info daemons/clvmd.info daemons/dmeventd.info daemons/clvmd.info
CLEAN_TARGETS += $(LCOV_TRACES) CLEAN_TARGETS += $(LCOV_TRACES)

2
WHATS_NEW
View File

@ -1,5 +1,7 @@
Version 2.02.93 - Version 2.02.93 -
==================================== ====================================
Add tmpfiles.d style configuration for lvm2 lock and run directory.
Add configure --with-tmpfilesdir for dir holding volatile-file configuration.
Allow 'lvconvert --repair' to operate on RAID 4/5/6 Allow 'lvconvert --repair' to operate on RAID 4/5/6
Fix 'build_parallel_areas_from_lv' to work properly with RAID 4/5/6 Fix 'build_parallel_areas_from_lv' to work properly with RAID 4/5/6

18
configure vendored
View File

@ -596,6 +596,7 @@ ac_default_prefix=/usr
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
usrsbindir usrsbindir
usrlibdir usrlibdir
tmpfilesdir
systemdsystemunitdir systemdsystemunitdir
udevdir udevdir
udev_prefix udev_prefix
@ -844,6 +845,7 @@ with_usrsbindir
with_udev_prefix with_udev_prefix
with_udevdir with_udevdir
with_systemdsystemunitdir with_systemdsystemunitdir
with_tmpfilesdir
with_dmeventd_pidfile with_dmeventd_pidfile
with_dmeventd_path with_dmeventd_path
with_default_run_dir with_default_run_dir
@ -1589,6 +1591,9 @@ Optional Packages:
--with-udevdir=DIR udev rules in DIR [[UPREFIX/lib/udev/rules.d]] --with-udevdir=DIR udev rules in DIR [[UPREFIX/lib/udev/rules.d]]
--with-systemdsystemunitdir=DIR --with-systemdsystemunitdir=DIR
systemd service files in DIR systemd service files in DIR
--with-tmpfilesdir=DIR install configuration files for management of
volatile files and directories in DIR
[[SYSCONFDIR/tmpfiles.d]]
--with-dmeventd-pidfile=PATH --with-dmeventd-pidfile=PATH
dmeventd pidfile [[/var/run/dmeventd.pid]] dmeventd pidfile [[/var/run/dmeventd.pid]]
--with-dmeventd-path=PATH --with-dmeventd-path=PATH
@ -9763,6 +9768,15 @@ fi
if test -z "$systemdsystemunitdir"; then if test -z "$systemdsystemunitdir"; then
systemdsystemunitdir='/lib/systemd/system'; systemdsystemunitdir='/lib/systemd/system';
fi fi
################################################################################
# Check whether --with-tmpfilesdir was given.
if test "${with_tmpfilesdir+set}" = set; then :
withval=$with_tmpfilesdir; tmpfilesdir=$withval
else
tmpfilesdir='${sysconfdir}/tmpfiles.d'
fi
################################################################################ ################################################################################
if test x$READLINE = xyes; then if test x$READLINE = xyes; then
for ac_header in readline/readline.h readline/history.h for ac_header in readline/readline.h readline/history.h
@ -10408,10 +10422,11 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
################################################################################ ################################################################################
ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/common/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile doc/Makefile doc/example.conf include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/lvm2_monitoring_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/lvm2_monitoring_systemd_red_hat.service scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/common/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile doc/Makefile doc/example.conf include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/lvm2_monitoring_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
@ -11140,6 +11155,7 @@ do
"scripts/lvm2_monitoring_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_monitoring_init_red_hat" ;; "scripts/lvm2_monitoring_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_monitoring_init_red_hat" ;;
"scripts/dm_event_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/dm_event_systemd_red_hat.service" ;; "scripts/dm_event_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/dm_event_systemd_red_hat.service" ;;
"scripts/lvm2_monitoring_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_monitoring_systemd_red_hat.service" ;; "scripts/lvm2_monitoring_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_monitoring_systemd_red_hat.service" ;;
"scripts/lvm2_tmpfiles_red_hat.conf") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_tmpfiles_red_hat.conf" ;;
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"test/api/Makefile") CONFIG_FILES="$CONFIG_FILES test/api/Makefile" ;; "test/api/Makefile") CONFIG_FILES="$CONFIG_FILES test/api/Makefile" ;;

7
configure.in
View File

@ -1209,6 +1209,11 @@ if test -z "$systemdsystemunitdir"; then
systemdsystemunitdir='/lib/systemd/system'; systemdsystemunitdir='/lib/systemd/system';
fi fi
################################################################################ ################################################################################
AC_ARG_WITH(tmpfilesdir,
AC_HELP_STRING([--with-tmpfilesdir=DIR],
[install configuration files for management of volatile files and directories in DIR [[SYSCONFDIR/tmpfiles.d]]]),
tmpfilesdir=$withval, tmpfilesdir='${sysconfdir}/tmpfiles.d')
################################################################################
dnl -- Ensure additional headers required dnl -- Ensure additional headers required
if test x$READLINE = xyes; then if test x$READLINE = xyes; then
AC_CHECK_HEADERS(readline/readline.h readline/history.h,,AC_MSG_ERROR(bailing out)) AC_CHECK_HEADERS(readline/readline.h readline/history.h,,AC_MSG_ERROR(bailing out))
@ -1478,6 +1483,7 @@ AC_SUBST(tmpdir)
AC_SUBST(udev_prefix) AC_SUBST(udev_prefix)
AC_SUBST(udevdir) AC_SUBST(udevdir)
AC_SUBST(systemdsystemunitdir) AC_SUBST(systemdsystemunitdir)
AC_SUBST(tmpfilesdir)
AC_SUBST(usrlibdir) AC_SUBST(usrlibdir)
AC_SUBST(usrsbindir) AC_SUBST(usrsbindir)
@ -1525,6 +1531,7 @@ scripts/cmirrord_init_red_hat
scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_init_red_hat
scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.service
scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_monitoring_systemd_red_hat.service
scripts/lvm2_tmpfiles_red_hat.conf
scripts/Makefile scripts/Makefile
test/Makefile test/Makefile
test/api/Makefile test/api/Makefile

4
make.tmpl.in
View File

@ -51,6 +51,7 @@ TESTING = @TESTING@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
udev_prefix = @udev_prefix@ udev_prefix = @udev_prefix@
sysconfdir = @sysconfdir@
bindir = $(DESTDIR)@bindir@ bindir = $(DESTDIR)@bindir@
confdir = $(DESTDIR)@CONFDIR@/lvm confdir = $(DESTDIR)@CONFDIR@/lvm
includedir = $(DESTDIR)@includedir@ includedir = $(DESTDIR)@includedir@
@ -65,8 +66,9 @@ localedir = $(DESTDIR)@LOCALEDIR@
staticdir = $(DESTDIR)@STATICDIR@ staticdir = $(DESTDIR)@STATICDIR@
udevdir = $(DESTDIR)@udevdir@ udevdir = $(DESTDIR)@udevdir@
pkgconfigdir = $(usrlibdir)/pkgconfig pkgconfigdir = $(usrlibdir)/pkgconfig
initdir = $(DESTDIR)@sysconfdir@/rc.d/init.d initdir = $(DESTDIR)$(sysconfdir)/rc.d/init.d
systemd_dir = $(DESTDIR)@systemdsystemunitdir@ systemd_dir = $(DESTDIR)@systemdsystemunitdir@
tmpfiles_dir = $(DESTDIR)@tmpfilesdir@
ocf_scriptdir = $(DESTDIR)@OCFDIR@ ocf_scriptdir = $(DESTDIR)@OCFDIR@
USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \ USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \

4
scripts/Makefile.in
View File

@ -60,5 +60,9 @@ install_systemd_units:
$(INSTALL_DATA) dm_event_systemd_red_hat.service $(systemd_dir)/dm-event.service $(INSTALL_DATA) dm_event_systemd_red_hat.service $(systemd_dir)/dm-event.service
$(INSTALL_DATA) lvm2_monitoring_systemd_red_hat.service $(systemd_dir)/lvm2-monitor.service $(INSTALL_DATA) lvm2_monitoring_systemd_red_hat.service $(systemd_dir)/lvm2-monitor.service
install_tmpfiles_configuration:
$(INSTALL_DIR) $(tmpfiles_dir)
$(INSTALL_DATA) lvm2_tmpfiles_red_hat.conf $(tmpfiles_dir)/lvm2.conf
DISTCLEAN_TARGETS += clvmd_init_red_hat cmirrord_init_red_hat lvm2_monitoring_init_red_hat \ DISTCLEAN_TARGETS += clvmd_init_red_hat cmirrord_init_red_hat lvm2_monitoring_init_red_hat \
dm_event_systemd_red_hat.service lvm2_monitoring_systemd_red_hat.service dm_event_systemd_red_hat.service lvm2_monitoring_systemd_red_hat.service