From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 6 May 2014 11:21:40 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=b7265a986650019e19f37ffe729062005a4a6ea6;hp=1be052f99558509e6cd808290ee77b63524ff938

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
---

diff --git a/lfs/initrd b/lfs/initrd
index fdb3a55ba..42da9bc7b 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -64,11 +64,25 @@ $(TARGET) :
 
 	-cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
 
-	# Copy hid and network modules
+	# Copy hid and network modules (and deps)
 	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/
+	cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/pcmcia \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+	cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/ssb \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+	cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/uio \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+	cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/ptp \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+	cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/dca \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+	cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/pps \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+	# Remove wireless modules
+	rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/net/wireless
 
 	cd /install/initrd/etc && rm -f fstab
 	cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/