From c3932cfd5462a702aa477dbd754dae5fe595ca78 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 26 Feb 2010 21:33:50 +0100 Subject: [PATCH] buildd/link_latest.sh: fix filename in md5 sum of latest ISO --- buildd/link_latest.sh | 13 ++++++++++--- debian/changelog | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/buildd/link_latest.sh b/buildd/link_latest.sh index 8bb1943..a2b5626 100755 --- a/buildd/link_latest.sh +++ b/buildd/link_latest.sh @@ -13,6 +13,8 @@ set -e [ -n "$MIRROR_DIRECTORY" ] || exit 1 cd $MIRROR_DIRECTORY || exit 2 +DAILY_DIR=/srv/mirror/www.grml.org/daily + cd "$DAILY_DIR" echo "---------------------------" >> "$DAILY_DIR"/.timestamp_link for flavour in grml-medium_lenny grml-medium_squeeze grml-medium_sid grml-small_lenny grml-small_squeeze grml-small_sid \ @@ -20,10 +22,15 @@ for flavour in grml-medium_lenny grml-medium_squeeze grml-medium_sid grml- grml64_lenny grml64_squeeze grml64_sid grml_lenny grml_squeeze grml_sid ; do ISO="$(ls -1 $flavour/*.iso | tail -1)" if [ -n "$ISO" ] ; then - ln -sf $ISO $(basename ${ISO%%_[0-9]*})_latest.iso - ln -sf ${ISO}.md5 $(basename ${ISO%%_[0-9]*})_latest.iso.md5 - ln -sf ${ISO}.sha1 $(basename ${ISO%%_[0-9]*})_latest.iso.sha1 + latest="$(basename ${ISO%%_[0-9]*})_latest.iso" + ln -sf $ISO ${latest} + # ln -sf ${ISO}.md5 ${latest}.md5 + # http://bts.grml.org/grml/issue814 + name=$(awk '{print $2}' "${ISO}".md5) + sed "s/$name/$latest/" "${ISO}".md5 > "${latest}".md5 + echo "$ISO" >> "$DAILY_DIR"/.timestamp_link fi done +echo "---------------------------" >> "$DAILY_DIR"/.timestamp_link ## END OF FILE ################################################################# diff --git a/debian/changelog b/debian/changelog index 54b1b92..5bd4bfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ grml-live (0.9.36) unstable; urgency=low when debugging a system. * Fix label name for ssh bootoption. * Add persistency feature to boot menu. [Closes: issue773] + * buildd/link_latest.sh: make sure to use according filename in + md5sum file of *_latest* ISOs. [Closes: issue814] * Software related changes: - Add grml-quickconfig to GRMLBASE. - Add grml-quickconfig-standard to GRML_* classes. @@ -32,7 +34,7 @@ grml-live (0.9.36) unstable; urgency=low - Move grml-docs from GRMLBASE to GRML_{SMALL,MEDIUM,FULL} to be able to customize it easier. - -- Michael Prokop Fri, 26 Feb 2010 14:52:03 +0100 + -- Michael Prokop Fri, 26 Feb 2010 21:32:25 +0100 grml-live (0.9.35) unstable; urgency=low -- 2.1.4