[tor-commits] [tor-cloud/master] Use upgrade and not safe-upgrade with apt-get

[runa at torproject.org]

commit 7d4e7b3383ba6e3a1f2cc8842d549d3c9bdc6d75
Author: Runa A. Sandvik <runa.sandvik at gmail.com>
Date:   Sat Sep 15 22:27:54 2012 +0100

    Use upgrade and not safe-upgrade with apt-get
---
 ec2-prep.sh |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/ec2-prep.sh b/ec2-prep.sh
index a32c148..9236527 100644
--- a/ec2-prep.sh
+++ b/ec2-prep.sh
@@ -25,7 +25,7 @@ fi
 # Get the latest package updates
 echo "Updating the system..."
 apt-get update
-apt-get -y safe-upgrade
+apt-get -y upgrade
 
 # Configure unattended-upgrades. The system will automatically download,
 # install and configure all packages, and reboot if necessary.
@@ -267,9 +267,3 @@ echo "Done configuring the system, will reboot"
 echo "Your system has been configured for blocking diagnostics" > /etc/ec2-prep.sh
 reboot
 fi
-
-# XXX TODO
-# Generally, we'll want to rm /var/lib/tor/* and remove all state from the system
-#
-# We're done; tell the user and then reboot the system
-#reboot