Commit a9fa544b authored by intrigeri's avatar intrigeri
Browse files

Store IUKs v2 in a dedicated directory (#15281)

At least in theory, there can very well be, for example, both IUKs v1 and v2
that upgrade from 4.1 to 4.3 and have the same filename. The difference
will be the meaning of "from 4.1" and the content.

Let's avoid having to deal with that.
parent 2ccd9426
......@@ -290,7 +290,7 @@ EOF
$desc->append(<<EOF
- type: incremental
target-files:
- url: https://127.0.0.1:$port/tails/stable/iuk/Tails_s390x_0.11_to_0.12.1.iuk
- url: https://127.0.0.1:$port/tails/stable/iuk/v2/Tails_s390x_0.11_to_0.12.1.iuk
size: 4096
sha256: 09ded037840f60aae20e639ee285f54974f919a9d08f1669f807ced456f50af3
EOF
......
......@@ -254,7 +254,7 @@ method iuk_filename ($previous_version) {
method iuk_url ($previous_version) {
'http://dl.amnesia.boum.org/tails/'
. $self->channel
. '/iuk/'
. '/iuk/v2/'
. $self->iuk_filename($previous_version);
}
......
......@@ -255,7 +255,7 @@ Example that would be found at
upgrade-paths:
- type: incremental
target-files:
- url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_amd64_0.11.1_to_0.11.2.iuk
- url: http://dl.amnesia.boum.org/tails/stable/iuk/v2/Tails_amd64_0.11.1_to_0.11.2.iuk
size: 37345648
sha256: 5c5c47f6155e7807c971251fdad28d5f72ff78db446e43a41e4b900f29229a7d
- type: full
......@@ -295,10 +295,10 @@ Example: `Tails_amd64_0.11.1_to_0.11.2.iuk`
A given IUK is meant to be made available at the URL composed from:
* `http://dl.amnesia.boum.org/tails/iuk/`
* `http://dl.amnesia.boum.org/tails/iuk/v2/`
* the IUK file basename
Example: <http://dl.amnesia.boum.org/tails/iuk/Tails_amd64_0.11.1_to_0.11.2.iuk>
Example: <http://dl.amnesia.boum.org/tails/iuk/v2/Tails_amd64_0.11.1_to_0.11.2.iuk>
## Client and user interface
......
......@@ -1065,7 +1065,7 @@ candidate):
sudo chown root:rsync_tails Tails_amd64_*_to_${VERSION:?}.iuk && \
sudo chmod u=rwX,go=rX Tails_amd64_*_to_${VERSION:?}.iuk && \
sudo mv Tails_amd64_*_to_${VERSION:?}.iuk \
/srv/rsync/tails/tails/${DIST:?}/iuk/
/srv/rsync/tails/tails/${DIST:?}/iuk/v2/
EOF
TRACE_TIME=$(date +%s) &&
......@@ -1497,11 +1497,12 @@ this, and skip what does not make sense for a RC.
`rsync.lizard:/srv/rsync/tails/tails/alpha/`
1. Remove IUKs that are more than 9 months old from
`/{stable,alpha}/iuk` on the rsync server:
- first check that it's not going to remove anything we want to keep:
ssh rsync.lizard /bin/sh -c \
\"find /srv/rsync/tails/tails/alpha \
/srv/rsync/tails/tails/stable \
\"find /srv/rsync/tails/tails/alpha/iuk/v2 \
/srv/rsync/tails/tails/stable/iuk/v2 \
-type f -name '*.iuk' -mtime '+270' \
-not -name '*~test_*~test.iuk' \
-not -name '*~testoverlayfs_*~testoverlayfs.iuk' \
......@@ -1511,8 +1512,8 @@ this, and skip what does not make sense for a RC.
- then actually delete the files:
ssh rsync.lizard /bin/sh -c \
\"sudo find /srv/rsync/tails/tails/alpha \
/srv/rsync/tails/tails/stable \
\"find /srv/rsync/tails/tails/alpha/iuk/v2 \
/srv/rsync/tails/tails/stable/iuk/v2 \
-type f -name '*.iuk' -mtime '+270' \
-not -name '*~test_*~test.iuk' \
-not -name '*~testoverlayfs_*~testoverlayfs.iuk' \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment