[dak/master] Changes from 8.7
---
docs/README.stable-point-release | 12 +++++++++---
scripts/debian/sync-release | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/docs/README.stable-point-release b/docs/README.stable-point-release
index 6888c18..d2d05a5 100644
--- a/docs/README.stable-point-release
+++ b/docs/README.stable-point-release
@@ -9,7 +9,7 @@ TRY THE NEW pointrelease SCRIPT INSTEAD!
- sudo to dak
- bash:
suitename=jessie
-newrev=8.6
+newrev=8.7
export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
. $SCRIPTVARS
@@ -99,11 +99,11 @@ fi
# $EDITOR ${ftpdir}/dists/${suite}/ChangeLog
- and then check if they have a d-i update. if so, bash:
-diver=20150422+deb8u4+b1
+diver=20150422+deb8u4+b2
dak copy-installer -s ${pusuite} -d ${suite} ${diver}
# set dioldver to "empty" if there is no old to remove
-dioldver=20150422+deb8u4
+dioldver=20150422+deb8u4+b1
if [ "${dioldver}" != "empty" ]; then
cd $ftpdir/dists/${suite}/main
for iarch in $(dak admin s-a list-arch ${suite}); do
@@ -210,6 +210,12 @@ while :; do
done
echo "Done"
+wget --ca-directory=/etc/ssl/ca-debian https://release.debian.org/proposed-updates/8/8.7/Release-${newrev}.gpg
+cat Release-${newrev}.gpg >> ${ftpdir}/dists/${suite}/Release.gpg
+cd ${ftpdir}/dists/${suite}
+gpg --no-default-keyring --keyring /usr/share/keyrings/debian-archive-keyring.gpg --trust-model=always --verify Release.gpg Release
+
+
- Check if a mirror push is needed or next dinstall is enough. for a push, bash:
cd
${configdir}/cronscript mirror
diff --git a/scripts/debian/sync-release b/scripts/debian/sync-release
index 66fef0a..36aa23a 100755
--- a/scripts/debian/sync-release
+++ b/scripts/debian/sync-release
@@ -42,7 +42,7 @@ suite="${1}"
source="${ftpdir}/dists/${suite}"
target="sync-release:/srv/ftp-master.debian.org/tmp-release/"
-rsync -aH -B8192 \
+rsync -avH --progress -B8192 \
--exclude "/*/installer-*" \
--timeout 3600 \
-e 'ssh -o ConnectTimeout=30 -o SetupTimeout=30' \
--
2.1.4
Reply to: