Merge branch 'master' into next

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

diff --git a/lfs/dracut b/lfs/dracut
index ee83ec3185354ef74857c4770cd65eed60fea63c..60652e16be0c6dbe4e29af3c66b769276abbebbe 100644 (file)
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -75,9 +75,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        cd $(DIR_APP) && make $(MAKETUNING) WITH_SWITCH_ROOT=1
        cd $(DIR_APP) && make install WITH_SWITCH_ROOT=1 \
-               sysconfdir=/etc
+               sbindir=/sbin sysconfdir=/etc
 
-       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}
+       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 $(DIR_APP)
        @$(POSTBUILD)