From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 23 Aug 2004 18:30:55 +0000 (+0000)
Subject: - bail on errors to avoid creating an incomplete vserver
X-Git-Tag: after-util-vserver-0_30_208-revert~275
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=baf8d1ace0dec2a77e01b5cad29c9972c2e7e779;p=util-vserver.git

- bail on errors to avoid creating an incomplete vserver
---

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 7c59e73..6e72bf5 100755
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vuseradd,v 1.1 2004/07/30 16:46:41 mlh-pl_kernel Exp $
+# $Id: vuseradd,v 1.2 2004/08/19 22:30:30 mlh-pl_kernel Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
@@ -23,6 +23,9 @@ usage()
 [ -z "$1" ] && usage
 NAME=$1
 
+# bail on errors
+set -e
+
 # add user
 useradd -s /bin/vsh $NAME
 
@@ -31,7 +34,7 @@ usermod -s /bin/vsh $NAME
 
 # automount keys (eval expands ~)
 eval rm -rf ~$NAME/.ssh
-eval ln -sf /var/pl_sshd/keys/$NAME ~$NAME/.ssh
+eval ln -nsf /var/pl_sshd/keys/$NAME ~$NAME/.ssh
 
 USERID=$(awk -F: "\$1 == \"$NAME\" { print \$3 }" < /etc/passwd)
 GROUPID=$(awk -F: "\$1 == \"$NAME\" { print \$3 }" < /etc/passwd)