From fe423ef583a48ca0f780156ec5f1fe33716318ad Mon Sep 17 00:00:00 2001 From: Alasdair G Kergon Date: Sat, 5 Aug 2017 16:18:36 +0100 Subject: lvmconfig: Add options to produce file preamble Use --withgeneralpreamble and --withlocalpreamble instead of concatenating files. --- conf/Makefile.in | 4 ++-- conf/example.conf.base | 23 ----------------------- conf/lvmlocal.conf.base | 19 ------------------- 3 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 conf/example.conf.base delete mode 100644 conf/lvmlocal.conf.base (limited to 'conf') diff --git a/conf/Makefile.in b/conf/Makefile.in index c8fee3ea3..5330c07fc 100644 --- a/conf/Makefile.in +++ b/conf/Makefile.in @@ -32,8 +32,8 @@ include $(top_builddir)/make.tmpl .PHONY: install_conf install_localconf install_profiles generate: - (cat $(top_srcdir)/conf/example.conf.base && LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withcomments --ignorelocal --withspaces) > example.conf.in - (cat $(top_srcdir)/conf/lvmlocal.conf.base && LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withcomments --withspaces local) > lvmlocal.conf.in + LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withgeneralpreamble --withcomments --ignorelocal --withspaces > example.conf.in + LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withlocalpreamble --withcomments --withspaces local > lvmlocal.conf.in install_conf: $(CONFSRC) @if [ ! -e $(confdir)/$(CONFDEST) ]; then \ diff --git a/conf/example.conf.base b/conf/example.conf.base deleted file mode 100644 index 5c498998f..000000000 --- a/conf/example.conf.base +++ /dev/null @@ -1,23 +0,0 @@ -# This is an example configuration file for the LVM2 system. -# It contains the default settings that would be used if there was no -# @DEFAULT_SYS_DIR@/lvm.conf file. -# -# Refer to 'man lvm.conf' for further information including the file layout. -# -# Refer to 'man lvm.conf' for information about how settings configured in -# this file are combined with built-in values and command line options to -# arrive at the final values used by LVM. -# -# Refer to 'man lvmconfig' for information about displaying the built-in -# and configured values used by LVM. -# -# If a default value is set in this file (not commented out), then a -# new version of LVM using this file will continue using that value, -# even if the new version of LVM changes the built-in default value. -# -# To put this file in a different directory and override @DEFAULT_SYS_DIR@ set -# the environment variable LVM_SYSTEM_DIR before running the tools. -# -# N.B. Take care that each setting only appears once if uncommenting -# example settings in this file. - diff --git a/conf/lvmlocal.conf.base b/conf/lvmlocal.conf.base deleted file mode 100644 index e2a9e2fe5..000000000 --- a/conf/lvmlocal.conf.base +++ /dev/null @@ -1,19 +0,0 @@ -# This is a local configuration file template for the LVM2 system -# which should be installed as @DEFAULT_SYS_DIR@/lvmlocal.conf . -# -# Refer to 'man lvm.conf' for information about the file layout. -# -# To put this file in a different directory and override -# @DEFAULT_SYS_DIR@ set the environment variable LVM_SYSTEM_DIR before -# running the tools. -# -# The lvmlocal.conf file is normally expected to contain only the -# "local" section which contains settings that should not be shared or -# repeated among different hosts. (But if other sections are present, -# they *will* get processed. Settings in this file override equivalent -# ones in lvm.conf and are in turn overridden by ones in any enabled -# lvm_.conf files.) -# -# Please take care that each setting only appears once if uncommenting -# example settings in this file and never copy this file between hosts. - -- cgit v1.2.1