[SCM] debian-live/config-webc branch, master, updated. 9f7ddcad6b57fbd5eddd145b2aa86d33066675ed

[Chris Lamb]

The following commit has been merged in the master branch:
commit 9f7ddcad6b57fbd5eddd145b2aa86d33066675ed
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Aug 28 05:50:15 2008 +0100

    Use GTK installer by default and remove 'newt' kernel and initrd from image.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/webconverger/config/binary_grub/menu.lst b/webconverger/config/binary_grub/menu.lst
index 3e80639..6a89363 100644
--- a/webconverger/config/binary_grub/menu.lst
+++ b/webconverger/config/binary_grub/menu.lst
@@ -9,7 +9,7 @@ title		Install:
 root
 
 title		Install Webconverger
-kernel		/install/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 quiet auto locale=en_US languagechooser/language-name=English DEBCONF_PRIORITY=critical file=/cdrom/install/preseed.cfg interface=auto -- quiet
-initrd		/install/initrd.gz
+kernel		/install/gtk/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 quiet auto locale=en_US languagechooser/language-name=English DEBCONF_PRIORITY=critical file=/cdrom/install/preseed.cfg interface=auto -- quiet
+initrd		/install/gtk/initrd.gz
 
 MEMTEST
diff --git a/webconverger/config/binary_local-hooks/02-repack-initrd.sh b/webconverger/config/binary_local-hooks/02-repack-initrd.sh
index 43d8fcf..418573a 100755
--- a/webconverger/config/binary_local-hooks/02-repack-initrd.sh
+++ b/webconverger/config/binary_local-hooks/02-repack-initrd.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TARGET_INITRD="binary/install/initrd.gz"
+TARGET_INITRD="binary/install/gtk/initrd.gz"
 REPACK_TMPDIR="unpacked-initrd"
 
 # cpio does not have a "extract to directory", so we must change directory
diff --git a/webconverger/config/binary_local-hooks/03-remove-newt-installer.sh b/webconverger/config/binary_local-hooks/03-remove-newt-installer.sh
new file mode 100755
index 0000000..541dc7c
--- /dev/null
+++ b/webconverger/config/binary_local-hooks/03-remove-newt-installer.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+# We prefer the GTK installer, so simply remove the 'newt' version
+# to save space. To boot the GTK installer in 'newt' mode, simply
+# append "DEBIAN_FRONTEND=newt" to the kernel command line.
+
+rm -f binary/install/initrd.gz
+rm -f binary/install/vmlinuz

-- 
debian-live/config-webc