summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-08-10 00:50:56 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:46 +0100
commitb5a891df1427c4247a9ce6cc86d5f4ebd4f5f0e8 (patch)
tree6183a9564845d8922c5a6c1fee6c7eb5527dfed6
parentac11fdef00b71320de7e6c24f3a0346539e8e896 (diff)
downloadvyos-live-build-b5a891df1427c4247a9ce6cc86d5f4ebd4f5f0e8.tar.gz
vyos-live-build-b5a891df1427c4247a9ce6cc86d5f4ebd4f5f0e8.zip
Including archive trace into .disk meta information.
-rwxr-xr-xhelpers/lh_binary_disk10
-rwxr-xr-xhelpers/lh_source_disk10
2 files changed, 20 insertions, 0 deletions
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index a7674e7d7..2d209fb4b 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -56,22 +56,32 @@ TITLE="Debian GNU/Linux"
case "${LH_MODE}" in
debian)
STRING="Official Snapshot ${ARCHITECTURE}"
+ TRACE="project/trace/ftp-master.debian.org"
;;
debian-release)
STRING="Official ${ARCHITECTURE}"
+ TRACE="project/trace/ftp-master.debian.org"
;;
ubuntu)
TITLE="Ubuntu GNU/Linux"
STRING="Build ${ARCHITECTURE}"
+ TRACE=""
;;
*)
STRING="Snapshot ${ARCHITECTURE}"
+ TRACE=""
;;
esac
+if [ -n "${TRACE}" ]
+then
+ echo "$(wget -q ${LH_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
+ > binary/.disk/archive_trace
+fi
+
case "${LH_DEBIAN_INSTALLER}" in
cdrom)
echo "main" > binary/.disk/base_components
diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk
index 105fd6359..a69be6746 100755
--- a/helpers/lh_source_disk
+++ b/helpers/lh_source_disk
@@ -52,22 +52,32 @@ eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
case "${LH_MODE}" in
debian)
STRING="Official Snapshot ${ARCHITECTURE}"
+ TRACE="project/trace/ftp-master.debian.org"
;;
debian-release)
STRING="Official ${ARCHITECTURE}"
+ TRACE="project/trace/ftp-master.debian.org"
;;
ubuntu)
TITLE="Ubuntu GNU/Linux"
STRING="Build ${ARCHITECTURE}"
+ TRACE=""
;;
*)
STRING="Snapshot ${ARCHITECTURE}"
+ TRACE=""
;;
esac
+if [ -n "${TRACE}" ]
+then
+ echo "$(wget -q ${LH_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
+ > source/.disk/archive_trace
+fi
+
case "${LH_DEBIAN_INSTALLER}" in
cdrom)
echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Source $(date +%Y%m%d-%H:%M)" > source/.disk/info