diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-07-18 21:40:52 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-07-18 21:55:08 +0200 |
| commit | 3776a96b20f5ceefdab784054301b4bf3ff931be (patch) | |
| tree | 7d3aea4d76bcf6d943ab27a7d88a9be8b9f2b95b /scripts/build | |
| parent | c07a76f649f5bde7bea218cb27996dd46757a56c (diff) | |
| download | vyos-live-build-3776a96b20f5ceefdab784054301b4bf3ff931be.tar.gz vyos-live-build-3776a96b20f5ceefdab784054301b4bf3ff931be.zip | |
Correcting live-build and live-boot versions for splash.svg post-processing.
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/lb_binary_syslinux | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux index 6e28db6ec..9663fa3b3 100755 --- a/scripts/build/lb_binary_syslinux +++ b/scripts/build/lb_binary_syslinux @@ -293,8 +293,8 @@ then _MINUTE="$(date +%M)" _SECOND="$(date +%S)" _LINUX_VERSIONS="$(for _LINUX in chroot/boot/vmlinuz-* ; do chroot chroot apt-cache policy $(basename ${_LINUX} | sed -e 's|vmlinuz-|linux-image-|') | awk '/Installed: / { print $2 }' ; done | sort -u)" - _LIVE_BUILD_VERSIONS="$(chroot chroot apt-cache policy live-build | awk '/Installed: / { print $2 }')" - _LIVE_BOOT_VERSIONS="$(chroot chroot apt-cache policy live-boot | awk '/Installed: / { print $2 }')" + _LIVE_BUILD_VERSION="$(lb --version)" + _LIVE_BOOT_VERSION="$(chroot chroot apt-cache policy live-boot | awk '/Installed: / { print $2 }')" _LIVE_CONFIG_VERSION="$(chroot chroot apt-cache policy live-config | awk '/Installed: / { print $2 }')" _LIVE_TOOLS_VERSION="$(chroot chroot apt-cache policy live-tools | awk '/Installed: / { print $2 }')" @@ -311,7 +311,7 @@ then -e "s|@MINUTE@|${_MINUTE}|g" \ -e "s|@SECOND@|${_SECOND}|g" \ -e "s|@LINUX_VERSIONS@|${_LINUX_VERSIONS}|g" \ - -e "s|@LIVE_BUILD_VERSION@|${_LIVE_BUILD_VERSIONS}|g" \ + -e "s|@LIVE_BUILD_VERSION@|${_LIVE_BUILD_VERSION}|g" \ -e "s|@LIVE_BOOT_VERSION@|${_LIVE_BOOT_VERSION}|g" \ -e "s|@LIVE_CONFIG_VERSION@|${_LIVE_CONFIG_VERSION}|g" \ -e "s|@LIVE_TOOLS_VERSION@|${_LIVE_TOOLS_VERSION}|g" \ |