add installer to boot menu

diff --git a/Makefile b/Makefile
index b0610ecce3d6e5ae691a6d7b76c11b664cac4233..2c0cfa278fecf4c27ad662713e5b4ab51848330f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -152,7 +152,9 @@ else ifdef raspi
   deb  http://archive.raspberrypi.org/debian ${release} main
   endef
 
-  PACKAGES += firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel initramfs-tools
+  # PACKAGES += firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel initramfs-tools
+  PACKAGES += firmware-brcm80211 pi-bluetooth initramfs-tools e2fsprogs
+  PACKAGES += linux-image-rpi-v7 raspberrypi-bootloader-nokernel
 
   _target: _umount _config
   
@@ -387,7 +389,9 @@ _bootloader_iso: ${CFGROOT} ${ISOROOT}
                >"$${ISOROOT}/boot/grub/grub.cfg"
        printf '%s\n' "set timeout=10" "default=${release}" \
                "menuentry 'Debian ${release}' --id '${release}' {" \
-               "linux '/vmlinuz' boot=live" "initrd '/initrd.img'" "}" \
+               "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' {" \