X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Finitrd;h=cc169568043884f5168023fa59a9900efb707e6b;hp=874694380100ccc849e2ffd03d8664d347288ffa;hb=26922c33eb91951c79c5b6a5e959a5adbf20bc9b;hpb=f5b69661bb38dfb4029d31053b7c89db38f8b5b4

diff --git a/lfs/initrd b/lfs/initrd
index 874694380..cc1695680 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
 ###############################################################################
@@ -51,37 +53,47 @@ $(TARGET) :
 	rm -f /install/images/initrd
 
 	# Finish up initrd directory
-	-mkdir -p /install/initrd/{dev,etc,mnt,root,lib/modules/$(KVER)-ipfire/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run,sys} && \
+	-mkdir -p /install/initrd/{dev,etc,mnt,root,lib/modules/$(KVER)-ipfire/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run,sys}
+	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 | 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
+	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
-	chmod 755 /install/initrd/etc/halt /install/initrd/etc/rc
-	cp -f /usr/share/terminfo/l/linux /install/initrd/usr/share/terminfo/l
+	chmod 755 /install/initrd/etc/halt /install/initrd/etc/rc_installer
 
-	# make new dependencies 
-	depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
-	depmod -a -F /boot/System.map-$(KVER)-ipfire-smp $(KVER)-ipfire-smp
-	
-	cp -a /lib/modules/$(KVER)-ipfire/ /install/initrd/lib/modules/
-	
-	rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,source,misc/*,net/*,kernel/{crypto,sound,net,drivers/{media,video}}} \
-		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan*
+	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
 
-	cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
+	# make new dependencies 
+	depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
 
-	cd /install/initrd/lib/ && ln -sf libgcc_s.so.1 libgcc_s.so
-	
 	-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/
 
-	# make new dependencies for installer
-	depmod -a -F /boot/System.map-$(KVER)-ipfire \
-	    -b /install/initrd $(KVER)-ipfire
-	    
-	mksquashfs /install/initrd /install/images/initrd
+	cd /install/initrd && find . | cpio -o -H newc | lzma > /install/images/initrd
 	cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log
 
 	@$(POSTBUILD)