summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-18 17:12:52 +0000
committerintrigeri <intrigeri@boum.org>2016-05-18 17:12:52 +0000
commit9273c6d9b8e194918743554870d37d4c1b5d7143 (patch)
tree12aeb27f986c7d6a19f6d56622814d54db18b89e
parent128d6f2bdc1f7894a0da2a60fe0c7839d4e452d9 (diff)
Move documentation about thawing APT snapshots.
Non-RM:s might need it too.
-rw-r--r--wiki/src/contribute/APT_repository/time-based_snapshots.mdwn15
-rw-r--r--wiki/src/contribute/release_process.mdwn12
2 files changed, 17 insertions, 10 deletions
diff --git a/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn b/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
index 30043ba..0c810d5 100644
--- a/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
+++ b/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
@@ -80,6 +80,21 @@ that shall be used during the freeze:
-m 'Freeze APT snapshots for ${VERSION}.' \
config/APT_snapshots.d/*/serial
+<a id="thaw"></a>
+
+Thaw snapshots
+--------------
+
+For example, to encode in the `$RELEASE_BRANCH` Git branch the fact
+that it is not frozen anymore, that is remove the indication that
+a specific set of APT repository snapshots must be used:
+
+ git checkout "$RELEASE_BRANCH" && \
+ ./auto/scripts/apt-snapshots-serials thaw && \
+ git commit \
+ -m 'Thaw APT snapshots after Tails $VERSION was released.' \
+ config/APT_snapshots.d/*/serial
+
Bump expiration date
--------------------
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 5e8770f..3b5702f 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -1097,16 +1097,8 @@ this, and skip what does not make sense for a RC.
never released. Explanation: the post-release APT repository steps
from the previous stable release will usually have had us prepare
for an emergency release that was never made.
-1. Encode in the `$RELEASE_BRANCH` Git branch the
- fact that it is not frozen anymore, that is remove the indication
- that a specific set of APT repository snapshots must be used:
-
- git checkout "$RELEASE_BRANCH" && \
- ./auto/scripts/apt-snapshots-serials thaw && \
- git commit \
- -m 'Thaw APT snapshots after Tails $VERSION was released.' \
- config/APT_snapshots.d/*/serial
-
+1. [[Thaw|APT_repository/time-based snapshots#thaw]] the time-based
+ APT repository snapshots that were used during the freeze.
1. Pull `master` back and merge it into `stable`, and in turn into
`devel`
1. Follow the