X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Finitrd;h=42da9bc7b3067b61cc73a37e5d287b660bb57c53;hp=56e19679bf802c30949407dc0590791053694c51;hb=db8a01e0277fa3cfe82a37b49f9d7c29b749c795;hpb=099f4a9ec705c0ed09ae11815c08381b1d61041b

diff --git a/lfs/initrd b/lfs/initrd
index 56e19679bf..42da9bc7b3 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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/
@@ -88,13 +102,19 @@ $(TARGET) :
 
 	#Build Module deps for installer.
 	depmod -a -b /install/initrd/ -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
-	# Remove binary depmod files
-	rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/modules.*.bin
 
 	#Name service from dhcpcd
 	cp -f /etc/nsswitch.conf /install/initrd/etc/
 	cp -f $(DIR_SRC)/config/initrd/dhcpc/* /install/initrd/var/ipfire/dhcpc/dhcpcd-hooks/
 
+	# Install needed locales.
+	-mkdir -pv /install/initrd/usr/lib/locale
+	for lang in $(DIR_SRC)/langs/*; do \
+		for path in /usr/lib/locale/$${lang##*/}*; do \
+			[ -d "$${path}" ] && cp -lrvf "$${path}" /install/initrd/usr/lib/locale/; \
+		done; \
+	done
+
 	cd /install/initrd && find . | cpio -o -H newc | lzma > /install/images/initrd
 	cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log