diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-02-08 11:55:56 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:42 +0100 |
| commit | fedc5c15193afb92f94cfd54019545a9ec244b83 (patch) | |
| tree | 554ebc17a3a6a2025fb770aca34a1a115e49e7df /helpers/lh_binary_disk | |
| parent | ca9f7bf33e3c666b66ef346d0e16608ba3f6229e (diff) | |
| download | live-build-fedc5c15193afb92f94cfd54019545a9ec244b83.zip live-build-fedc5c15193afb92f94cfd54019545a9ec244b83.tar.gz | |
Updating .disk/info generation when building iso images.
Diffstat (limited to 'helpers/lh_binary_disk')
| -rwxr-xr-x | helpers/lh_binary_disk | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk index 0fbd426..279da75 100755 --- a/helpers/lh_binary_disk +++ b/helpers/lh_binary_disk @@ -52,10 +52,19 @@ DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')" DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)" eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`" -if [ "${LH_DISTRIBUTION}" != "etch" ] -then - ARCHITECTURE="Snapshot ${ARCHITECTURE}" -fi +case "${LH_MODE}" in + debian) + STRING="Official Snapshot ${ARCHITECTURE}" + ;; + + debian-release) + STRING="Official ${ARCHITECTURE}" + ;; + + *) + STRING="Snapshot ${ARCHITECTURE}" + ;; +esac case "${LH_DEBIAN_INSTALLER}" in cdrom) @@ -65,7 +74,7 @@ case "${LH_DEBIAN_INSTALLER}" in echo "full_cd" > binary/.disk/cd_type - echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info + echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include ;; @@ -77,7 +86,13 @@ case "${LH_DEBIAN_INSTALLER}" in echo "not_complete" > binary/.disk/cd_type - echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info + if [ "${LH_DEBIAN_INSTALLER}" = "live" ] + then + echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/INSTALL Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info + else + echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info + + fi cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include @@ -92,13 +107,13 @@ case "${LH_DEBIAN_INSTALLER}" in echo "not_complete" > binary/.disk/cd_type - echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info + echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include ;; disabled) - echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info + echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info ;; esac |