From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 6 Apr 2013 13:09:57 +0000 (+0200)
Subject: initrd: fix net and hid modules at installer.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e4a0896637b38cb37c3bdca6984f397fc9b16a7;p=people%2Fteissler%2Fipfire-2.x.git

initrd: fix net and hid modules at installer.
---

diff --git a/config/rootfiles/installer/hid-modules b/config/rootfiles/installer/hid-modules
deleted file mode 100644
index 3b180e9c5..000000000
--- a/config/rootfiles/installer/hid-modules
+++ /dev/null
@@ -1 +0,0 @@
-lib/modules/KVER-ipfire/kernel/drivers/hid
diff --git a/config/rootfiles/installer/network-modules b/config/rootfiles/installer/network-modules
deleted file mode 100644
index 6dabddfeb..000000000
--- a/config/rootfiles/installer/network-modules
+++ /dev/null
@@ -1 +0,0 @@
-lib/modules/KVER-ipfire/kernel/drivers/net
diff --git a/lfs/initrd b/lfs/initrd
index 740364438..56e19679b 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -64,6 +64,12 @@ $(TARGET) :
 
 	-cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
 
+	# Copy hid and network modules
+	cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/hid \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+	cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/net \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+
 	cd /install/initrd/etc && rm -f fstab
 	cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/
 	rm -rf /install/initrd/usr/share/man