summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_includes
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:52 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:29 +0100
commitbd1a5ddc8203907eb40135303bea5488397ec5d0 (patch)
treee1cdc0adec3e4799f5db5ad1a8b34800e28a9439 /helpers/lh_binary_includes
parent8a4a50fdb6b206fbff62fd3043ed388f25a0ffb1 (diff)
downloadvyos-live-build-bd1a5ddc8203907eb40135303bea5488397ec5d0.tar.gz
vyos-live-build-bd1a5ddc8203907eb40135303bea5488397ec5d0.zip
Adding live-helper 1.0~a8-1.
Diffstat (limited to 'helpers/lh_binary_includes')
-rwxr-xr-xhelpers/lh_binary_includes19
1 files changed, 13 insertions, 6 deletions
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 18ad540e8..15d898d41 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -25,10 +25,11 @@ Arguments "${@}"
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
if [ "${LIVE_INCLUDES}" = "none" ]
@@ -79,17 +80,23 @@ esac
if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
+ # Working arround vfat limitations
+ if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+ then
+ CP_OPTIONS="--preserve=link,mode,timestamps"
+ fi
+
# Copying d-i templates
if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
then
- cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
+ cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
fi
if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
then
- cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
+ cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
fi
# Adjusting d-i templates
@@ -105,8 +112,8 @@ then
DEBIAN_TOOLS_TXT="/tools/"
fi
- sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_HTML}/g" binary/README.html
- sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_TXT}/g" binary/README.txt
+ sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html
+ sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
fi
# Creating stage file