diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-07-19 19:37:26 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-07-19 21:11:59 +0200 |
| commit | 8473b925fd94fdb7bb1ae6309a4ab58d490382c9 (patch) | |
| tree | 94b76a6288395e37619b900f3eea2009a25d9b28 /scripts/build/lb_binary_disk | |
| parent | 6c0ddb7d6d72d15ab2887a4b40de2c5d71f26d3a (diff) | |
| download | vyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.tar.gz vyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.zip | |
Fixing up inclusion of functions while allowing local usage of live-build with different file layouts.
Diffstat (limited to 'scripts/build/lb_binary_disk')
| -rwxr-xr-x | scripts/build/lb_binary_disk | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk index 7162db2c0..c6075677c 100755 --- a/scripts/build/lb_binary_disk +++ b/scripts/build/lb_binary_disk @@ -11,7 +11,7 @@ set -e # Including common functions -. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh +( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh # Setting static variables DESCRIPTION="$(Echo 'install disk information into binary')" @@ -135,7 +135,15 @@ case "${LB_DEBIAN_INSTALLER}" in echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info - cp "${LB_BASE}"/data/debian-cd/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include binary/.disk/udeb_include + for LOCATION in "${LIVE_BUILD}/data/debian-cd" /usr/share/live/build/data/debian-cd + do + if [ -e "${LOCATION}" ] + then + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include + + continue + fi + done ;; true|netinst|live) @@ -152,7 +160,15 @@ case "${LB_DEBIAN_INSTALLER}" in echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info fi - cp "${LB_BASE}"/data/debian-cd/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include binary/.disk/udeb_include + for LOCATION in "${LIVE_BUILD}/data/debian-cd" /usr/share/live/build/data/debian-cd + do + if [ -e "${LOCATION}" ] + then + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include + + continue + fi + done if [ "${LB_DEBIAN_INSTALLER}" = "live" ] then @@ -167,7 +183,15 @@ case "${LB_DEBIAN_INSTALLER}" in echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info - cp "${LB_BASE}"/data/debian-cd/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include binary/.disk/udeb_include + for LOCATION in "${LIVE_BUILD}/data/debian-cd" /usr/share/live/build/data/debian-cd + do + if [ -e "${LOCATION}" ] + then + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include + + continue + fi + done ;; false) |