Jessie stuff

diff --git a/TODO.md b/TODO.md
index e918980451a740744984b03f8c211a6010e1beb6..b731ad7fe869baa370ed9b12f92d448c8fdaf084 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -4,6 +4,7 @@ TODO
 Hydra
 -----
 
+- install: move to /usr/local/share/hydra.
 - bootless: properly support `$subdevice` in parted or always use first partition (like `/dev/sdb1`).
 - init: add new repositories as superproject's submodules.
 - nodes: get node list via hiera files.

diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index ab32bf727640c4cba47b9802b5047b883a2f980b..05f4bc5cfc09549cbfca9ecd3879193276d251bf 100755 (executable)
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -141,15 +141,15 @@ function hydra_system_upgrade_custom {
   #fi
 
   hydractl trac-upgrade
-  hydra_system_upgrade_stage puppet
+  #hydra_system_upgrade_stage puppet
 }
 
 # Enable puppet again
-function hydra_system_upgrade_puppet {
-  echo ""
-  echo "Starting puppet again..."
-  hydractl puppet-enable
-}
+#function hydra_system_upgrade_puppet {
+#  echo ""
+#  echo "Starting puppet again..."
+#  hydractl puppet-enable
+#}
 
 # Initialize
 if [ ! -e "$STATE" ]; then