summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--upgrade-devel.morph12
1 files changed, 3 insertions, 9 deletions
diff --git a/upgrade-devel.morph b/upgrade-devel.morph
index fc5f5b30..408dfd01 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