X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Finitrd;h=fe221e84fca1ce384ac519020fa0be003db40d52;hb=225140ae8fc9f3cedfb32729169f6d98875820ce;hp=cf2dc3f475845d43c55da572518df2eb48c0b264;hpb=3834d135ecb9383995f305cfe4fa18e9c7511495;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/initrd b/lfs/initrd
index cf2dc3f47..fe221e84f 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) 2010  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
 ###############################################################################
@@ -56,6 +58,10 @@ $(TARGET) :
 
 	# Copy Files packages for installer
 	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
 
 	cd /install/initrd/etc && rm -f fstab
@@ -71,11 +77,15 @@ $(TARGET) :
 	-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
 	# 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/
+
 	cd /install/initrd && find . | cpio -o -H newc | lzma > /install/images/initrd
 	cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log