[Open-FCoE] [PATCH] Move configuration files from usr/etc/initd to usr/etc/

Robert Love robert.w.love at intel.com
Thu Jan 22 20:59:53 UTC 2009


Also, added a '/' between "yes/no" for the comment block describing an example.

Depends on: [Open-FCoE] [PATCH] open-fcoe: Initial code for fcoemon and Open-FCoE service   script

Signed-off-by: Robert Love <robert.w.love at intel.com>
---

 usr/etc/cfg-ethx           |    9 +++++++++
 usr/etc/config             |   10 ++++++++++
 usr/etc/initd/cfg-ethx     |    9 ---------
 usr/etc/initd/config       |   10 ----------
 usr/tools/fcoemon/Makefile |    9 ++++++---
 5 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 usr/etc/cfg-ethx
 create mode 100644 usr/etc/config
 delete mode 100644 usr/etc/initd/cfg-ethx
 delete mode 100644 usr/etc/initd/config

diff --git a/usr/etc/cfg-ethx b/usr/etc/cfg-ethx
new file mode 100644
index 0000000..a9140f9
--- /dev/null
+++ b/usr/etc/cfg-ethx
@@ -0,0 +1,9 @@
+## Type:       yes/no
+## Default:    no
+# Enable/Disable FCoE service at the Ethernet port
+FCOE_ENABLE="no"
+
+## Type:       yes/no
+## Default:    yes
+# Indicate if DCB service is required at the Ethernet port
+DCB_REQUIRED="yes"
diff --git a/usr/etc/config b/usr/etc/config
new file mode 100644
index 0000000..3c4360a
--- /dev/null
+++ b/usr/etc/config
@@ -0,0 +1,10 @@
+## Type:       yesno
+## Default:    yes
+# Switch on/off debug messages (script & C code)
+DEBUG="yes"
+
+## Type:       yesno
+## Default:    yes
+# All the messages go to syslog and stderr (script & C code)
+USE_SYSLOG="yes"
+
diff --git a/usr/etc/initd/cfg-ethx b/usr/etc/initd/cfg-ethx
deleted file mode 100644
index 1899a98..0000000
--- a/usr/etc/initd/cfg-ethx
+++ /dev/null
@@ -1,9 +0,0 @@
-## Type:       yesno
-## Default:    no
-# Enable/Disable FCoE service at the Ethernet port
-FCOE_ENABLE="no"
-
-## Type:       yesno
-## Default:    yes
-# Indicate if DCB service is required at the Ethernet port
-DCB_REQUIRED="yes"
diff --git a/usr/etc/initd/config b/usr/etc/initd/config
deleted file mode 100644
index 3c4360a..0000000
--- a/usr/etc/initd/config
+++ /dev/null
@@ -1,10 +0,0 @@
-## Type:       yesno
-## Default:    yes
-# Switch on/off debug messages (script & C code)
-DEBUG="yes"
-
-## Type:       yesno
-## Default:    yes
-# All the messages go to syslog and stderr (script & C code)
-USE_SYSLOG="yes"
-
diff --git a/usr/tools/fcoemon/Makefile b/usr/tools/fcoemon/Makefile
index e689490..639f18e 100644
--- a/usr/tools/fcoemon/Makefile
+++ b/usr/tools/fcoemon/Makefile
@@ -16,8 +16,11 @@ SERVICE_NAME=fcoe
 SERVICE_DIR=$(DESTDIR)/etc/init.d
 CONFIG_DIR=$(DESTDIR)/etc/$(SERVICE_NAME)
 
+# Source directory of /etc/ files
+ETC_SRC=../../etc/
+
 # Source directory of init.d
-INITD_SRC=../../etc/initd
+INITD_SRC=$(ETC_SRC)initd/
 
 #
 # List of legal build component names
@@ -91,7 +94,7 @@ install: all install_config install_doc
 install_config:
 	@$(INSTALL) -d $(CONFIG_DIR)
 	@if [ ! -f $(CONFIG_DIR)/config ]; then \
-		$(INSTALL) -v -m 644 $(INITD_SRC)/config \
+		$(INSTALL) -v -m 644 $(ETC_SRC)/config \
 			$(CONFIG_DIR)/config ; \
 	fi ;
 	@$(INSTALL) -d $(CONFIG_DIR)/scripts
@@ -99,7 +102,7 @@ install_config:
 		$(CONFIG_DIR)/scripts/fcoeplumb
 	@$(foreach i, $(IFNAMES), \
 		if [ ! -f $(CONFIG_DIR)/cfg-$(i) ]; then \
-			$(INSTALL) -v -m 744 $(INITD_SRC)/cfg-ethx \
+			$(INSTALL) -v -m 744 $(ETC_SRC)/cfg-ethx \
 				$(CONFIG_DIR)/cfg-$(i) ; \
 		fi ; \
 	)




More information about the devel mailing list