dracut/installer: remove cdrom waiting loop that reset some drives.

[people/pmueller/ipfire-2.x.git] / lfs / dracut

diff --git a/lfs/dracut b/lfs/dracut
index ee83ec3185354ef74857c4770cd65eed60fea63c..c9816bd57d54f05f871d1db00b438ae955fe3065 100644 (file)
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -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        #
@@ -71,13 +71,24 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_cdrom_wait.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 \
-               sysconfdir=/etc
+               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
 
-       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,fcoe,iscsi,nbd,nfs,resume,uswsusp,zfcp,znet,selinux}
+       # Build initramdisk
+       /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER).img $(KVER)-ipfire
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)