X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=fcd2de356aafed0c1ad6d0fe55bb12c55695623e;hb=e65fe609400677be4ee3429e7251184b2fbc178e;hp=9aadf836059925e76e56db028784318a341ce6e1;hpb=705fde638084f64c52b161a7bf8703716772ca3f;p=dak.git diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 9aadf836..fcd2de35 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -5,6 +5,7 @@ function ts() { } # Remove daily lock +# FIXME: Dead code when switched to cronscript function remove_daily_lock() { rm -f $LOCK_DAILY } @@ -50,7 +51,7 @@ function onerror() { } ######################################################################## -# the actual dinstall functions follow # +# the actual functions follow # ######################################################################## # pushing merkels QA user, part one @@ -482,12 +483,6 @@ function bts() { sudo -u dak-unpriv dak bts-categorize } -function ddaccess() { - # Tell our dd accessible mirror to sync itself up. Including ftp dir. - log "Trigger dd accessible parts sync including ftp dir" - ${scriptsdir}/sync-dd dd-sync dd-sync1 dd-sync2 sync -} - function mirrorpush() { log "Checking the public archive copies..." @@ -615,7 +610,6 @@ function logstats() { # save timestamp when we start function savetimestamp() { - NOW=`date "+%Y.%m.%d-%H:%M:%S"` echo ${NOW} > "${dbdir}/dinstallstart" } @@ -663,6 +657,7 @@ function changelogs() { fi } +# Generate a list of extra mirror files, sha256sum em and sign that function signotherfiles() { log "Signing extra mirror files" @@ -676,8 +671,18 @@ function signotherfiles() { cd ${archiveroot} rm -f extrafiles - sha256sum $(find * -type f | egrep -v '(pool|i18n|dep11|source)/|Contents-.*\.(gz|diff)|installer|binary-|(In)?Release(.gpg)?|\.changes') > ${TMPLO} + sha256sum $(find * -type f | egrep -v '(pool|i18n|dep11|source)/|Contents-.*\.(gz|diff)|installer|binary-|(In)?Release(.gpg)?|\.changes' | sort) > ${TMPLO} gpg --no-options --batch --no-tty --armour --personal-digest-preferences=SHA256 --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --clearsign --output ${archiveroot}/extrafiles ${TMPLO} rm -f ${TMPLO} done } + +function startup() { + touch "${DINSTALLSTART}" + ts "startup" + DINSTALLBEGIN="$(date -u +"%a %b %d %T %Z %Y (%s)")" + lockfile -l 3600 "${LOCK_DAILY}" + trap onerror ERR + TEMPFILES="${TEMPFILES} ${LOCK_DAILY}" + touch "${LOCK_BRITNEY}" +}