From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 10 Apr 2006 18:18:14 +0000 (+0000)
Subject: - Regenerate the main configuration file from default values overlaid
X-Git-Tag: myplc-0_4-rc1~80
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a993e98738ba653b7d2bdbf0772d8f237c17f4b0;p=myplc.git

- Regenerate the main configuration file from default values overlaid
  with site-specific values. If there are no site-specific values for
  the DB and maint passwords, this has the side effect of regenerating
  them on every restart, but that's probably a good thing.
---

diff --git a/guest.init b/guest.init
index 48f21ba..6c061a7 100755
--- a/guest.init
+++ b/guest.init
@@ -6,7 +6,7 @@
 #
 # description:	Manages all PLC services on this machine
 #
-# $Id: guest.init,v 1.12 2006/04/04 22:09:47 mlhuang Exp $
+# $Id: guest.init,v 1.13 2006/04/06 21:51:59 mlhuang Exp $
 #
 
 # Source function library and configuration
@@ -33,7 +33,14 @@ nsteps=${#steps[@]}
 # Regenerate configuration files
 reload ()
 {
-    # Load configuration
+    # Regenerate the main configuration file from default values
+    # overlaid with site-specific values.
+    plc-config --xml \
+	/etc/planetlab/default_config.xml \
+	/etc/planetlab/configs/* \
+	>/etc/planetlab/plc_config.xml
+
+    # Shell constants
     plc-config --shell >/etc/planetlab/plc_config
     . /etc/planetlab/plc_config