From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 Aug 2014 19:42:49 +0000 (+0200)
Subject: dracut: Update dracut.conf
X-Git-Tag: v2.17-core87~103^2~51^2~64
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a4d36b4a3f3f8cdab5f83c91114091721d9e050b

dracut: Update dracut.conf
---

diff --git a/config/rootfiles/common/dracut b/config/rootfiles/common/dracut
index 2192763be1..e2b9162fee 100644
--- a/config/rootfiles/common/dracut
+++ b/config/rootfiles/common/dracut
@@ -1,6 +1,5 @@
 etc/dracut.conf
 etc/dracut.conf.d
-#etc/dracut.conf.d/dracut.conf
 usr/bin/dracut
 usr/bin/dracut-catimages
 #usr/bin/lsinitrd
diff --git a/lfs/dracut b/lfs/dracut
index 397b63c945..95e8e3ab6e 100644
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	rm -rf /usr/lib/dracut/modules.d/*{bootchart,dash,fips*,modsign,busybox,convertfs,network,ifcfg,url-lib,gensplash,cms,plymouth,btrfs,crypt*,dm,dmraid,dmsquash-live,livenet,lvm,multipath,qemu*,cifs,dasd*,fcoe*,iscsi,nbd,nfs,resume,ssh-client,zfcp*,systemd*,znet,securityfs,masterkey,selinux,usrmount,uefi-lib}
 
-	cp -vf $(DIR_SRC)/src/dracut/dracut.conf /etc/dracut.conf.d/
+	cp -vf $(DIR_SRC)/src/dracut/dracut.conf /etc/dracut.conf
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/dracut/dracut.conf b/src/dracut/dracut.conf
index b671b7a977..34e6a667d8 100644
--- a/src/dracut/dracut.conf
+++ b/src/dracut/dracut.conf
@@ -1,26 +1,51 @@
-# dracut config file
+# PUT YOUR CONFIG HERE OR IN separate files named *.conf
+# in /etc/dracut.conf.d
+# SEE man dracut.conf(5)
 
-# Specific list of dracut modules to use
+# Sample dracut config file
+
+#logfile=/var/log/dracut.log
+#fileloglvl=6
+
+# Exact list of dracut modules to use.  Modules not listed here are not going
+# to be included.  If you only want to add some optional modules use
+# add_dracutmodules option instead.
 #dracutmodules+=""
 
-# Dracut modules to omit
+# dracut modules to omit
 #omit_dracutmodules+=""
 
-# Dracut modules to add to the default
+# dracut modules to add to the default
 #add_dracutmodules+=""
 
 # additional kernel modules to the default
 #add_drivers+=""
 
 # list of kernel filesystem modules to be included in the generic initramfs
-filesystems+="ext2 ext3 ext4 reiserfs reiser4 iso9660 vfat"
+filesystems+="reiserfs vfat xfs"
 
 # build initrd only to boot current hardware
 #hostonly="yes"
 #
 
 # install local /etc/mdadm.conf
-mdadmconf="no"
+#mdadmconf="no"
 
 # install local /etc/lvm/lvm.conf
-lvmconf="no"
+#lvmconf="no"
+
+# A list of fsck tools to install. If it's not specified, module's hardcoded
+# default is used, currently: "umount mount /sbin/fsck* xfs_db xfs_check
+# xfs_repair e2fsck jfs_fsck reiserfsck btrfsck". The installation is
+# opportunistic, so non-existing tools are just ignored.
+#fscks=""
+
+# inhibit installation of any fsck tools
+#nofscks="yes"
+
+# mount / and /usr read-only by default
+#ro_mnt="no"
+
+# set the directory for temporary files
+# default: /var/tmp
+#tmpdir=/tmp