From 568f22cad6578b9f01b4a395abf8dc5908f3642e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 13 Oct 2011 16:28:02 +0200
Subject: [PATCH] initramfs-tools: mount /dev/pts, add DRM/KMS modules.

---
 .../files/hooks/{fbcon => drm-kms}             |  7 ++++++-
 srcpkgs/initramfs-tools/files/init             |  4 +++-
 .../files/scripts/init-top/fbconsole           | 18 ------------------
 srcpkgs/initramfs-tools/template               |  2 +-
 4 files changed, 10 insertions(+), 21 deletions(-)
 rename srcpkgs/initramfs-tools/files/hooks/{fbcon => drm-kms} (58%)
 delete mode 100644 srcpkgs/initramfs-tools/files/scripts/init-top/fbconsole

diff --git a/srcpkgs/initramfs-tools/files/hooks/fbcon b/srcpkgs/initramfs-tools/files/hooks/drm-kms
similarity index 58%
rename from srcpkgs/initramfs-tools/files/hooks/fbcon
rename to srcpkgs/initramfs-tools/files/hooks/drm-kms
index d07af748d8..e7b4f32408 100755
--- a/srcpkgs/initramfs-tools/files/hooks/fbcon
+++ b/srcpkgs/initramfs-tools/files/hooks/drm-kms
@@ -15,8 +15,13 @@ prereqs)
 	;;
 esac
 
-# Hook to add the fbcon module
+# Hook to add the DRM/KMS modules
 . /usr/share/initramfs-tools/hook-functions
+
 manual_add_modules fbcon
+manual_add_modules intel-agp
+manual_add_modules ati-agp
+manual_add_modules i915
+manual_add_modules radeon
 
 exit 0
diff --git a/srcpkgs/initramfs-tools/files/init b/srcpkgs/initramfs-tools/files/init
index 19600cdf76..b8e67eaa79 100755
--- a/srcpkgs/initramfs-tools/files/init
+++ b/srcpkgs/initramfs-tools/files/init
@@ -9,7 +9,7 @@ for f in $(/bin/busybox --list); do
 done
 
 [ -d /run ] || mkdir -m 0755 /run
-[ -d /dev ] || mkdir -m 0755 /dev
+[ -d /dev ] || mkdir -m 0755 -p /dev/pts
 [ -d /root ] || mkdir -m 0700 /root
 [ -d /sys ] || mkdir /sys
 [ -d /proc ] || mkdir /proc
@@ -29,6 +29,8 @@ if ! mount -t devtmpfs -o size=$tmpfs_size,mode=0755 devtmpfs /dev; then
 	mount -t tmpfs -o size=$tmpfs_size,mode=0755 udev /dev
 	[ -e /dev/console ] || mknod -m 0600 /dev/console c 5 1
 	[ -e /dev/null ] || mknod /dev/null c 1 3
+	# Mount devpts to make plymouth happy
+	mount -t devpts devpts /dev/pts
 fi
 # Also mount a tmpfs for /run directory.
 mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run
diff --git a/srcpkgs/initramfs-tools/files/scripts/init-top/fbconsole b/srcpkgs/initramfs-tools/files/scripts/init-top/fbconsole
deleted file mode 100644
index c5202df640..0000000000
--- a/srcpkgs/initramfs-tools/files/scripts/init-top/fbconsole
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-prereqs()
-{
-	echo "$PREREQ"
-}
-case $1 in
-# get pre-requisites
-prereqs)
-	prereqs
-	exit 0
-	;;
-esac
-
-# Always load the fbcon module for KMS, won't do any harm for
-# other users anyway.
-modprobe fbcon
diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template
index 96251f025d..84c2ca525a 100644
--- a/srcpkgs/initramfs-tools/template
+++ b/srcpkgs/initramfs-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'initramfs-tools'
 pkgname=initramfs-tools
-_localver=103		# This is the XBPS version
+_localver=105		# This is the XBPS version
 _distver=0.99		# This should match debian version
 version=${_distver}.${_localver}
 build_style=custom-install