The patches below to rootskel and rootskel-gtk combine your original patch and the later one and also keep the bulk of the work where it belongs: in rootskel-gtk. Please check. Index: rootskel-gtk/src/lib/debian-installer.d/Makefile =================================================================== --- rootskel-gtk/src/lib/debian-installer.d/Makefile (revision 43268) +++ rootskel-gtk/src/lib/debian-installer.d/Makefile (working copy) @@ -20,6 +20,7 @@ ifneq (,$(filter i386 amd64,$(DEB_HOST_ARCH_CPU))) files += \ + S59check-vesa-x86 \ S61mouse-support-x86 endif ifneq (,$(filter powerpc,$(DEB_HOST_ARCH_CPU))) Index: rootskel-gtk/src/lib/debian-installer.d/S59check-vesa-x86 =================================================================== --- rootskel-gtk/src/lib/debian-installer.d/S59check-vesa-x86 (revision 0) +++ rootskel-gtk/src/lib/debian-installer.d/S59check-vesa-x86 (revision 0) @@ -0,0 +1,11 @@ +# Graphical installer currently only works on VESA framebuffer +if [ "$TERM_FRAMEBUFFER" ]; then + if [ ! -f /proc/fb ] || ! grep -q VESA /proc/fb; then + GTK_NOVESA=1 + else + FB_INDEX=$(grep VESA /proc/fb | cut -d " " -f 1) + if [ $FB_INDEX -ne 0 ]; then + echo "fbdev=/dev/fb$FB_INDEX" >> /etc/directfbrc + fi + fi +fi Index: rootskel/src/lib/debian-installer.d/S60frontend =================================================================== --- rootskel/src/lib/debian-installer.d/S60frontend (revision 43284) +++ rootskel/src/lib/debian-installer.d/S60frontend (working copy) @@ -14,6 +14,10 @@ echo "Framebuffer not available; disabling graphical frontend" >&2 return 1 fi + if [ "$GTK_NOVESA" ]; then + echo "No VESA framebuffer available; disabling graphical frontend" >&2 + return 1 + fi case "$(archdetect)" in powerpc/*)
Attachment:
pgpTLj25reKPS.pgp
Description: PGP signature