From fbbf9a87d5415ceada5bd8d3bf11df044bebbf93 Mon Sep 17 00:00:00 2001
From: Matt Erickson <matt@spideroak.com>
Date: Thu, 5 Sep 2013 10:28:20 -0500
Subject: [PATCH 1/2] Updated make_tarball.sh to push the upgrade directory as
 well.

---
 deploy/make_tarball.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/deploy/make_tarball.sh b/deploy/make_tarball.sh
index 62a6dbb..910304e 100755
--- a/deploy/make_tarball.sh
+++ b/deploy/make_tarball.sh
@@ -50,6 +50,9 @@ pushd $buildit_dir/django > /dev/null
 ./setup_git.sh $buildit_dir
 popd > /dev/null #$buildit_dir/django
 
+# Copy over the upgrades
+cp -r $source_dir/upgrade $buildit_dir
+
 # Setup the SQL package
 mkdir $buildit_dir/sql
 cp $source_dir/sql/*.sql $buildit_dir/sql

From 322e4d7ee2db481dc6687806b42bda2ac2f03c95 Mon Sep 17 00:00:00 2001
From: Matt Erickson <matt@spideroak.com>
Date: Thu, 5 Sep 2013 10:29:13 -0500
Subject: [PATCH 2/2] Update upgrade_om.sh with typo for the upgrade folder.

---
 bin/upgrade_om.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/upgrade_om.sh b/bin/upgrade_om.sh
index a2e639a..5e53e3f 100755
--- a/bin/upgrade_om.sh
+++ b/bin/upgrade_om.sh
@@ -35,9 +35,9 @@ sudo tar xjf $upgrade
 sudo cp $HOME/agent_config.json /opt/openmanage/etc
 
 # Apply SQL updates
-pushd upgrades
+pushd upgrade
 python apply_sql.py
-popd #upgrades
+popd #upgrade
 popd #/opt
     
 sudo sv start openmanage