From 7106e86e6db0c3b220aef19648d59b87bd0c86b5 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mageia.org>
Date: Thu, 5 Apr 2012 02:49:26 +0000
Subject: display_driver_helper: drop unused and unuseful --check-initrd option

---
 NEWS                        |  2 ++
 tools/display_driver_helper | 23 -----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/NEWS b/NEWS
index 4660b37..15e6131 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
   xorg.conf.standard exists
 - handle drivers needing SSE
 - handle drivers needing firmware (mga#1471, mga#3421)
+- display_driver_helper changes:
+  o drop support for unused and unuseful --check-initrd option
 
 Version 0.99 - 18 December 2011
 - default to 24bit with QXL driver (16 bit doesn't work)
diff --git a/tools/display_driver_helper b/tools/display_driver_helper
index 32a50a8..2cf2acf 100644
--- a/tools/display_driver_helper
+++ b/tools/display_driver_helper
@@ -301,23 +301,6 @@ get_initrd_kms_drivers() {
 	zcat "$initrd" | cpio -t --quiet | sed -nr "s,.*/($kms_drivers)\.ko.*$,\1,p"
 }
 
-# Check that the initrd doesn't contain disabled modules
-check_initrd() {
-	local initrd="$1"
-	local initrd_drivers="$(get_initrd_kms_drivers "$initrd")"
-	for driver in $initrd_drivers; do
-		check_driver "$driver" || return 1
-	done
-	for driver2 in $(get_active_kms_drivers); do
-		for driver in $initrd_drivers; do
-			[ "$driver" = "$driver2" ] && continue 2
-		done
-		# An enabled module for present hardware was not in initrd
-		return 1
-	done
-	return 0
-}
-
 get_active_kms_drivers() {
 	local kms_drivers=
 	for device in $(grep -l 0x03 /sys/bus/pci/devices/0000\:0*/class); do
@@ -387,9 +370,6 @@ Known actions:
         As --check-loaded, and consider ambiguous cases (e.g. nvidia where
         we can't detect if the loaded driver has the correct version) as
         failure.
-
-  --check-initrd INITRD
-        Check that INITRD doesn't contain disabled KMS drivers.
 EOF
 }
 
@@ -453,9 +433,6 @@ case "$1" in
 --get-initrd-kms-drivers)
 	get_initrd_kms_drivers "$2"
 	;;
---check-initrd)
-	check_initrd "$2"
-	;;
 --check-loaded)
 	check_loaded
 	;;
-- 
cgit v1.2.1