diff options
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_configapt | 5 | ||||
| -rwxr-xr-x | helpers/lh_debootstrap | 7 | ||||
| -rwxr-xr-x | helpers/lh_genrootfs | 7 | ||||
| -rwxr-xr-x | helpers/lh_installapt | 2 | ||||
| -rwxr-xr-x | helpers/lh_installlinux | 11 |
5 files changed, 20 insertions, 12 deletions
diff --git a/helpers/lh_configapt b/helpers/lh_configapt index 81ff23a90..cf8a91f91 100755 --- a/helpers/lh_configapt +++ b/helpers/lh_configapt @@ -19,6 +19,11 @@ case "${1}" in apply-recommends) # Configure recommends + if [ ! -d "${LIVE_CHROOT}"/etc/apt/apt.conf.d ] + then + mkdir -p "${LIVE_CHROOT}"/etc/apt/apt.conf.d + fi + if [ "${LIVE_RECOMMENDS}" = "yes" ] then echo "Aptitude::Recommends-Important \"true\";" > "${LIVE_CHROOT}"/etc/apt/apt.conf.d/00make-live_recommends.conf diff --git a/helpers/lh_debootstrap b/helpers/lh_debootstrap index 738179bde..fd43b16ea 100755 --- a/helpers/lh_debootstrap +++ b/helpers/lh_debootstrap @@ -8,7 +8,12 @@ then mkdir -p "${LIVE_CHROOT}" fi - debootstrap --arch="${LIVE_ARCHITECTURE}" --variant=buildd "${LIVE_DISTRIBUTION}" "${LIVE_CHROOT}" "${LIVE_MIRROR}" + if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]; + then + LIVE_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LIVE_BOOTSTRAP_CONFIG}" + fi + + debootstrap --arch="${LIVE_ARCHITECTURE}" --variant=buildd "${LIVE_DISTRIBUTION}" "${LIVE_CHROOT}" "${LIVE_MIRROR}" "${LIVE_DEBOOTSTRAP_SCRIPT}" # Touching stage file if [ ! -d "${LIVE_ROOT}"/.stage ] diff --git a/helpers/lh_genrootfs b/helpers/lh_genrootfs index 9ba4b3175..5853ed271 100755 --- a/helpers/lh_genrootfs +++ b/helpers/lh_genrootfs @@ -47,7 +47,12 @@ case "${LIVE_FILESYSTEM}" in rm "${LIVE_ROOT}"/binary/casper/filesystem.squashfs fi - mksquashfs "${LIVE_CHROOT}" "${LIVE_ROOT}"/binary/casper/filesystem.squashfs + if [ "${LIVE_FLAVOUR}" = "minimal" ] || [ "${LIVE_FLAVOUR}" = "mini" ] + then + mksquashfs "${LIVE_CHROOT}" "${LIVE_ROOT}"/binary/casper/filesystem.squashfs -e "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_CHROOT}"/vmlinuz "${LIVE_CHROOT}"/initrd.img "${LIVE_CHROOT}"/boot/config-* "${LIVE_CHROOT}"/boot/System.map-* + else + mksquashfs "${LIVE_CHROOT}" "${LIVE_ROOT}"/binary/casper/filesystem.squashfs + fi if [ -n "$LIVE_ENCRYPTION" ] then diff --git a/helpers/lh_installapt b/helpers/lh_installapt index 024303d89..ec199312e 100755 --- a/helpers/lh_installapt +++ b/helpers/lh_installapt @@ -23,7 +23,7 @@ then if [ -n "${REPOSITORY_KEYRING}" ] then - lh_chroot "aptiude install ${REPOSITORY_KEYRING}" + lh_chroot "aptitude install ${REPOSITORY_KEYRING}" elif [ -n "${REPOSITORY_KEY}" ] then lh_chroot "wget ${REPOSITORY_KEY}" diff --git a/helpers/lh_installlinux b/helpers/lh_installlinux index 40897d802..24dd7d1e0 100755 --- a/helpers/lh_installlinux +++ b/helpers/lh_installlinux @@ -21,12 +21,5 @@ case "${1}" in esac # Installing linux image -if [ "${LIVE_FLAVOUR}" = "minimal" ] || [ "${LIVE_FLAVOUR}" = "mini" ] -then - mv "${LIVE_CHROOT}"/boot/vmlinuz* "${DESTDIR}"/vmlinuz - mv "${LIVE_CHROOT}"/boot/initrd.img* "${DESTDIR}"/initrd.gz - rm -f "${LIVE_CHROOT}"/vmlinuz "${LIVE_CHROOT}"/initrd.img -else - cp "${LIVE_CHROOT}"/boot/vmlinuz* "${DESTDIR}"/vmlinuz - cp "${LIVE_CHROOT}"/boot/initrd.img* "${DESTDIR}"/initrd.gz -fi +cp "${LIVE_CHROOT}"/boot/vmlinuz* "${DESTDIR}"/vmlinuz +cp "${LIVE_CHROOT}"/boot/initrd.img* "${DESTDIR}"/initrd.gz |