diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-08-10 21:31:17 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-08-10 21:31:21 +0200 |
| commit | 421419c7fc96df18c422102a52879dd6860725a6 (patch) | |
| tree | 3edd25d85befdd16b36916e098e52a035c04b781 /scripts/build/binary_disk | |
| parent | 44ab7590386050c06b828a1b37bbbc8d1c45f5ae (diff) | |
| download | vyos-live-build-421419c7fc96df18c422102a52879dd6860725a6.tar.gz vyos-live-build-421419c7fc96df18c422102a52879dd6860725a6.zip | |
Getting rid of hard-coded release numbers and using /etc/os-release instead (Closes: #790860).
Unfortunately VERSION_ID on testing/unstable is currently not included
in /etc/os-release, see #795124.
Diffstat (limited to 'scripts/build/binary_disk')
| -rwxr-xr-x | scripts/build/binary_disk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index 4f444b0be..7175a543a 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -51,7 +51,13 @@ mkdir -p binary/.disk ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')" DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')" DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)" -eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`" + +if [ -e chroot/etc/os-release ] +then + VERSION="$(. chroot/etc/os-release && echo ${VERSION_ID})" +fi + +VERSION="${VERSION:-none}" case "${LB_MODE}" in debian) |