summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-06-05 11:38:39 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-06-05 11:38:39 (GMT)
commit6eb285cad11a4a955a21702fac70d6135f370985 (patch)
tree50c3dc3d71a0bfabaaadaadae19f7fcbc75703dc
parent8669dd314d713a93b5b5129ce47d4dc680ab559e (diff)
parentb7f14f8015642fa1f29a1a109703cebf86b80a78 (diff)
downloaddefinitions-6eb285cad11a4a955a21702fac70d6135f370985.tar.gz
Merge branch 'baserock/sam/clarify-upgrade-devel'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
-rw-r--r--upgrade-devel.morph12
1 files changed, 3 insertions, 9 deletions
diff --git a/upgrade-devel.morph b/upgrade-devel.morph
index fc5f5b3..408dfd0 100644
--- a/upgrade-devel.morph
+++ b/upgrade-devel.morph
@@ -16,13 +16,9 @@ description: |
`ssh root@localhost whoami`. If not, run `ssh-copy-id root@localhost`.
Make sure the 'morph' field below matches the system you are upgrading.
- To upgrade, fill in $HOSTNAME and $VERSION_LABEL below and run:
+ To upgrade, select a sensible a value for VERSION_LABEL and run:
- morph deploy --upgrade upgrade-devel.morph
-
- Alternatively, you can delete those two configuration lines and run:
-
- morph deploy --upgrade upgrade-devel.HOSTNAME=$HOSTNAME upgrade-devel.VERSION_LABEL=$YYYY-MM-DD
+ morph deploy --upgrade upgrade-devel.morph self.HOSTNAME=$(hostname) self.VERSION_LABEL=$VERSION_LABEL
Your configuration in /etc should be propagated to the new system, but there
may be merge conflicts. Check /etc for files named '.rej' and '.orig' in the
@@ -38,8 +34,6 @@ description: |
systems:
- morph: devel-system-x86_64-generic
deploy:
- upgrade-devel:
+ self:
type: ssh-rsync
location: root@localhost
- HOSTNAME: $HOSTNAME
- VERSION_LABEL: $YYYY-MM-DD