include live-cd menu entries for gtk/text mode installer

diff --git a/Makefile b/Makefile
index 2c0cfa278fecf4c27ad662713e5b4ab51848330f..e0123fa06b96fc20d0e95fcced9ddb9234286392 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -249,6 +249,7 @@ _install: ${SYSROOT} _aptkeys _norecommends
        chroot "$${SYSROOT}" ln -sf /bin/true /usr/local/sbin/invoke-rc.d
        chroot "$${SYSROOT}" ln -sf /bin/true /usr/sbin/udevadm
        mountpoint "$${SYSROOT}/proc" || mount -o bind /proc "$${SYSROOT}/proc"
+       chroot "$${SYSROOT}" cat /etc/apt/sources.list
        chroot "$${SYSROOT}" apt-get --yes -t "${release}" install ${PACKAGES}
        mkdir -p -m 755 "$${SYSROOT}/var/lib/deborphan/"
        chroot "$${SYSROOT}" sh -c 'printf "%s\\n" ${PACKAGES} >/var/lib/deborphan/keep'
@@ -390,12 +391,14 @@ _bootloader_iso: ${CFGROOT} ${ISOROOT}
        printf '%s\n' "set timeout=10" "default=${release}" \
                "menuentry 'Debian ${release}' --id '${release}' {" \
                "linux '/vmlinuz' boot=live modprobe.blacklist=nbd" "initrd '/initrd.img'" "}" \
-               "menuentry 'Install Debian ${release}' --id 'installer' {" \
-               "linux '/vmlinuz'" "initrd '/install/gtk/initrd.gz'" "}" \
                >>"$${ISOROOT}/boot/grub/grub.cfg"
-       -[ -f "$${ISOROOT}/install/initrd.gz" -a -f "$${ISOROOT}/install/linux" ] && \
-       printf '%s\n' "menuentry 'Install Debian' --id 'install' {" \
-               "linux '/install/linux'" "initrd '/install/initrd.gz'" "}" \
+       -[ -f "$${ISOROOT}/install/gtk/initrd.gz" -a -f "$${ISOROOT}/install/gtk/linux" ] && \
+       printf '%s\n' "menuentry 'Install Debian ${release}' --id 'install' {" \
+               "linux '/install/gtk/linux'" "initrd '/install/gtk/initrd.gz'" "}" \
+               >>"$${ISOROOT}/boot/grub/grub.cfg"
+       -[ -f "$${ISOROOT}/install/text/initrd.gz" -a -f "$${ISOROOT}/install/text/linux" ] && \
+       printf '%s\n' "menuentry 'Install Debian ${release} (text mode)' --id 'install' {" \
+               "linux '/install/text/linux'" "initrd '/install/text/initrd.gz'" "}" \
                >>"$${ISOROOT}/boot/grub/grub.cfg"
 
 _efi_mount: ${PBOOT}