Olaf Hering
2010-Jul-23 12:18 UTC
[Xen-devel] [PATCH] introduce and use new SYSCONFIG_DIR variable
On SuSE the configuration files in /etc/sysconfig/ will be updated in a smart way from templates found in /var/adm/fillup-templates/ Introduce new variable SYSCONFIG_DIR for Linux installations. Now only one place needs patching, or it can be specified as option to make(1). Signed-off-by: Olaf Hering <olaf@aepfle.de> --- config/StdGNU.mk | 3 +++ tools/hotplug/Linux/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) --- xen-unstable.hg-4.1.21811.orig/config/StdGNU.mk +++ xen-unstable.hg-4.1.21811/config/StdGNU.mk @@ -48,6 +48,9 @@ CONFIG_DIR = /etc else CONFIG_DIR = $(PREFIX)/etc endif + +SYSCONFIG_DIR = $(CONFIG_DIR)/sysconfig + XEN_CONFIG_DIR = $(CONFIG_DIR)/xen XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts --- xen-unstable.hg-4.1.21811.orig/tools/hotplug/Linux/Makefile +++ xen-unstable.hg-4.1.21811/tools/hotplug/Linux/Makefile @@ -65,12 +65,12 @@ install: all install-initd install-scrip .PHONY: install-initd install-initd: [ -d $(DESTDIR)$(CONFIG_DIR)/init.d ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/init.d - [ -d $(DESTDIR)$(CONFIG_DIR)/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/sysconfig + [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d - $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xendomains + $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains $(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d - $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xencommons + $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xencommons $(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(CONFIG_DIR)/init.d .PHONY: install-scripts _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2010-Jul-23 14:37 UTC
Re: [Xen-devel] [PATCH] introduce and use new SYSCONFIG_DIR variable
On 23/07/2010 13:18, "Olaf Hering" <olaf@aepfle.de> wrote:> > On SuSE the configuration files in /etc/sysconfig/ will be updated in a smart > way > from templates found in /var/adm/fillup-templates/ > Introduce new variable SYSCONFIG_DIR for Linux installations. > Now only one place needs patching, or it can be specified as option to > make(1).Thanks. All of your patches can go to xen-unstable-tools.hg first, via Stefano or Ian, including this one which has that one-line change outside the tools/ directory. -- Keir> Signed-off-by: Olaf Hering <olaf@aepfle.de> > > --- > config/StdGNU.mk | 3 +++ > tools/hotplug/Linux/Makefile | 6 +++--- > 2 files changed, 6 insertions(+), 3 deletions(-) > > --- xen-unstable.hg-4.1.21811.orig/config/StdGNU.mk > +++ xen-unstable.hg-4.1.21811/config/StdGNU.mk > @@ -48,6 +48,9 @@ CONFIG_DIR = /etc > else > CONFIG_DIR = $(PREFIX)/etc > endif > + > +SYSCONFIG_DIR = $(CONFIG_DIR)/sysconfig > + > XEN_CONFIG_DIR = $(CONFIG_DIR)/xen > XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts > > --- xen-unstable.hg-4.1.21811.orig/tools/hotplug/Linux/Makefile > +++ xen-unstable.hg-4.1.21811/tools/hotplug/Linux/Makefile > @@ -65,12 +65,12 @@ install: all install-initd install-scrip > .PHONY: install-initd > install-initd: > [ -d $(DESTDIR)$(CONFIG_DIR)/init.d ] || $(INSTALL_DIR) > $(DESTDIR)$(CONFIG_DIR)/init.d > - [ -d $(DESTDIR)$(CONFIG_DIR)/sysconfig ] || $(INSTALL_DIR) > $(DESTDIR)$(CONFIG_DIR)/sysconfig > + [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) > $(DESTDIR)$(SYSCONFIG_DIR) > $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d > $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d > - $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) > $(DESTDIR)$(CONFIG_DIR)/sysconfig/xendomains > + $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) > $(DESTDIR)$(SYSCONFIG_DIR)/xendomains > $(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d > - $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) > $(DESTDIR)$(CONFIG_DIR)/sysconfig/xencommons > + $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) > $(DESTDIR)$(SYSCONFIG_DIR)/xencommons > $(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(CONFIG_DIR)/init.d > > .PHONY: install-scripts > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2010-Jul-23 16:49 UTC
Re: [Xen-devel] [PATCH] introduce and use new SYSCONFIG_DIR variable
Olaf Hering writes ("[Xen-devel] [PATCH] introduce and use new
SYSCONFIG_DIR variable"):> On SuSE the configuration files in /etc/sysconfig/ will be updated
> in a smart way from templates found in /var/adm/fillup-templates/
> Introduce new variable SYSCONFIG_DIR for Linux installations. Now
> only one place needs patching, or it can be specified as option to
> make(1).
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
Great. This will also make it easier for folks using Debian
derivatives, which use /etc/default rather than /etc/sysconfig.
I will apply your patch.
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel