X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=manager%2Fsetup;h=0c5643b1ba0e13f6e3a63a0a7509a050147131e1;hb=ac350060d6f6a22c08b2d324ea6bbb57124bb995;hp=0fb4061da7b02515d946f880f020944f39ad8edb;hpb=fadef126716317722defc33a923de50fa7466303;p=infra.git

diff --git a/manager/setup b/manager/setup
index 0fb4061..0c5643b 100755
--- a/manager/setup
+++ b/manager/setup
@@ -36,7 +36,7 @@ function reset_vm {
 }
 function update {
     title 'S1: apt-get; clone'
-    ssh_target -t "sudo apt-get update && DEBIAN_FRONTEND=noninteractive sudo -E apt-get upgrade -o Dpkg::Options::=\"--force-confold\" -y && sudo apt-get install -y git curl $devPkgs"
+    ssh_target -t "( sudo apt-get update | cat ) && ( DEBIAN_FRONTEND=noninteractive sudo -E apt-get upgrade -o Dpkg::Options::=\"--force-confold\" -y | cat ) && ( sudo apt-get install -y git curl $devPkgs | cat )"
     echo "Git init"
     ssh_target -t '[[ -d .git ]] || git init;'
     echo "Git push"
@@ -135,12 +135,14 @@ if [[ "$2" == "update" ]]; then
 fi
 configure
 ensure_nre
+
+install_backup
+
 title 'S3: puppet-1'
 ssh_target -t 'sudo ./bootstrap'
 title 'S3: puppet-2'
 ssh_target -t 'sudo ./bootstrap'
 
-[[ -f ../../migrate ]] && ( cd ../.. && bash migrate "$targetHost")
 if [[ -f tricks ]]; then
     cat tricks | ssh_target 'cat > tricks && chmod +x tricks'
     ssh_target -t 'bash tricks'
@@ -151,7 +153,7 @@ if [[ $signerLocation == "self" ]] && [[ $(ssh_target 'ps -ef | grep tcpseria[l]
     exit 1
 fi
 
-execute-bootstrap-user
+populate_system
 
 title 'bash'
 eval $(ssh-agent -k)