Skip to contentSkip to conversation

introduce and use new SYSCONFIG_DIR variable

PATCH In review Olaf Hering 3 participants 3 messages Jul 23, 2010

lore
Share & tools
lore

Olaf Hering

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 config/StdGNU.mk             |    3 +++
 tools/hotplug/Linux/Makefile |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
config/StdGNU.mk +3 -0
@@ -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
tools/hotplug/Linux/Makefile +3 -3
@@ -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
#1 lore raw
Quoted 7 lines · Olaf Hering

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

Quoted 49 lines
Signed-off-by Olaf Hering <[email protected]>
---
 config/StdGNU.mk             |    3 +++
 tools/hotplug/Linux/Makefile |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
config/StdGNU.mk +3 -0
@@ -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
tools/hotplug/Linux/Makefile +0 -0
@@ -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
[email protected]
http://lists.xensource.com/xen-devel

#2 lore raw
In reply to Olaf Hering

Olaf Hering writes ("[Xen-devel] [PATCH] introduce and use new SYSCONFIG_DIR variable"):

Quoted 7 lines

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 <[email protected]>

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.