summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-02-15 19:57:04 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-02-15 19:57:04 -0200
commit699db157b56831505a7a8025697837cb3a4d2bed (patch)
tree4209667c1c0680cbe6944f44c62f865e656e4865
parent180b8d34edfd37c199d5ce11bfc648ccd8ae8639 (diff)
downloadhydra-699db157b56831505a7a8025697837cb3a4d2bed.tar.gz
hydra-699db157b56831505a7a8025697837cb3a4d2bed.tar.bz2
Automatic deploy commit; apt-get clean on system-upgrade; TODO update
-rw-r--r--lib/hydra/misc2
-rwxr-xr-xshare/hydra/bootless1
-rwxr-xr-xshare/hydractl/system-upgrade3
3 files changed, 5 insertions, 1 deletions
diff --git a/lib/hydra/misc b/lib/hydra/misc
index 0de9713..75ea0e9 100644
--- a/lib/hydra/misc
+++ b/lib/hydra/misc
@@ -2,7 +2,7 @@
# Set needed environment variables and do basic checks
function hydra_set_env {
- export COMMIT="439d340c3daeb7e186366a05877141907d0ba66d"
+ export COMMIT="`( cd $APP_BASE && git log -n 1 --pretty=oneline | cut -d " " -f 1 )`"
export CONFIG="$HOME/.hydra/config"
export ACTION="$1"
diff --git a/share/hydra/bootless b/share/hydra/bootless
index 9bad724..511b317 100755
--- a/share/hydra/bootless
+++ b/share/hydra/bootless
@@ -314,6 +314,7 @@ function hydra_bootless_device {
}
# Generate a bootless disk image
+# TODO: optionally copy to removable media
function hydra_bootless_image {
local output="$1"
diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index aae2ba5..5dfe126 100755
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -65,6 +65,9 @@ fi
# Remove unused packages
apt-get autoremove
+# Cleanup package cache
+apt-get clean
+
# Custom procedures
if [ "$nextrelease" == "wheezy" ]; then
# Old suhosin config