X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Finitrd;h=cf2dc3f475845d43c55da572518df2eb48c0b264;hp=153ef0bdf2ee1acf14ade31ae85f681e176917b4;hb=ea80530c4228f1271af5aadfc373470c9a21f408;hpb=7a523821e81e183c1e658e6d89ae77e0f0e1152e

diff --git a/lfs/initrd b/lfs/initrd
index 153ef0bdf..cf2dc3f47 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -51,40 +51,32 @@ $(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
+	-cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
+
 	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
+
+	cd /install/initrd/ && patch -Np0 < $(DIR_SRC)/src/patches/dracut-init_start_ipfireinstaller.patch
 
 	# 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/*,kernel/{sound,drivers/{bluetooth,hwmon,gpu,rtc,isdn,media,video,watchdog}}} \
-		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan* \
-		/install/initrd/lib/modules/$(KVER)-ipfire/net/{bridge,netfilter,ipsec}
-
-	cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
-
-	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
 
-	# make new dependencies for installer
-	depmod -a -F /boot/System.map-$(KVER)-ipfire \
-	    -b /install/initrd $(KVER)-ipfire
-
 	# Remove binary depmod files
 	rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/modules.*.bin
-	    
-	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)