summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 14:05:10 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:26 +0100
commit4bc50b69ce6fb6852281420fdead84252955962a (patch)
tree3657fff30b3bfb427e8bfca81e9221d0c2ce5637
parent0c4f6feead1ab33db5f8847a3f83dfe2f0e48cf5 (diff)
downloadlive-build-4bc50b69ce6fb6852281420fdead84252955962a.zip
live-build-4bc50b69ce6fb6852281420fdead84252955962a.tar.gz
Adding support for live-installer.
-rwxr-xr-xhelpers/lh_binary_debian-installer8
-rwxr-xr-xhelpers/lh_binary_disk12
2 files changed, 13 insertions, 7 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 39cd0a1..280dea0 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -35,7 +35,7 @@ Set_defaults
# Setting remote d-i directories
case "${LH_DEBIAN_INSTALLER}" in
- enabled|cdrom|netinst|businesscard)
+ enabled|cdrom|netinst|businesscard|live)
DI="cdrom"
DI_GTK="${DI}/gtk"
DI_KERNEL="vmlinuz"
@@ -381,6 +381,12 @@ do
rm -f "${EXCLUDE}"_*.udeb
done
+# Enable live-installer
+if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+then
+ rm -f bootstrap-base_*.udeb
+fi
+
# Moving udebs
for UDEB in ${UDEBS}
do
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index d742090..99d3117 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -79,7 +79,7 @@ case "${LH_MODE}" in
cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
;;
- enabled|netinst)
+ enabled|netinst|live)
echo "main" > binary/.disk/base_components
touch binary/.disk/base_installable
@@ -89,6 +89,11 @@ case "${LH_MODE}" in
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
+
+ if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+ then
+ echo "live-installer" >> binary/.disk/udeb_include
+ fi
;;
businesscard)
@@ -114,10 +119,5 @@ case "${LH_MODE}" in
;;
esac
-if [ -d binary/pool/main/l/live-installer ]
-then
- echo "live-installer" >> binary/.disk/udeb_include
-fi
-
# Creating stage file
Create_stagefile .stage/binary_disk