summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRick Balocca <rbalocca@vyatta.com>2008-11-11 16:17:31 -0800
committerRick Balocca <rbalocca@vyatta.com>2008-11-11 16:17:31 -0800
commit336ac34391efd20648ef710b953fa94d0551f299 (patch)
tree7e8eca96adf3ffd183e901103989316642b3adba /scripts
parent2944ef32dc0bc7113e0e516f154e4bdd527895d2 (diff)
parent91de1b9fc321f4488c32aab6ba350272289508e7 (diff)
downloadvyatta-cfg-quagga-336ac34391efd20648ef710b953fa94d0551f299.tar.gz
vyatta-cfg-quagga-336ac34391efd20648ef710b953fa94d0551f299.zip
Merge branch 'islavista' into jenner
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/install-system9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/install-system b/scripts/install-system
index 1f507fe9..bb1c4385 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -24,7 +24,12 @@
#
# Vyatta system installer script.
#
-#
+
+if [ `whoami` != 'root' ] ; then
+ echo "This script must be run with root privileges."
+ exit 1
+fi
+
# If you set VYATTA_AUTO_INSTALL I will try to do an automated install for you
if [ -e /etc/default/vyatta ] ; then
@@ -841,7 +846,7 @@ copy_config () {
set_encrypted_password() {
sed -i \
- -e "/ user $1 {/,/}/s/encrypted-password .*\$/encrypted-password \"$2\"/" $3
+ -e "/ user $1 {/,/}/s/encrypted-password.*\$/encrypted-password \"$2\"/" $3
}
change_password() {