Merge branch 'glendale' into hollywood

1 files changed, 9 insertions, 12 deletions

diff --git a/scripts/install-system b/scripts/install-system
index 50b445cc..8d52e11b 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -3,18 +3,15 @@
 # Module: install-system
 # 
 # **** License ****
-# Version: VPL 1.0
-# 
-# The contents of this file are subject to the Vyatta Public License
-# Version 1.0 ("License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.vyatta.com/vpl
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
 # This code was originally developed by Vyatta, Inc.
 # Portions created by Vyatta are Copyright (C) 2006, 2007 Vyatta, Inc.
 # All Rights Reserved.
@@ -759,7 +756,7 @@ unmount () {
 
 progress_indicator () {
   case "$1" in
-    start) $bindir/progress-indicator $SPID &
+    start) $vyatta_bindir/progress-indicator $SPID &
              ;;
     *)
 	     if ! rm /tmp/pi.$SPID 2>/dev/null