master - make: autoconfisms for generate

master - make: autoconfisms for generate

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=33429ea0833c958f2f548c231b301243e06e81bd
Commit:        33429ea0833c958f2f548c231b301243e06e81bd
Parent:        808f88f9f0db2f744c0f2517fa4aa4f7b9c138ec
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Wed Apr 22 10:05:02 2015 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Wed Apr 22 10:05:02 2015 -0500

make: autoconfisms for generate

---
 conf/Makefile.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/Makefile.in b/conf/Makefile.in
index 5e8a0b5..ee78f6a 100644
--- a/conf/Makefile.in
+++ b/conf/Makefile.in
@@ -29,10 +29,10 @@ include $(top_builddir)/make.tmpl
 generate:
 	LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withfullcomments --ignorelocal > example.conf.gen
 	cat example.conf.base example.conf.gen > example.conf.in
-	rm example.conf.gen
+	$(RM) example.conf.gen
 	LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withfullcomments local > lvmlocal.conf.gen
 	cat lvmlocal.conf.base lvmlocal.conf.gen > lvmlocal.conf.in
-	rm lvmlocal.conf.gen
+	$(RM) lvmlocal.conf.gen
 
 install_conf: $(CONFSRC)
 	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
@@ -54,4 +54,4 @@ install_lvm2: install_conf install_localconf install_profiles
 
 install: install_lvm2
 
-DISTCLEAN_TARGETS += $(CONFSRC) $(CONFLOCAL) $(PROFILE_TEMPLATES)
+DISTCLEAN_TARGETS += $(CONFSRC) $(CONFLOCAL) $(PROFILE_TEMPLATES) $(CONFSRC).gen $(CONFLOCAL).gen

master - make: autoconfisms for generate

[Zdenek Kabelac]

Dne 22.4.2015 v 17:06 David Teigland napsal(a):
> Gitweb:        http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=33429ea0833c958f2f548c231b301243e06e81bd
> Commit:        33429ea0833c958f2f548c231b301243e06e81bd
> Parent:        808f88f9f0db2f744c0f2517fa4aa4f7b9c138ec
> Author:        David Teigland <teigland@redhat.com>
> AuthorDate:    Wed Apr 22 10:05:02 2015 -0500
> Committer:     David Teigland <teigland@redhat.com>
> CommitterDate: Wed Apr 22 10:05:02 2015 -0500
>
> make: autoconfisms for generate
>
> ---
>   conf/Makefile.in |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/conf/Makefile.in b/conf/Makefile.in
> index 5e8a0b5..ee78f6a 100644
> --- a/conf/Makefile.in
> +++ b/conf/Makefile.in
> @@ -29,10 +29,10 @@ include $(top_builddir)/make.tmpl
>   generate:
>   	LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withfullcomments --ignorelocal > example.conf.gen
>   	cat example.conf.base example.conf.gen > example.conf.in
> -	rm example.conf.gen
> +	$(RM) example.conf.gen
>   	LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withfullcomments local > lvmlocal.conf.gen
>   	cat lvmlocal.conf.base lvmlocal.conf.gen > lvmlocal.conf.in
> -	rm lvmlocal.conf.gen
> +	$(RM) lvmlocal.conf.gen
>
>   install_conf: $(CONFSRC)
>   	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
> @@ -54,4 +54,4 @@ install_lvm2: install_conf install_localconf install_profiles
>
>   install: install_lvm2
>
> -DISTCLEAN_TARGETS += $(CONFSRC) $(CONFLOCAL) $(PROFILE_TEMPLATES)
> +DISTCLEAN_TARGETS += $(CONFSRC) $(CONFLOCAL) $(PROFILE_TEMPLATES) $(CONFSRC).gen $(CONFLOCAL).gen

Hi


So this made some option behave differently then they used to.
(And lvm2 will reject them as error now).

Example:

Used-to-be correct conf line:

thin_check_options = [ "-q", "--clear-needs-check-flag"]

Now being installed as:

thin_check_options="-q --clear-needs-check-flag"

This is not expected (and rejected as error) -  each arg needs to be separate.


Also:

thin_disabled_features=[]

This 'empty' set is rejected as:
Ignoring invalid string in config file global/thin_disabled_features.

It's just what I've quickly noticed - haven't closely checked others...

Zdenek