* [PATCH] introduce and use new SYSCONFIG_DIR variable
@ 2010-07-23 12:18 Olaf Hering
2010-07-23 14:37 ` Keir Fraser
2010-07-23 16:49 ` Ian Jackson
0 siblings, 2 replies; 3+ messages in thread
From: Olaf Hering @ 2010-07-23 12:18 UTC (permalink / raw)
To: xen-devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] introduce and use new SYSCONFIG_DIR variable
2010-07-23 12:18 [PATCH] introduce and use new SYSCONFIG_DIR variable Olaf Hering
@ 2010-07-23 14:37 ` Keir Fraser
2010-07-23 16:49 ` Ian Jackson
1 sibling, 0 replies; 3+ messages in thread
From: Keir Fraser @ 2010-07-23 14:37 UTC (permalink / raw)
To: Olaf Hering, xen-devel; +Cc: Ian Jackson, Stefano Stabellini
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] introduce and use new SYSCONFIG_DIR variable
2010-07-23 12:18 [PATCH] introduce and use new SYSCONFIG_DIR variable Olaf Hering
2010-07-23 14:37 ` Keir Fraser
@ 2010-07-23 16:49 ` Ian Jackson
1 sibling, 0 replies; 3+ messages in thread
From: Ian Jackson @ 2010-07-23 16:49 UTC (permalink / raw)
To: Olaf Hering; +Cc: xen-devel
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-23 16:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-23 12:18 [PATCH] introduce and use new SYSCONFIG_DIR variable Olaf Hering
2010-07-23 14:37 ` Keir Fraser
2010-07-23 16:49 ` Ian Jackson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.