X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Finitrd;h=42da9bc7b3067b61cc73a37e5d287b660bb57c53;hp=eba267047688693dbe027d2b6ea751dcdff9c71d;hb=b7265a986650019e19f37ffe729062005a4a6ea6;hpb=99555458ad1defb46fa59fb7a7f7ce52001d0ff4

diff --git a/lfs/initrd b/lfs/initrd
index eba267047..42da9bc7b 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# 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
 ###############################################################################
@@ -55,9 +57,33 @@ $(TARGET) :
 	cd /install/initrd && lzma -d -c /boot/ipfirerd-$(KVER).img | cpio -i
 
 	# Copy Files packages for installer
-	find $(DIR_SRC)/config/rootfiles/installer/* -maxdepth 1 | xargs cat > /tmp/ROOTFILES
+	find $(DIR_SRC)/config/rootfiles/installer/* -maxdepth 1 | xargs cat | grep -v "^#" > /tmp/ROOTFILES
+
+	# Patch Kernel Version to rootfiles
+	sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
+
 	-cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
 
+	# 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/
 	rm -rf /install/initrd/usr/share/man
@@ -65,16 +91,29 @@ $(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
 
 	-mkdir -p /install/{images,mnt}
 	rm -rf /install/mnt/*
 
-	cp -aR /install/initrd/* /install/mnt
+	#Build Module deps for installer.
+	depmod -a -b /install/initrd/ -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
+
+	#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/
 
-	# Remove binary depmod files
-	rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/modules.*.bin
+	# 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