From 473443adc07fc2daf6f9dbb010abc750bba3b3ff Mon Sep 17 00:00:00 2001
From: Murray Stokely <murray@FreeBSD.org>
Date: Wed, 1 May 2002 04:54:35 +0000
Subject: [PATCH] Add support for kernel options to be removed from the BOOTMFS
 kernel and loaded as modules, not just kernel devices.

---
 release/scripts/driver-remove.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/release/scripts/driver-remove.pl b/release/scripts/driver-remove.pl
index aa8ec1c6851..879e2907f2c 100644
--- a/release/scripts/driver-remove.pl
+++ b/release/scripts/driver-remove.pl
@@ -39,7 +39,11 @@ open CONFIG, "< $config" or die "Cannot open $config.\n";
 while (<CONFIG>) {
     s/#.*$//;
     if (/^(\w+)\s+(\w+)\s+(\d+)\s+(\w+)\s+\"(.*)\"\s*$/) {
-	$drivers{$1} = 1;
+	if ($4 eq "options") {
+	    $options{$1} = 1;
+	} else {
+	    $drivers{$1} = 1;
+	}
     }
 }
 close CONFIG;
@@ -47,6 +51,7 @@ close CONFIG;
 open BOOTMFS, "< $bootmfs" or die "Cannot open $bootmfs.\n";
 while (<BOOTMFS>) {
     next if (/^device\s+(\w+)/ && $drivers{$1});
+    next if (/^options\s+(\w+)/ && $options{$1});
     push @bootmfs, $_;
 }
 close BOOTMFS;