diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index b352a2a47..c3eb4dc74 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -234,10 +234,6 @@ VMLINUZ_DI="vmlinuz" INITRD_DI="initrd.gz" DESTDIR_DI="${DESTDIR}" -VMLINUZ_GI="gtk/vmlinuz" -INITRD_GI="gtk/initrd.gz" -DESTDIR_GI="${DESTDIR}/gtk" - # Workaround for syslinux (<< 3.36) which doesn't support long file/path names if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "etch" ] then @@ -246,10 +242,6 @@ then VMLINUZ_DI="vmlinuz.di" INITRD_DI="initrddi.gz" DESTDIR_DI="${DESTDIR}" - - VMLINUZ_GI="vmlinuz.gi" - INITRD_GI="initrdgi.gz" - DESTDIR_GI="${DESTDIR}" ;; esac fi @@ -340,11 +332,6 @@ then ${LH_ROOT_COMMAND} umount mini.tmp rm -rf mini.tmp mini.iso else - # Downloading debian-installer - Download_file "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${DI_REMOTE_KERNEL} - Download_file "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz - - # Downloading graphical-installer DOWNLOAD_GTK_INSTALLER=0 case "${LH_ARCHITECTURE}" in amd64|i386) @@ -360,9 +347,11 @@ else if [ ${DOWNLOAD_GTK_INSTALLER} -eq 1 ] then - mkdir -p "${DESTDIR_GI}" - Download_file "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL} - Download_file "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz + Download_file "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL} + Download_file "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz + else + Download_file "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${DI_REMOTE_KERNEL} + Download_file "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz fi fi @@ -662,11 +651,6 @@ Repack_initrd() if [ "${DI_IMAGE_TYPE}" = "netboot" ] && [ -e config/binary_debian-installer/preseed.cfg ] then Repack_initrd "${DESTDIR}"/"${INITRD_DI}" - - if [ -e "${DESTDIR}"/"${INITRD_GI}" ] - then - Repack_initrd "${DESTDIR}"/"${INITRD_GI}" - fi fi # Saving cache diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub index d0b13ec3a..3b4771669 100755 --- a/helpers/lh_binary_grub +++ b/helpers/lh_binary_grub @@ -220,27 +220,18 @@ then VMLINUZ_DI="install/vmlinuz" INITRD_DI="install/initrd.gz" - APPEND_DI="vga=normal" - VMLINUZ_GI="install/gtk/vmlinuz" - INITRD_GI="install/gtk/initrd.gz" + APPEND_DI="vga=normal DEBIAN_FRONTEND=newt" APPEND_GI="video=vesa:ywrap,mtrr vga=788" - if cmp -s ${VMLINUZ_DI} ${VMLINUZ_GI} - then - # Kernels are identical; we can save space by removing one of them. - rm ${VMLINUZ_GI} - VMLINUZ_GI="${VMLINUZ_DI}" - fi - Grub_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}" - Grub_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}" + Grub_install_entry "installgui" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_GI}" Grub_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}" - Grub_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}" + Grub_install_entry "expertgui" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_GI}" Grub_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}" - Grub_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}" + Grub_install_entry "rescuegui" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_GI}" Grub_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}" - Grub_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}" + Grub_install_entry "autogui" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_GI}" fi LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')" diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 3c221f11a..6a4490e0d 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -516,21 +516,12 @@ if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] then VMLINUZ_DI="vmlinuz" INITRD_DI="initrd.gz" - APPEND_DI="vga=normal" - VMLINUZ_GI="gtk/vmlinuz" - INITRD_GI="gtk/initrd.gz" + APPEND_DI="vga=normal DEBIAN_FRONTEND=newt" APPEND_GI="video=vesa:ywrap,mtrr vga=788" - if cmp -s ${VMLINUZ_DI} ${VMLINUZ_GI} - then - # Kernels are identical; we can save space by removing one of them. - rm ${VMLINUZ_GI} - VMLINUZ_GI="${VMLINUZ_DI}" - fi - Syslinux_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}" - Syslinux_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}" + Syslinux_install_entry "GUI" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_GI}" fi # Assembling memtest configuration diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot index 189a9f4f1..d8b4d4424 100755 --- a/helpers/lh_binary_yaboot +++ b/helpers/lh_binary_yaboot @@ -230,21 +230,19 @@ if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] then VMLINUZ_DI="vmlinuz" INITRD_DI="initrd.gz" - APPEND_DI="vga=normal" - VMLINUZ_GI="gtk/vmlinuz" - INITRD_GI="gtk/initrd.gz" + APPEND_DI="vga=normal DEBIAN_FRONTEND=newt" APPEND_GI="video=vesa:ywrap,mtrr vga=788" Yaboot_install_entry "linux" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}" Yaboot_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}" - Yaboot_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}" + Yaboot_install_entry "installgui" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_GI}" Yaboot_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}" - Yaboot_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}" + Yaboot_install_entry "expertgui" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_GI}" Yaboot_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}" - Yaboot_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}" + Yaboot_install_entry "rescuegui" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_GI}" Yaboot_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}" - Yaboot_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}" + Yaboot_install_entry "autogui" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_GI}" fi LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"