debian-installer/rootskel/src/lib/debian-installer.d S25env2debconf,NONE,1.1 Makefile,1.4,1.5 S33framebuffer-module-linux-i386,1.5,1.6 S35framebuffer-linux,1.3,1.4 S10debug,1.3,NONE

[Joey Hess <joeyh@debian.org>]

Update of /cvs/debian-boot/debian-installer/rootskel/src/lib/debian-installer.d
In directory gluck:/tmp/cvs-serv1319/src/lib/debian-installer.d

Modified Files:
	Makefile S33framebuffer-module-linux-i386 S35framebuffer-linux 
Added Files:
	S25env2debconf 
Removed Files:
	S10debug 
Log Message:
   * Add a register-module command, similar to apt-install, which queues
     modules for entry into /target/etc/modules and /target/etc/modutils/local.
     Does not yet handle 2.6 modutils. Should only be used for modules
     that discover does not find, or that have special parameters.
   * Add debian-installer/framebuffer and only enable frame buffer if it is
     true.
   * Add a S25env2debconf in debian-installer.d, that finds environment
     variables in the form foo/bar=baz, and uses these special ones to set
     debconf values in the db. This allows booting with any d-i debconf
     values on the command line, to override *anything*. For example --
     boot: debian-installer/framebuffer=false
   * Fixed debconf-get to not output value on stderr, and not clear screen
     either. But it is insanely gross and expensive now, and should be
     moved to cdebconf and rewritten.

--- S10debug DELETED ---

Index: S35framebuffer-linux
===================================================================
RCS file: /cvs/debian-boot/debian-installer/rootskel/src/lib/debian-installer.d/S35framebuffer-linux,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- S35framebuffer-linux	21 Aug 2003 12:42:48 -0000	1.3
+++ S35framebuffer-linux	8 Dec 2003 21:52:31 -0000	1.4
@@ -1,4 +1,5 @@
-if [ "$TERM_TYPE" = virtual -a -e /dev/fb/0 ] ; then
-	TERM_FRAMEBUFFER=yes
+if [ "$TERM_TYPE" = virtual -a -e /dev/fb/0 ]; then
+	if [ "`debconf-get debian-installer/framebuffer`" = true ]; then
+		TERM_FRAMEBUFFER=yes
+	fi
 fi
-

Index: Makefile
===================================================================
RCS file: /cvs/debian-boot/debian-installer/rootskel/src/lib/debian-installer.d/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	21 Aug 2003 12:42:48 -0000	1.4
+++ Makefile	8 Dec 2003 21:52:31 -0000	1.5
@@ -31,6 +31,7 @@
 
 files = \
 	S20templates \
+	S25env2debconf \
 	S50frontend \
 	S50priority
 

--- NEW FILE: S25env2debconf ---
# Import foo/bar=baz from environment variables into the debconf db,
OLDIFS=$IFS
IFS='
'
for line in $(set); do
	var="${line%=*}"
	val="${line#[!=]*=}"
	# grep out the normal variables with no slashes
	varnoslash="${var##*/*}"
	if [ "$var" != "" ] && [ "$val" != "" ] && [ "$varnoslash" = "" ]; then
		# remove single quotes from around value
		val="${val#\'}"
		val="${val%\'}"
		debconf-set "$var" "$val" >/dev/null
	fi
done
IFS=$OLDIFS

Index: S33framebuffer-module-linux-i386
===================================================================
RCS file: /cvs/debian-boot/debian-installer/rootskel/src/lib/debian-installer.d/S33framebuffer-module-linux-i386,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- S33framebuffer-module-linux-i386	28 Sep 2003 08:31:58 -0000	1.5
+++ S33framebuffer-module-linux-i386	8 Dec 2003 21:52:31 -0000	1.6
@@ -1,3 +1,4 @@
-echo "info: Trying to enable linux framebuffer."
-modprobe -q vesafb || modprobe -q vga16fb || true
-
+if [ "`debconf-get debian-installer/framebuffer`" = true ]; then
+	echo "Trying to enable the frame buffer.."
+	modprobe -q vesafb >/dev/null || modprobe -q vga16fb >/dev/null || true
+fi