diff options
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 8 | ||||
| -rwxr-xr-x | helpers/lh_binary_disk | 12 |
2 files changed, 13 insertions, 7 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 39cd0a126..280dea06c 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 d74209092..99d3117dd 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 |