SVN: geninitrd/trunk/geninitrd

[adamg]

Author: adamg
Date: Mon May 26 20:56:38 2008
New Revision: 9776

Modified:
   geninitrd/trunk/geninitrd
Log:
- some basic idea on modular uvesafb support, needs some parameters (can be
  passed through /etc/modprobe.conf)


Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Mon May 26 20:56:38 2008
@@ -64,6 +64,9 @@
 # LVM devices that should not be included in vgscan on initrd
 lvm_ignore_devices=''
 
+# whether v86d should be installed
+need_v86d=0
+
 # LVM volumes that are needed to activate
 # VG for root dev
 ROOTVG=""
@@ -345,7 +348,12 @@
 			[ $m = $mod ] && have=1
 		done
 		if [ $have = 0 ]; then
-			MODULES="$MODULES $mod"
+			MODULES="$MODULES $mod" 
+
+			# if we are adding uvesafb, we need v86d as well
+			if [ "$modName" = "uvesafb" ]; then
+				need_v86d=yes
+			fi				
 		fi
 	done
 }
@@ -1060,6 +1068,14 @@
 	EOF
 }
 
+initrd_gen_v86d() {
+	debug "initrd_gen_v86d"
+	mknod $DESTDIR/dev/mem c 1 1
+	mknod $DESTDIR/dev/tty1 c 4 1
+	inst_d /sbin
+	inst_exec /sbin/v86d /sbin
+}
+
 initrd_gen_udev() {
 	debug "Setting up udev..."
 	inst_d /sbin /etc/udev
@@ -1734,12 +1750,7 @@
 
 if [ -z "$INITRDFS" ]; then
 	if [ -z "$FS" ]; then
-		# default value
-		if [ "$pack_version" -ge "002005" ]; then
-			INITRDFS="initramfs"
-		else
-			INITRDFS="rom"
-		fi
+		INITRDFS="rom"
 	else
 		warn "Warning: FS configuration options is obsoleted. Use INITRDFS instead"
 		INITRDFS="$FS"
@@ -1991,6 +2002,10 @@
 	initrd_gen_tuxonice
 fi
 
+if is_yes "$need_v86d"; then
+	initrd_gen_v86d
+fi
+
 if is_yes "$have_dmraid"; then
 	initrd_gen_dmraid
 fi