merge changes from head

[myplc.git] / plc.d / bootmanager

diff --git a/plc.d/bootmanager b/plc.d/bootmanager
index e93cffa..8e62650 100755 (executable)
--- a/plc.d/bootmanager
+++ b/plc.d/bootmanager
@@ -7,17 +7,21 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: guest.init,v 1.12 2006/04/04 22:09:47 mlhuang Exp $
+# $Id: bootmanager,v 1.4 2007/02/07 18:45:36 mlhuang Exp $
 #
 
 # Source function library and configuration
 . /etc/plc.d/functions
+. /etc/planetlab/plc_config
+
+# Be verbose
+set -x
 
 case "$1" in
     start)
        if [ "$PLC_BOOT_ENABLED" != "1" -a \
             "$PLC_WWW_ENABLED" != "1" ] ; then
-           return 0
+           exit 0
        fi
 
        MESSAGE=$"Rebuilding Boot Manager"