summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_includes
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:12 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:19:41 +0100
commit504c05c3a63de0af4fd0e876274afc039c5c0ed1 (patch)
tree5a29d0f82735a131c9319b5b825c57b740584d13 /helpers/lh_binary_includes
parent37a5c53ddd2825bf6b0ce521908a63d419683981 (diff)
downloadlive-build-504c05c3a63de0af4fd0e876274afc039c5c0ed1.zip
live-build-504c05c3a63de0af4fd0e876274afc039c5c0ed1.tar.gz
Adding live-helper 1.0~a15-1.
Diffstat (limited to 'helpers/lh_binary_includes')
-rwxr-xr-xhelpers/lh_binary_includes17
1 files changed, 15 insertions, 2 deletions
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 7979dfe..0841f40 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -92,7 +92,7 @@ then
CP_OPTIONS="-L"
fi
- # Copying d-i templates
+ # Copying install templates
if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
then
@@ -105,7 +105,7 @@ then
cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
fi
- # Adjusting d-i templates
+ # Adjusting install templates
DEBIAN_NAME="Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
@@ -122,5 +122,18 @@ then
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
+# Copying live templates
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* &> /dev/null
+then
+ cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* binary
+fi
+
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}" ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* &> /dev/null
+then
+ cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary
+fi
+
# Creating stage file
Create_stagefile .stage/binary_includes