From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 26 Aug 2004 16:51:11 +0000 (+0000)
Subject: - set ONBOOT to yes
X-Git-Tag: after-util-vserver-0_30_208-revert~266
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=163a9a91bb1621ca91d5ad38c6a442e656de3187;p=util-vserver.git

- set ONBOOT to yes
- fix regexps so that S_CONTEXT and ONBOOT are always reset to their
  correct values
---

diff --git a/scripts/vuseradd b/scripts/vuseradd
index e460256..46abf8f 100755
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vuseradd,v 1.3 2004/08/23 18:30:55 mlh-pl_kernel Exp $
+# $Id: vuseradd,v 1.4 2004/08/25 14:55:21 mlh-pl_kernel Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
@@ -38,7 +38,9 @@ GROUPID=$(awk -F: "\$1 == \"$NAME\" { print \$3 }" < /etc/passwd)
 
 # create vserver configuration file
 if [ ! -f /etc/vservers/$NAME.conf ] ; then
-    sed -e "s/#S_CONTEXT=/S_CONTEXT=$USERID/" \
+    sed \
+	-e "s/.*S_CONTEXT=.*/S_CONTEXT=$USERID/" \
+	-e "s/.*ONBOOT=.*/ONBOOT=yes/" \
 	< /etc/vservers/vserver-reference.conf \
 	> /etc/vservers/$NAME.conf
 fi