dracut: fix use own config / use lzma compression.

diff --git a/lfs/dracut b/lfs/dracut
index 60652e16be0c6dbe4e29af3c66b769276abbebbe..726eedb409841827e6f7e649cf7dada2db3f9c3c 100644 (file)
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -71,16 +71,23 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_lzma.patch
+
        cd $(DIR_APP) && cp -vf $(DIR_SRC)/src/dracut/switch_root.c .
 
        cd $(DIR_APP) && make $(MAKETUNING) WITH_SWITCH_ROOT=1
        cd $(DIR_APP) && make install WITH_SWITCH_ROOT=1 \
                sbindir=/sbin sysconfdir=/etc
 
+       cp -vf $(DIR_SRC)/src/dracut/dracut.conf /etc/dracut.conf.d/
+
        rm -rf /usr/share/dracut/modules.d/*{dash,fips,redhat-i18n,rpmversion,network,ifcfg,plymouth,btrfs,crypt,dm,dmraid,dmsquash-live,lvm,mdraid,multipath,dasd,dasd_mod,fcoe,iscsi,nbd,nfs,resume,uswsusp,zfcp,znet,selinux}
 
        sed -e "s/--resolve-names=never//g" -i \
                /usr/share/dracut/modules.d/99base/init
 
+       # Build initramdisk
+       /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER).img $(KVER)-ipfire
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/patches/dracut-006_lzma.patch b/src/patches/dracut-006_lzma.patch
new file mode 100644 (file)
index 0000000..ddf4991
--- /dev/null
+++ b/src/patches/dracut-006_lzma.patch
@@ -0,0 +1,14 @@
+diff -Naur dracut-006.org/dracut dracut-006/dracut
+--- dracut-006.org/dracut      2010-06-17 10:46:29.000000000 +0200
++++ dracut-006/dracut  2010-08-07 21:00:38.000000000 +0200
+@@ -308,9 +308,7 @@
+       #strip -R .comment $note "$f" || :
+     done
+ fi
+-
+-type pigz &>/dev/null && gzip=pigz || gzip=gzip
+-( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet |$gzip -9 > "$outfile"; ) 
++( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet | lzma > "$outfile"; ) 
+ if [ $? -ne 0 ]; then
+     derror "dracut: creation of $outfile failed"
+     exit 1