X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Finitrd;h=cc169568043884f5168023fa59a9900efb707e6b;hb=296a73a5326636a53c642dcd046b03fcff221835;hp=c5ceb3200e085cb4755d0f6098eb444dfa358223;hpb=0f680bccd34690496f6d154177c2c48804e26131;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/initrd b/lfs/initrd
index c5ceb3200..cc1695680 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        #
@@ -30,6 +30,8 @@ THISAPP    = initrd
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+SUP_ARCH   = i586
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -62,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
@@ -69,6 +77,9 @@ $(TARGET) :
 
 	cd /install/initrd/ && patch -Np0 < $(DIR_SRC)/src/patches/dracut-init_start_ipfireinstaller.patch
 
+	# Hide udev messages
+	sed -i -e "s|err|none|g" /install/initrd/etc/udev/udev.conf
+
 	# make new dependencies 
 	depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
 
@@ -77,8 +88,6 @@ $(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/