version 019

NEWS: dracut-019
dracut.sh: precopy some essential device nodes
2012-06-04 14:24:25 +02:00 · 2012-06-04 14:23:54 +02:00 · 2012-06-04 14:00:49 +02:00 · 2012-06-04 13:56:55 +02:00 · 2012-06-04 13:12:07 +02:00 · 2012-06-04 13:11:38 +02:00
183 changed files with 6171 additions and 5517 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@
 /modules.d/99base/switch_root
 /test/*/test.log
 test*.img
+/.buildpath
+/.project
+/dracut-version.sh
--- a/11
+++ b/11
@@ -5,24 +5,24 @@ Warren Togami <wtogami@redhat.com>
 Amadeusz Żołnowski <aidecoe@aidecoe.name>
 Jeremy Katz <katzj@redhat.com>
 David Dillow <dave@thedillows.org>
-Michal Soltys <soltys@ziu.info>
 Will Woods <wwoods@redhat.com>
+Michal Soltys <soltys@ziu.info>
+Dave Young <dyoung@redhat.com>
+Amerigo Wang <amwang@redhat.com>
 Andrey Borzenkov <arvidjaar@gmail.com>
+Colin Guthrie <colin@mageia.org>
 Andreas Thienemann <andreas@bawue.net>
 Hans de Goede <hdegoede@redhat.com>
 Peter Jones <pjones@redhat.com>
-Amerigo Wang <amwang@redhat.com>
-Colin Guthrie <colin@mageia.org>
 John Reiser <jreiser@bitwagon.com>
 Luca Berra <bluca@vodka.it>
-Dave Young <dyoung@redhat.com>
 Daniel Drake <dsd@laptop.org>
 Marc Grimme <grimme@atix.de>
+Dan Horák <dhorak@redhat.com>
 Roberto Sassu <roberto.sassu@polito.it>
 Anton Blanchard <anton@samba.org>
 Bill Nottingham <notting@redhat.com>
 Brian C. Lane <bcl@redhat.com>
-Dan Horák <dhorak@redhat.com>
 David Cantrell <dcantrell@redhat.com>
 Lance Albertson <lance@osuosl.org>
 Marian Ganisin <mganisin@redhat.com>
@@ -47,6 +47,7 @@ Frederic Crozat <fcrozat@mandriva.com>
 Glen Gray <slaine@slaine.org>
 Hermann Gausterer <git-dracut-2012@mrq1.org>
 James Laska <jlaska@redhat.com>
+Jan Stodola <jstodola@redhat.com>
 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 Leho Kraav <leho@kraav.com>
 Lubomir Rintel <lkundrak@v3.sk>
--- a/85
+++ b/85
@@ -1,4 +1,4 @@
-VERSION=016
+VERSION=019
 GITVERSION=$(shell [ -d .git ] && git rev-list  --abbrev-commit  -n 1 HEAD  |cut -b 1-8)

 prefix ?= /usr
@@ -9,52 +9,72 @@ sysconfdir ?= ${prefix}/etc
 bindir ?= ${prefix}/bin
 mandir ?= ${prefix}/share/man

-manpages = dracut.8 dracut.cmdline.7 dracut.conf.5 dracut-catimages.8  dracut-gencmdline.8
+manpages = dracut.8 dracut.cmdline.7 dracut.conf.5 dracut-catimages.8

 .PHONY: install clean archive rpm testimage test all check AUTHORS doc

+all: syncheck dracut-version.sh
+
 doc: $(manpages) dracut.html
-all: syncheck

 %: %.xml
 	xsltproc -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<

-dracut.html: dracut.xml $(manpages)
+%.xml: %.asc
+	asciidoc -d manpage -b docbook -o $@ $<
+
+dracut.html: dracut.asc $(manpages)
+	asciidoc -a numbered -d book -b docbook -o dracut.xml dracut.asc
 	xsltproc -o dracut.html --xinclude -nonet \
 		--stringparam draft.mode yes \
-		--stringparam html.stylesheet http://docs.redhat.com/docs/en-US/Common_Content/css/default.css \
+		--stringparam html.stylesheet \
+		http://docs.redhat.com/docs/en-US/Common_Content/css/default.css \
 		http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml
+	rm dracut.xml

-install: doc
+install: doc dracut-version.sh
 	mkdir -p $(DESTDIR)$(pkglibdir)
 	mkdir -p $(DESTDIR)$(bindir)
 	mkdir -p $(DESTDIR)$(sysconfdir)
 	mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
 	mkdir -p $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
-	install -m 0755 dracut $(DESTDIR)$(bindir)/dracut
-	install -m 0755 dracut-gencmdline $(DESTDIR)$(bindir)/dracut-gencmdline
-	install -m 0755 dracut-catimages $(DESTDIR)$(bindir)/dracut-catimages
+	install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
+	install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
 	install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
-	install -m 0755 lsinitrd $(DESTDIR)$(bindir)/lsinitrd
+	install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd
 	install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
 	mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
-	install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions
-	install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger
+	install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh
+	install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh
+	ln -s dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions
+	install -m 0755 dracut-logger.sh $(DESTDIR)$(pkglibdir)/dracut-logger.sh
 	install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore
 	cp -arx modules.d $(DESTDIR)$(pkglibdir)
 	install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8/dracut.8
 	install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8/dracut-catimages.8
-	install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8/dracut-gencmdline.8
 	install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5/dracut.conf.5
 	install -m 0644 dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.cmdline.7
 	ln -s dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7
 	if [ -n "$(systemdsystemunitdir)" ]; then \
 		mkdir -p $(DESTDIR)$(systemdsystemunitdir); \
-		install -m 0644 dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir); \
-		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants; \
-		ln -s ../dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants/dracut-shutdown.service; \
+		for i in \
+			modules.d/98systemd/dracut-initqueue.service \
+			modules.d/98systemd/dracut-pre-pivot.service \
+			modules.d/98systemd/dracut-pre-trigger.service \
+			modules.d/98systemd/dracut-pre-udev.service \
+			modules.d/98systemd/initrd-switch-root.service \
+			modules.d/98systemd/initrd-switch-root.target \
+			dracut-shutdown.service; do \
+				install -m 0644 $$i $(DESTDIR)$(systemdsystemunitdir); \
+		done; \
+		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants; \
+		ln -s ../dracut-shutdown.service \
+		$(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants/dracut-shutdown.service; \
 	fi

+dracut-version.sh:
+	@echo "DRACUT_VERSION=$(VERSION)-$(GITVERSION)" > dracut-version.sh
+
 clean:
 	$(RM) *~
 	$(RM) */*~
@@ -66,31 +86,34 @@ clean:

 archive: dracut-$(VERSION)-$(GITVERSION).tar.bz2

-dist: dracut-$(VERSION).tar.gz
+dist: dracut-$(VERSION).tar.bz2

-dracut-$(VERSION).tar.bz2:
-	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ |bzip2 > dracut-$(VERSION).tar.bz2
-
-dracut-$(VERSION).tar.gz:
-	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ |gzip > dracut-$(VERSION).tar.gz
+dracut-$(VERSION).tar.bz2: doc
+	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ > dracut-$(VERSION).tar
+	mkdir -p dracut-$(VERSION)
+	cp $(manpages) dracut.html dracut-$(VERSION)
+	tar -rf dracut-$(VERSION).tar dracut-$(VERSION)/*.[0-9] dracut-$(VERSION)/dracut.html
+	rm -fr dracut-$(VERSION).tar.bz2 dracut-$(VERSION)
+	bzip2 -9 dracut-$(VERSION).tar
+	rm -f dracut-$(VERSION).tar

 rpm: dracut-$(VERSION).tar.bz2
 	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
 	cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \
-	$$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
+	LANG=C $$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
 	(cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
 	        --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
 		--define "_rpmdir $$PWD" -ba dracut.spec; ) && \
 	( mv "$$rpmbuild"/noarch/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr "$$rpmbuild"; ls *.rpm )

 syncheck:
-	@ret=0;for i in dracut-initramfs-restore.sh dracut-logger \
-                        modules.d/99base/init modules.d/*/*.sh; do \
+	@ret=0;for i in dracut-initramfs-restore.sh dracut-logger.sh \
+                        modules.d/99base/init.sh modules.d/*/*.sh; do \
                [ "$${i##*/}" = "module-setup.sh" ] && continue; \
-                [ "$${i##*/}" = "caps.sh" ] && continue; \
+                read line < "$$i"; [ "$${line#*bash*}" != "$$line" ] && continue; \
 		dash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret
-	@ret=0;for i in mkinitrd-dracut.sh dracut modules.d/02caps/caps.sh \
+	@ret=0;for i in *.sh mkinitrd-dracut.sh modules.d/*/*.sh \
 	                modules.d/*/module-setup.sh; do \
 		bash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret
@@ -99,17 +122,17 @@ check: all syncheck
 	$(MAKE) -C test check

 testimage: all
-	./dracut -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
+	./dracut.sh -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img 

 testimages: all
-	./dracut -l -a debug --kernel-only -f test-kernel-$(shell uname -r).img $(shell uname -r)
+	./dracut.sh -l -a debug --kernel-only -f test-kernel-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img 
-	./dracut -l -a debug --no-kernel -f test-dracut.img $(shell uname -r)
+	./dracut.sh -l -a debug --no-kernel -f test-dracut.img $(shell uname -r)
 	@echo wrote  test-dracut.img 

 hostimage: all
-	./dracut -H -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
+	./dracut.sh -H -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img 

 AUTHORS:
--- a/64
+++ b/64
@@ -1,3 +1,67 @@
+dracut-019
+==========
+- initqueue/online hook
+- fixes for ifcfg write out
+- rootfs-block: avoid remount when options don't change
+- Debian multiarch support
+- virtfs root filesystem support
+- cope with systemd-udevd
+- mount tmpfs with strictatime
+- include all kernel/drivers/net/phy drivers
+- add debug_on() and debug_off() functions
+- add arguments for source_hook() and source_all()
+- cleanup hook
+- plymouth: get consoledev from /sys/class/tty/console/active
+- experimental systemd dracut module for systemd in the initramfs
+- install xhci-hcd kernel module
+- dracut: new "--mount" option
+- lsinitrd: new option --printsize
+- ARM storage kernel modules added
+- s390 cms conf file support
+- /etc/initrd-release in the initrd
+- vlan support
+- full bonding and bridge support
+- removed scsi_wait_scan kernel module from standard install
+- support rd.luks.allow-discards and honor options in crypttab
+- lots of bugfixes
+
+dracut-018
+==========
+- lvm: ignore lvm mirrors
+- lsinitrd: handle LZMA images
+- iscsi: add rd.iscsi.param
+- iscsi: add iscsi interface binding
+- new module cms to read and handle z-Series cms config files
+- fixed fstab.sys handling
+- new dracut option "--tmpdir"
+- new dracut option "--no-hostonly"
+- nbd: name based nbd connects
+- converted manpage and documentation source to asciidoc
+- write-ifcfg fixes and cleanups
+- ifup is now done in the initqueue
+- netroot cleanup
+- initqueue/online is now for hooks, which require network
+- no more /tmp/root.info
+- 98pollcdrom: factored out the ugly cdrom polling in the main loop
+- simplified rd.luks.uuid testing
+- removed "egrep" and "ls" calls
+- speedup kernel module installation
+- make bzip2 optional
+- lots of bugfixes
+
+dracut-017
+==========
+- a _lot_ faster than dracut-016 in image creation
+- systemd service dracut-shutdown.service
+- livenet fixes
+- ssh-client module install fix
+- root=iscsi:... fixed
+- lots of restructuring and optimizing in dracut-functions.sh
+- usrmount: honor fs_passno in /etc/fstab
+- renamed all shell scripts to .sh
+- new option "--omit-drivers" and config option "omit_drivers"
+- hostonly mode fixups
+
 dracut-016
 ==========
 - fixed lsinitrd
--- a/8
+++ b/8
@@ -62,9 +62,17 @@ Git:
 	http://git.kernel.org/pub/scm/boot/dracut/dracut.git
 	https://git.kernel.org/pub/scm/boot/dracut/dracut.git

+	git://github.com/haraldh/dracut.git
+
+	git://dracut.git.sourceforge.net/gitroot/dracut/dracut
+
 Git Web:
 	http://git.kernel.org/?p=boot/dracut/dracut.git

+	https://haraldh@github.com/haraldh/dracut.git
+
+	http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut
+
 Git Web RSS Feed:
 	http://git.kernel.org/?p=boot/dracut/dracut.git;a=rss

--- a/README.modules
+++ b/README.modules
@@ -103,6 +103,9 @@ init has the following hook points to inject scripts:
   a timeout.

 /lib/dracut/hooks/pre-pivot/*.sh
+   scripts to run before latter initramfs cleanups
+
+/lib/dracut/hooks/cleanup/*.sh
   scripts to run before the real init is executed and the initramfs
   disappears
   All processes started before should be killed here.
--- a/README.testsuite
+++ b/README.testsuite
@@ -0,0 +1,11 @@
+For the testsuite to work, you will have to install at least the following software packages:
+dash
+asciidoc
+mdadm
+lvm2
+cryptsetup
+nfs-utils
+netbsd-iscsi
+nbd
+dhcp
+iscsi-initiator-utils
--- a/26
+++ b/26
@@ -1,24 +1,36 @@
-Current TODO list, broken into things which are relevant for the initramfs itself (/init et al) vs the generator. A lot of things are/should be marked with "FIXME" in the code
+Current TODO list, broken into things which are relevant for the
+initramfs itself (/init et al) vs the generator.
+A lot of things are/should be marked with "FIXME" in the code.
+
+Items are ordered in priority.
+
 INITRAMFS TODO

- The hard-coded list of udev rules that we care about is kind of lame.
+- fix btrfs subvolume mounting for /usr (fsck)
+- generate systemd unit dracut-initramfs-restore in /run/systemd dynamically
+- put "root=" parsing hooks in separate hook dir
+- call "root=" parsing hooks after getting new rootpath from dhcp
+- put mount hook in main initqueue loop
+- the hard-coded list of udev rules that we care about is kind of lame.
 - automatic kexec fallback
 - panic fallback
- fsck for $NEWROOT/usr

 GENERATOR TODO

- Default module specification could use some work
- udev rule copying, as mentioned above, is a bit too hard-coded
+- remove /proc/modules use /sys/module
+- add mechanism for module specific command line options
 - pkg-config integration, to make it easy for other packages to use us.
 - add recovery image creator (mkrecovery)
+- default module specification could use some work
+- udev rule copying, as mentioned above, is a bit too hard-coded

 CODE TODO
- document functions
+
+- document more functions
 - make function vars local, and prefix with "_"

 Future Enhancement Requests

 - run ssh server to enter crypto password or perform debugging (supported by debian)
- Bug 524727 - Dracut + encrypted root + networking
+- https://bugzilla.redhat.com/show_bug.cgi?id=524727 - Dracut + encrypted root + networking

--- a/dracut-catimages.8.asc
+++ b/dracut-catimages.8.asc
@@ -0,0 +1,59 @@
+DRACUT-CATIMAGES(8)
+===================
+:doctype: manpage
+:man source:   dracut
+:man manual:   dracut
+
+NAME
+----
+dracut-catimages - creates initial ramdisk image by concatenating images
+
+SYNOPSIS
+--------
+**dracut-catimages** [_OPTION_...] _<initramfs base image>_ [_<image>_...]
+
+DESCRIPTION
+-----------
+dracut-catimages creates an initial ramdisk image by concatenating several
+images from the command line and /boot/dracut/*.img
+
+OPTIONS
+-------
+**-f, --force**::
+    overwrite existing initramfs file.
+
+**-i, --imagedir**::
+    Directory with additional images to add (default: /boot/dracut/)
+
+**-o, --overlaydir**::
+    Overlay directory, which contains additional files that will be used to
+    create an additional image
+
+**--nooverlay**:: Do not use the overlay directory
+
+**--noimagedir**:: Do not use the additional image directory
+
+**-h, --help**:: display help text and exit.
+
+**--debug**:: output debug information of the build process
+
+**-v, --verbose**:: verbose output during the build process
+
+FILES
+-----
+_/boot/dracut/*.img_::
+    images to work with
+
+AUTHORS
+-------
+Harald Hoyer
+
+AVAILABILITY
+------------
+The dracut-catimages command is part of the dracut package and is available from
+link:$$https://dracut.wiki.kernel.org$$[https://dracut.wiki.kernel.org]
+
+SEE ALSO
+--------
+*dracut*(8)
+
--- a/dracut-catimages.8.xml
+++ b/dracut-catimages.8.xml
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
-<!-- lifted from troff+man by doclifter -->
-<refentry id='dracutcatimages8'>
-<refmeta>
-<refentrytitle>DRACUT-CATIMAGES</refentrytitle>
-<manvolnum>8</manvolnum>
-<refmiscinfo class='source'>June 2009</refmiscinfo>
-<refmiscinfo class='manual'>Linux</refmiscinfo>
-</refmeta>
-<refnamediv id='name'>
-<refname>dracut-catimages</refname>
-<refpurpose>creates initial ramdisk image by concatenating images</refpurpose>
-</refnamediv>
-<!-- body begins here -->
-<refsynopsisdiv id='synopsis'>
-<cmdsynopsis>
-  <command>dracut-catimages</command>    <arg choice='opt' rep='repeat'><replaceable>OPTION</replaceable></arg>
-    <arg choice='plain'><replaceable>&lt;initramfs</replaceable></arg>
-    <arg choice='plain'><replaceable>base</replaceable></arg>
-    <arg choice='plain'><replaceable>image&gt;</replaceable></arg>
-    <arg choice='opt' rep='repeat'><replaceable>&lt;image&gt;</replaceable></arg>
-    <sbr/>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1 id='description'><title>DESCRIPTION</title>
-<para><command>dracut-catimages</command>
-creates an initial ramdisk image by concatenating several images from the command
-line and /boot/dracut/*.img</para>
-
-</refsect1>
-
-<refsect1 id='options'><title>OPTIONS</title>
-<variablelist remap='TP'>
-  <varlistentry>
-  <term><option>-f</option>, <option>--force</option></term>
-  <listitem>
-<para>overwrite existing initramfs file.</para>
-  </listitem>
-  </varlistentry>
-  <varlistentry>
-  <term><option>-i</option>, <option>--imagedir</option></term>
-  <listitem>
-<para>Directory with additional images to add (default: /boot/dracut/)</para>
-  </listitem>
-  </varlistentry>
-  <varlistentry>
-  <term><option>-o</option>, <option>--overlaydir</option></term>
-  <listitem>
-<para>Overlay directory, which contains additional files that will be used to create an additional image</para>
-  </listitem>
-  </varlistentry>
-  <varlistentry>
-  <term><option>--nooverlay</option></term>
-  <listitem>
-<para>Do not use the overlay directory</para>
-  </listitem>
-  </varlistentry>
-  <varlistentry>
-  <term><option>--noimagedir</option></term>
-  <listitem>
-<para>Do not use the additional image directory</para>
-  </listitem>
-  </varlistentry>
-  <varlistentry>
-  <term><option>-h</option>, <option>--help</option></term>
-  <listitem>
-<para>display help text and exit.</para>
-  </listitem>
-  </varlistentry>
-  <varlistentry>
-  <term><option>--debug</option></term>
-  <listitem>
-<para>output debug information of the build process</para>
-  </listitem>
-  </varlistentry>
-  <varlistentry>
-  <term><option>-v</option>, <option>--verbose</option></term>
-  <listitem>
-<para>verbose output during the build process</para>
-
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id='files'><title>FILES</title>
-<variablelist remap='TP'>
-  <varlistentry>
-  <term><filename>/boot/dracut/*.img</filename></term>
-  <listitem>
-<para></para> <!-- FIXME: blank list item -->
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id='authors'><title>AUTHORS</title>
-<literallayout remap='.nf'>
-Harald Hoyer &lt;harald@redhat.com&gt;
-</literallayout> <!-- .fi -->
-</refsect1>
-
-<refsect1 id='availability'><title>AVAILABILITY</title>
-<para>The dracut-catimages command is part of the dracut package and is available from
-<ulink url='https://dracut.wiki.kernel.org'>https://dracut.wiki.kernel.org</ulink></para>
-
-</refsect1>
-
-<refsect1 id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry></para>
-</refsect1>
-</refentry>
-
--- a/dracut-catimages.sh
+++ b/dracut-catimages.sh
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -28,12 +28,21 @@ if ! [[ $dracutbasedir ]]; then
 fi

 if ! type dinfo >/dev/null 2>&1; then
-    . "$dracutbasedir/dracut-logger"
+    . "$dracutbasedir/dracut-logger.sh"
    dlog_init
 fi

+# export standard hookdirs
+[[ $hookdirs ]] || {
+    hookdirs="cmdline pre-udev pre-trigger netroot "
+    hookdirs+="initqueue initqueue/settled initqueue/online initqueue/finished initqueue/timeout "
+    hookdirs+="pre-mount pre-pivot cleanup mount "
+    hookdirs+="emergency shutdown-emergency shutdown "
+    export hookdirs
+}
+
 # Generic substring function.  If $2 is in $1, return 0.
-strstr() { [[ $1 =~ $2 ]]; }
+strstr() { [ "${1#*$2*}" != "$1" ]; }

 # Create all subdirectories for given path without creating the last element.
 # $1 = path
@@ -66,6 +75,8 @@ vercmp() {
    esac
 }

+# is_func <command>
+# Check whether $1 is a function.
 is_func() {
    [[ $(type -t $1) = "function" ]]
 }
@@ -82,6 +93,12 @@ print_vars() {
    done
 }

+# normalize_path <path>
+# Prints the normalized path, where it removes any duplicated
+# and trailing slashes.
+# Example:
+# $ normalize_path ///test/test//
+# /test/test
 normalize_path() {
    shopt -q -s extglob
    set -- "${1//+(\/)//}"
@@ -89,10 +106,15 @@ normalize_path() {
    echo "${1%/}"
 }

+# convert_abs_rel <from> <to>
+# Prints the relative path, when creating a symlink to <to> from <from>.
+# Example:
+# $ convert_abs_rel /usr/bin/test /bin/test-2
+# ../../bin/test-2
+# $ ln -s $(convert_abs_rel /usr/bin/test /bin/test-2) /usr/bin/test
 convert_abs_rel() {
-    local __current __absolute __abssize __cursize __newpath __oldifs
+    local __current __absolute __abssize __cursize __newpath
    local -i __i __level
-#    PS4='${BASH_SOURCE}@${LINENO}(${FUNCNAME[0]}): ';

    set -- "$(normalize_path "$1")" "$(normalize_path "$2")"

@@ -102,11 +124,8 @@ convert_abs_rel() {
    # corner case #2 - own dir link
    [[ "${1%/*}" == "$2" ]] && { echo "."; return; }

-    __oldifs="$IFS"
-    IFS="/"
-    __current=($1)
-    __absolute=($2)
-    IFS="$__oldifs"
+    IFS="/" __current=($1)
+    IFS="/" __absolute=($2)

    __abssize=${#__absolute[@]}
    __cursize=${#__current[@]}
@@ -141,43 +160,45 @@ convert_abs_rel() {
    echo "$__newpath"
 }

+# get_fs_env <device>
+# Get and set the ID_FS_TYPE and ID_FS_UUID variable from udev for a device.
+# Example:
+# $ get_fs_env /dev/sda2; echo $ID_FS_TYPE; echo $ID_FS_UUID
+# ext4
+# 551a39aa-4ae9-4e70-a262-ef665cadb574
 get_fs_env() {
+    local evalstr
+    local found
+
    [[ $1 ]] || return
    unset ID_FS_TYPE
    unset ID_FS_UUID
-    eval $(udevadm info --query=env --name=$1|egrep 'ID_FS_(TYPE|UUID)=')
-    [[ $ID_FS_TYPE ]] && return
-
-    if [[ -x /lib/udev/vol_id ]]; then
-        eval $(/lib/udev/vol_id --export $1)
-    elif find_binary blkid >/dev/null; then
-        eval $(blkid -o udev $1)
-    else
+    if evalstr=$(udevadm info --query=env --name=$1 \
+        | { while read line; do
+            strstr "$line" "DEVPATH" && found=1;
+            strstr "$line" "ID_FS_TYPE=" && { echo $line; exit 0;}
+            done; [[ $found ]] && exit 0; exit 1; }) ; then
+        eval $evalstr
+        [[ $ID_FS_TYPE ]] && return 0
        return 1
    fi
+
+    # Fallback, if we don't have udev information
+    if find_binary blkid >/dev/null; then
+        eval $(blkid -o udev $1 \
+            | while read line; do
+                strstr "$line" "ID_FS_TYPE=" && echo $line;
+                done)
+        [[ $ID_FS_TYPE ]] && return 0
+    fi
+    return 1
 }

-get_fs_type() (
-    [[ $1 ]] || return
-    if [[ $1 != ${1#/dev/block/nfs:} ]] \
-        || [[ $1 != ${1#/dev/block/nfs3:} ]] \
-        || [[ $1 != ${1#/dev/block/nfs4:} ]]; then
-        echo "nfs"
-        return
-    fi
-    if get_fs_env $1; then
-        echo $ID_FS_TYPE
-        return
-    fi
-    find_dev_fstype $1
-)
-
-get_fs_uuid() (
-    get_fs_env $1 || return
-    echo $ID_FS_UUID
-)
-
-
+# get_maj_min <device>
+# Prints the major and minor of a device node.
+# Example:
+# $ get_maj_min /dev/sda2
+# 8:2
 get_maj_min() {
    local _dev
    _dev=$(stat -L -c '$((0x%t)):$((0x%T))' "$1" 2>/dev/null)
@@ -185,6 +206,16 @@ get_maj_min() {
    echo $_dev
 }

+# find_block_device <mountpoint>
+# Prints the major and minor number of the block device
+# for a given mountpoint.
+# Unless $use_fstab is set to "yes" the functions
+# uses /proc/self/mountinfo as the primary source of the
+# information and only falls back to /etc/fstab, if the mountpoint
+# is not found there.
+# Example:
+# $ find_block_device /usr
+# 8:4
 find_block_device() {
    local _x _mpt _majmin _dev _fs _maj _min
    if [[ $use_fstab != yes ]]; then
@@ -205,6 +236,8 @@ find_block_device() {
    fi
    # fall back to /etc/fstab
    while read _dev _mpt _fs _x; do
+        [ "${_dev%%#*}" != "$_dev" ] && continue
+
        if [[ $_mpt = $1 ]]; then
            [[ $_fs = nfs ]] && { echo $_dev; return 0;}
            [[ $_fs = nfs3 ]] && { echo $_dev; return 0;}
@@ -212,17 +245,21 @@ find_block_device() {
            [[ $_dev != ${_dev#UUID=} ]] && _dev=/dev/disk/by-uuid/${_dev#UUID=}
            [[ $_dev != ${_dev#LABEL=} ]] && _dev=/dev/disk/by-label/${_dev#LABEL=}
            [[ -b $_dev ]] || return 1 # oops, not a block device.
-            ls -nLl "$_dev" | {
-                read _x _x _x _x _maj _min _x
-                _maj=${_maj//,/}
-                echo $_maj:$_min
-            } && return 0
+            get_maj_min "$_dev" && return 0
        fi
    done < /etc/fstab

    return 1
 }

+# find_dev_fstype <device>
+# Echo the filesystem type for a given device.
+# /proc/self/mountinfo is taken as the primary source of information
+# and /etc/fstab is used as a fallback.
+# No newline is appended!
+# Example:
+# $ find_dev_fstype /dev/sda2;echo
+# ext4
 find_dev_fstype() {
    local _x _mpt _majmin _dev _fs _maj _min
    while read _x _x _majmin _x _mpt _x _x _fs _dev _x; do
@@ -244,11 +281,15 @@ find_dev_fstype() {
 # finds the major:minor of the block device backing the root filesystem.
 find_root_block_device() { find_block_device /; }

+# for_each_host_dev_fs <func>
+# Execute "<func> <dev> <filesystem>" for every "<dev>|<fs>" pair found
+# in ${host_fs_types[@]}
 for_each_host_dev_fs()
 {
    local _func="$1"
    local _dev
    local _fs
+    local _ret=1
    for f in ${host_fs_types[@]}; do
        OLDIFS="$IFS"
        IFS="|"
@@ -257,8 +298,9 @@ for_each_host_dev_fs()
        _dev="$1"
        [[ -b "$_dev" ]] || continue
        _fs="$2"
-        $_func $_dev $_fs
+        $_func $_dev $_fs && _ret=0
    done
+    return $_ret
 }

 # Walk all the slave relationships for a given block device.
@@ -281,11 +323,6 @@ check_block_and_slaves() {
    return 1
 }

-get_numeric_dev() {
-    local _x _maj _min
-    ls -lH "$1" | { read _x _x _x _x _maj _min _x; printf "%d:%d" ${_maj%%,} $_min; }
-}
-
 # ugly workaround for the lvm design
 # There is no volume group device,
 # so, there are no slave devices for volume groups.
@@ -295,7 +332,7 @@ get_numeric_dev() {
 check_vol_slaves() {
    local _lv _vg _pv
    for i in /dev/mapper/*; do
-        _lv=$(get_numeric_dev $i)
+        _lv=$(get_maj_min $i)
        if [[ $_lv = $2 ]]; then
            _vg=$(lvm lvs --noheadings -o vg_name $i 2>/dev/null)
            # strip space
@@ -303,7 +340,7 @@ check_vol_slaves() {
            if [[ $_vg ]]; then
                for _pv in $(lvm vgs --noheadings -o pv_name "$_vg" 2>/dev/null)
                do
-                    check_block_and_slaves $1 $(get_numeric_dev $_pv) && return 0
+                    check_block_and_slaves $1 $(get_maj_min $_pv) && return 0
                done
            fi
        fi
@@ -326,21 +363,14 @@ inst_dir() {

    # iterate over parent directories
    for _file in $_dir; do
+        [[ -e "${initdir}/$_file" ]] && continue
        if [[ -L $_file ]]; then
-            # create link as the original
-            local target=$(readlink -f "$_file")
-            # resolve relative path and recursively install destination
-            [[ $target == ${target#/} ]] && target="$(dirname "$_file")/$target"
-            inst_dir "$target"
            inst_symlink "$_file"
        else
-            [[ -h ${initdir}/$_file ]] && _file=$(readlink "${initdir}/$_file")
            # create directory
-            [[ -e "${initdir}/$_file" ]] || mkdir -m 0755 -p "${initdir}/$_file" || return 1
-            if [[ -d "$_file" ]]; then
-                chmod --reference="$_file" "${initdir}/$_file"
-                chmod u+w "${initdir}/$_file"
-            fi
+            mkdir -m 0755 -p "${initdir}/$_file" || return 1
+            [[ -e "$_file" ]] && chmod --reference="$_file" "${initdir}/$_file"
+            chmod u+w "${initdir}/$_file"
        fi
    done
 }
@@ -356,8 +386,8 @@ inst_simple() {
    local _src=$1 target="${2:-$1}"
    if ! [[ -d ${initdir}/$target ]]; then
        [[ -e ${initdir}/$target ]] && return 0
-        [[ -h ${initdir}/$target ]] && return 0
-        inst_dir "${target%/*}"
+        [[ -L ${initdir}/$target ]] && return 0
+        [[ -d "${initdir}/${target%/*}" ]] || inst_dir "${target%/*}"
    fi
    # install checksum files also
    if [[ -e "${_src%/*}/.${_src##*/}.hmac" ]]; then
@@ -407,6 +437,7 @@ inst_library() {
        _reallib=$(readlink -f "$_src")
        inst_simple "$_reallib" "$_reallib"
        inst_dir "${_dest%/*}"
+        [[ -d "${_dest%/*}" ]] && _dest=$(readlink -f "${_dest%/*}")/${_dest##*/}
        ln -sfn $(convert_abs_rel "${_dest}" "${_reallib}") "${initdir}/${_dest}"
    else
        inst_simple "$_src" "$_dest"
@@ -425,7 +456,7 @@ inst_library() {
 # search in the usual places to find the binary.
 find_binary() {
    if [[ -z ${1##/*} ]]; then
-        if [[ -x $1 ]] || ldd $1 &>/dev/null; then
+        if [[ -x $1 ]] || { strstr "$1" ".so" && ldd $1 &>/dev/null; };  then
            echo $1
            return 0
        fi
@@ -437,47 +468,33 @@ find_binary() {
 # Same as above, but specialized to install binary executables.
 # Install binary executable, and all shared library dependencies, if any.
 inst_binary() {
-    local _bin _target _f _self _so_regex _lib_regex _tlibdir _base _file _line
-
+    local _bin _target
    _bin=$(find_binary "$1") || return 1
    _target=${2:-$_bin}
    [[ -e $initdir/$_target ]] && return 0
-    inst_symlink $_bin $_target && return 0
-
-    # If the binary being installed is also a library, add it to the loop.
-    _so_regex='([^ ]*/lib[^/]*/[^ ]*\.so[^ ]*)'
-    [[ $_bin =~ $_so_regex ]] && _self="\t${_bin##*/} => ${_bin} (0x0)\n"
-
-    _lib_regex='^(/lib[^/]*).*'
+    [[ -L $_bin ]] && inst_symlink $_bin $_target && return 0
+    local _file _line
+    local _so_regex='([^ ]*/lib[^/]*/[^ ]*\.so[^ ]*)'
    # I love bash!
-    { LC_ALL=C ldd $_bin 2>/dev/null; echo -en "$_self"; } | while read _line; do
-        [[ $_line = 'not a dynamic executable' ]] && return 1
+    LC_ALL=C ldd "$_bin" 2>/dev/null | while read _line; do
+        [[ $_line = 'not a dynamic executable' ]] && break
+
+        if [[ $_line =~ $_so_regex ]]; then
+            _file=${BASH_REMATCH[1]}
+            [[ -e ${initdir}/$_file ]] && continue
+            inst_library "$_file"
+            continue
+        fi
+
        if [[ $_line =~ not\ found ]]; then
            dfatal "Missing a shared library required by $_bin."
            dfatal "Run \"ldd $_bin\" to find out what it is."
+            dfatal "$_line"
            dfatal "dracut cannot create an initrd."
            exit 1
        fi
-        [[ $_line =~ $_so_regex ]] || continue
-        _file=${BASH_REMATCH[1]}
-        [[ -e ${initdir}/$_file ]] && continue
-
-        # See if we are loading an optimized version of a shared lib.
-        if [[ $_file =~ $_lib_regex ]]; then
-           _tlibdir=${BASH_REMATCH[1]}
-           _base=${_file##*/}
-           # Prefer nosegneg libs to unoptimized ones.
-            for _f in "$_tlibdir/i686/nosegneg"; do
-                [[ -e $_f/$_base ]] || continue
-                inst_library $_f/$_base
-                break
-            done
-        fi
-        inst_library "$_file"
    done
-
-    # Install the binary if it wasn't handled in the above loop.
-    [[ -z $_self ]] && inst_simple "$_bin" "$_target"
+    inst_simple "$_bin" "$_target"
 }

 # same as above, except for shell scripts.
@@ -502,33 +519,62 @@ inst_symlink() {
    [[ -L $1 ]] || return 1
    [[ -L $initdir/$_target ]] && return 0
    _realsrc=$(readlink -f "$_src")
-    [[ -d ${_target%/*} ]] && _target=$(readlink -f ${_target%/*})/${_target##*/}
-    if [[ -d $_realsrc ]]; then
-        inst_dir "$_realsrc"
-    else
-        {
-            local _t
-            _t=${2:-$1}
-            _t="${_t%/*}"
-            [[ $_t ]] && inst_dir "$_t"
+    if ! [[ -e $initdir/$_realsrc ]]; then
+        if [[ -d $_realsrc ]]; then
+            inst_dir "$_realsrc"
+        else
            inst "$_realsrc"
-        }
-    fi
-    if [[ -e "${_src}" ]]; then
-        ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target"
-    else
-        ln -sfn "$_realsrc" "$initdir/$_target"
+        fi
    fi
+    [[ ! -e $initdir/${_target%/*} ]] && inst_dir "${_target%/*}"
+    [[ -d ${_target%/*} ]] && _target=$(readlink -f ${_target%/*})/${_target##*/}
+    ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target"
 }

+udevdir=$(pkg-config udev --variable=udevdir)
+if ! [[ -d "$udevdir" ]]; then
+    [[ -d /lib/udev ]] && udevdir=/lib/udev
+    [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev
+fi
+
 # attempt to install any programs specified in a udev rule
 inst_rule_programs() {
    local _prog _bin

    if grep -qE 'PROGRAM==?"[^ "]+' "$1"; then
        for _prog in $(grep -E 'PROGRAM==?"[^ "]+' "$1" | sed -r 's/.*PROGRAM==?"([^ "]+).*/\1/'); do
-            if [ -x /lib/udev/$_prog ]; then
-                _bin=/lib/udev/$_prog
+            if [ -x ${udevdir}/$_prog ]; then
+                _bin=${udevdir}/$_prog
+            else
+                _bin=$(find_binary "$_prog") || {
+                    dinfo "Skipping program $_prog using in udev rule $(basename $1) as it cannot be found"
+                    continue;
+                }
+            fi
+
+            #dinfo "Installing $_bin due to it's use in the udev rule $(basename $1)"
+            dracut_install "$_bin"
+        done
+    fi
+    if grep -qE 'RUN==?"[^ "]+' "$1"; then
+        for _prog in $(grep -E 'RUN==?"[^ "]+' "$1" | sed -r 's/.*RUN==?"([^ "]+).*/\1/'); do
+            if [ -x ${udevdir}/$_prog ]; then
+                _bin=${udevdir}/$_prog
+            else
+                _bin=$(find_binary "$_prog") || {
+                    dinfo "Skipping program $_prog using in udev rule $(basename $1) as it cannot be found"
+                    continue;
+                }
+            fi
+
+            #dinfo "Installing $_bin due to it's use in the udev rule $(basename $1)"
+            dracut_install "$_bin"
+        done
+    fi
+    if grep -qE 'PROGRAM==?"[^ "]+' "$1"; then
+        for _prog in $(grep -E 'IMPORT==?"[^ "]+' "$1" | sed -r 's/.*IMPORT==?"([^ "]+).*/\1/'); do
+            if [ -x ${udevdir}/$_prog ]; then
+                _bin=${udevdir}/$_prog
            else
                _bin=$(find_binary "$_prog") || {
                    dinfo "Skipping program $_prog using in udev rule $(basename $1) as it cannot be found"
@@ -547,23 +593,23 @@ inst_rule_programs() {
 inst_rules() {
    local _target=/etc/udev/rules.d _rule _found

-    inst_dir "/lib/udev/rules.d"
+    inst_dir "${udevdir}/rules.d"
    inst_dir "$_target"
    for _rule in "$@"; do
        if [ "${rule#/}" = "$rule" ]; then
-            for r in /lib/udev/rules.d /etc/udev/rules.d; do
+            for r in ${udevdir}/rules.d /etc/udev/rules.d; do
                if [[ -f $r/$_rule ]]; then
                    _found="$r/$_rule"
-                    inst_simple "$_found"
                    inst_rule_programs "$_found"
+                    inst_simple "$_found"
                fi
            done
        fi
        for r in '' ./ $dracutbasedir/rules.d/; do
            if [[ -f ${r}$_rule ]]; then
                _found="${r}$_rule"
-                inst_simple "$_found" "$_target/${_found##*/}"
                inst_rule_programs "$_found"
+                inst_simple "$_found" "$_target/${_found##*/}"
            fi
        done
        [[ $_found ]] || dinfo "Skipping udev rule: $_rule"
@@ -590,12 +636,6 @@ inst() {
    return 1
 }

-[[ $hookdirs ]] || {
-    hookdirs="cmdline pre-udev pre-trigger netroot initqueue pre-mount"
-    hookdirs+=" pre-pivot mount emergency shutdown-emergency shutdown cleanup"
-    export hookdirs
-}
-
 # install function specialized for hooks
 # $1 = type of hook, $2 = hook priority (lower runs first), $3 = hook
 # All hooks should be POSIX/SuS compliant, they will be sourced by init.
@@ -639,6 +679,9 @@ inst_any() {
    return 1
 }

+# dracut_install [-o ] <file> [<file> ... ]
+# Install <file> to the initramfs image
+# -o optionally install the <file> and don't fail, if it is not there
 dracut_install() {
    local _optional=no
    if [[ $1 = '-o' ]]; then
@@ -659,6 +702,34 @@ dracut_install() {
    done
 }

+
+# inst_libdir_file [-n <pattern>] <file> [<file>...]
+# Install a <file> located on a lib directory to the initramfs image
+# -n <pattern> install non-matching files
+inst_libdir_file() {
+    if [[ "$1" == "-n" ]]; then
+        local _pattern=$1
+        shift 2
+        for _dir in $libdirs; do
+            for _i in "$@"; do
+                for _f in "$_dir"/$_i; do
+                    [[ "$_i" =~ $_pattern ]] || continue
+                    [[ -e "$_i" ]] && dracut_install "$_i"
+                done
+            done
+        done
+    else
+        for _dir in $libdirs; do
+            for _i in "$@"; do
+                for _f in "$_dir"/$_i; do
+                    [[ -e "$_f" ]] && dracut_install "$_f"
+                done
+            done
+        done
+    fi
+}
+
+
 # install function decompressing the target and handling symlinks
 # $@ = list of compressed (gz or bz2) files or symlinks pointing to such files
 #
@@ -706,6 +777,10 @@ inst_opt_decompress() {
    done
 }

+# module_check <dracut module>
+# execute the check() function of module-setup.sh of <dracut module>
+# or the "check" script, if module-setup.sh is not found
+# "check $hostonly" is called
 module_check() {
    local _moddir=$(echo ${dracutbasedir}/modules.d/??${1})
    local _ret
@@ -732,62 +807,10 @@ module_check() {
    return $_ret
 }

-module_depends() {
-    local _moddir=$(echo ${dracutbasedir}/modules.d/??${1})
-    local _ret
-    [[ -d $_moddir ]] || return 1
-    if [[ ! -f $_moddir/module-setup.sh ]]; then
-        # if we do not have a check script, we have no deps
-        [[ -x $_moddir/check ]] || return 0
-        $_moddir/check -d
-        return $?
-    else
-        unset check depends install installkernel
-        . $_moddir/module-setup.sh
-        is_func depends || return 0
-        depends
-        _ret=$?
-        unset check depends install installkernel
-        return $_ret
-    fi
-}
-
-module_install() {
-    local _moddir=$(echo ${dracutbasedir}/modules.d/??${1})
-    local _ret
-    [[ -d $_moddir ]] || return 1
-    if [[ ! -f $_moddir/module-setup.sh ]]; then
-        [[ -x $_moddir/install ]] && . "$_moddir/install"
-        return $?
-    else
-        unset check depends install installkernel
-        . $_moddir/module-setup.sh
-        is_func install || return 0
-        install
-        _ret=$?
-        unset check depends install installkernel
-        return $_ret
-    fi
-}
-
-module_installkernel() {
-    local _moddir=$(echo ${dracutbasedir}/modules.d/??${1})
-    local _ret
-    [[ -d $_moddir ]] || return 1
-    if [[ ! -f $_moddir/module-setup.sh ]]; then
-        [[ -x $_moddir/installkernel ]] && . "$_moddir/installkernel"
-        return $?
-    else
-        unset check depends install installkernel
-        . $_moddir/module-setup.sh
-        is_func installkernel || return 0
-        installkernel
-        _ret=$?
-        unset check depends install installkernel
-        return $_ret
-    fi
-}
-
+# module_check_mount <dracut module>
+# execute the check() function of module-setup.sh of <dracut module>
+# or the "check" script, if module-setup.sh is not found
+# "mount_needs=1 check 0" is called
 module_check_mount() {
    local _moddir=$(echo ${dracutbasedir}/modules.d/??${1})
    local _ret
@@ -810,6 +833,74 @@ module_check_mount() {
    return $_ret
 }

+# module_depends <dracut module>
+# execute the depends() function of module-setup.sh of <dracut module>
+# or the "depends" script, if module-setup.sh is not found
+module_depends() {
+    local _moddir=$(echo ${dracutbasedir}/modules.d/??${1})
+    local _ret
+    [[ -d $_moddir ]] || return 1
+    if [[ ! -f $_moddir/module-setup.sh ]]; then
+        # if we do not have a check script, we have no deps
+        [[ -x $_moddir/check ]] || return 0
+        $_moddir/check -d
+        return $?
+    else
+        unset check depends install installkernel
+        . $_moddir/module-setup.sh
+        is_func depends || return 0
+        depends
+        _ret=$?
+        unset check depends install installkernel
+        return $_ret
+    fi
+}
+
+# module_install <dracut module>
+# execute the install() function of module-setup.sh of <dracut module>
+# or the "install" script, if module-setup.sh is not found
+module_install() {
+    local _moddir=$(echo ${dracutbasedir}/modules.d/??${1})
+    local _ret
+    [[ -d $_moddir ]] || return 1
+    if [[ ! -f $_moddir/module-setup.sh ]]; then
+        [[ -x $_moddir/install ]] && . "$_moddir/install"
+        return $?
+    else
+        unset check depends install installkernel
+        . $_moddir/module-setup.sh
+        is_func install || return 0
+        install
+        _ret=$?
+        unset check depends install installkernel
+        return $_ret
+    fi
+}
+
+# module_installkernel <dracut module>
+# execute the installkernel() function of module-setup.sh of <dracut module>
+# or the "installkernel" script, if module-setup.sh is not found
+module_installkernel() {
+    local _moddir=$(echo ${dracutbasedir}/modules.d/??${1})
+    local _ret
+    [[ -d $_moddir ]] || return 1
+    if [[ ! -f $_moddir/module-setup.sh ]]; then
+        [[ -x $_moddir/installkernel ]] && . "$_moddir/installkernel"
+        return $?
+    else
+        unset check depends install installkernel
+        . $_moddir/module-setup.sh
+        is_func installkernel || return 0
+        installkernel
+        _ret=$?
+        unset check depends install installkernel
+        return $_ret
+    fi
+}
+
+# check_mount <dracut module>
+# check_mount checks, if a dracut module is needed for the given
+# device and filesystem types in "${host_fs_types[@]}"
 check_mount() {
    local _mod=$1
    local _moddir=$(echo ${dracutbasedir}/modules.d/??${1})
@@ -849,6 +940,10 @@ check_mount() {
    return 0
 }

+# check_module <dracut module> [<use_as_dep>]
+# check if a dracut module is to be used in the initramfs process
+# if <use_as_dep> is set, then the process also keeps track
+# that the modules were checked for the dependency tracking process
 check_module() {
    local _mod=$1
    local _moddir=$(echo ${dracutbasedir}/modules.d/??${1})
@@ -900,6 +995,8 @@ check_module() {
    return 0
 }

+# for_each_module_dir <func>
+# execute "<func> <dracut module> 1"
 for_each_module_dir() {
    local _modcheck
    local _mod
@@ -925,19 +1022,29 @@ for_each_module_dir() {
 # $1 = full path to kernel module to install
 install_kmod_with_fw() {
    # no need to go further if the module is already installed
+
    [[ -e "${initdir}/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" ]] \
        && return 0

+    [[ -e "$initdir/.kernelmodseen/${1##*/}" ]] && return 0
+
    if [[ $omit_drivers ]]; then
        local _kmod=${1##*/}
        _kmod=${_kmod%.ko}
        _kmod=${_kmod/-/_}
-        if strstr " $omit_drivers " " $_kmod " ; then
+        if [[ "$_kmod" =~ $omit_drivers ]]; then
+            dinfo "Omitting driver $_kmod"
+            return 1
+        fi
+        if [[ "${1##*/lib/modules/$kernel/}" =~ $omit_drivers ]]; then
            dinfo "Omitting driver $_kmod"
            return 1
        fi
    fi

+    [ -d "$initdir/.kernelmodseen" ] && \
+        > "$initdir/.kernelmodseen/${1##*/}"
+
    inst_simple "$1" "/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" \
        || return $?

@@ -1037,40 +1144,46 @@ find_kernel_modules () {
    find_kernel_modules_by_path  drivers
 }

+# instmods [-c] <kernel module> [<kernel module> ... ]
+# instmods [-c] <kernel subsystem>
 # install kernel modules along with all their dependencies.
+# <kernel subsystem> can be e.g. "=block" or "=drivers/usb/storage"
 instmods() {
    [[ $no_kernel = yes ]] && return
    # called [sub]functions inherit _fderr
    local _fderr=9
+    local _check=no
+    if [[ $1 = '-c' ]]; then
+        _check=yes
+        shift
+    fi

    function inst1mod() {
-        local _mod="$1"
+        local _ret=0 _mod="$1"
        case $_mod in
            =*)
-                # This introduces 2 incompatible meanings for =* arguments
-                # to instmods.  We need to decide which one to keep.
-                if [[ $_mod = =ata && -f $srcmods/modules.block ]]; then
-                    ( [[ "$_mpargs" ]] && echo $_mpargs
-                      egrep 'ata|ahci' "${srcmods}/modules.block" ) \
-                    | instmods
-                elif [ -f $srcmods/modules.${_mod#=} ]; then
+                if [ -f $srcmods/modules.${_mod#=} ]; then
                    ( [[ "$_mpargs" ]] && echo $_mpargs
                      cat "${srcmods}/modules.${_mod#=}" ) \
                    | instmods
                else
                    ( [[ "$_mpargs" ]] && echo $_mpargs
-                      find "$srcmods" -path "*/${_mod#=}/*" ) \
+                      find "$srcmods" -path "*/${_mod#=}/*" -printf '%f\n' ) \
                    | instmods
                fi
                ;;
            --*) _mpargs+=" $_mod" ;;
            i2o_scsi) return ;; # Do not load this diagnostic-only module
-            *)  _mod=${_mod##*/}
-
+            *)
+                _mod=${_mod##*/}
                # if we are already installed, skip this module and go on
                # to the next one.
-                [[ -f $initdir/$1 ]] && return
+                [[ -f "$initdir/.kernelmodseen/${_mod%.ko}.ko" ]] && return

+                if [[ $omit_drivers ]] && [[ "$1" =~ $omit_drivers ]]; then
+                    dinfo "Omitting driver ${_mod##$srcmods}"
+                    return
+                fi
                # If we are building a host-specific initramfs and this
                # module is not already loaded, move on to the next one.
                [[ $hostonly ]] && ! grep -qe "\<${_mod//-/_}\>" /proc/modules \
@@ -1090,25 +1203,40 @@ instmods() {
                ((_ret+=$?))
                ;;
        esac
-    }
-
-    function instmods_1() {
-        local _ret=0 _mod _mpargs
-        if (($# == 0)); then  # filenames from stdin
-            while read _mod; do
-                inst1mod "${_mod%.ko*}"
-            done
-        fi
-        while (($# > 0)); do  # filenames as arguments
-            inst1mod ${1%.ko*}
-            shift
-        done
        return $_ret
    }

+    function instmods_1() {
+        local _mod _mpargs
+        if (($# == 0)); then  # filenames from stdin
+            while read _mod; do
+                inst1mod "${_mod%.ko*}" || {
+                    if [ "$_check" = "yes" ]; then
+                        dfatal "Failed to install $_mod"
+                        return 1
+                    fi
+                }
+            done
+        fi
+        while (($# > 0)); do  # filenames as arguments
+            inst1mod ${1%.ko*} || {
+                if [ "$_check" = "yes" ]; then
+                    dfatal "Failed to install $1"
+                    return 1
+                fi
+            }
+            shift
+        done
+        return 0
+    }
+
+    local _ret _filter_not_found='FATAL: Module .* not found.'
+    set -o pipefail
    # Capture all stderr from modprobe to _fderr. We could use {var}>...
    # redirections, but that would make dracut require bash4 at least.
    eval "( instmods_1 \"\$@\" ) ${_fderr}>&1" \
-    | egrep -v 'FATAL: Module .* not found.' | derror
-    return $?
+    | while read line; do [[ "$line" =~ $_filter_not_found ]] || echo $line;done | derror
+    _ret=$?
+    set +o pipefail
+    return $_ret
 }
--- a/716
+++ b/716
@@ -1,716 +0,0 @@
-#!/bin/bash --norc
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-#
-# Copyright 2005-2009 Red Hat, Inc.  All rights reserved.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# code taken from mkinitrd
-#
-#. /usr/libexec/initrd-functions
-
-IF_verbose=""
-function set_verbose() {
-    case $1 in
-        1|true|yes|on)
-            IF_verbose="-v"
-            ;;
-        0|false|no|off)
-            IF_verbose=""
-            ;;
-    esac
-}
-
-function is_verbose() {
-    [ -n "$IF_verbose" ] && return 0
-    return 1
-}
-
-function get_verbose() {
-    echo "$IF_verbose"
-    is_verbose
-}
-
-
-function get_numeric_dev() {
-    (
-        fmt="%d:%d"
-        if [ "$1" == "hex" ]; then
-            fmt="%x:%x"
-        fi
-        ls -lH "$2" | awk '{ sub(/,/, "", $5); printf("'"$fmt"'", $5, $6); }'
-    ) 2>/dev/null
-}
-
-
-function error() {
-    echo "$@" >&2
-}
-
-function vecho() {
-    is_verbose && echo "$@"
-}
-
-# module dep finding and installation functions
-moduledep() {
-    MPARGS=""
-    if [ "$1" == "--ignore-install" ]; then
-        MPARGS="$MPARGS --ignore-install"
-        shift
-    fi
-    vecho -n "Looking for deps of module $1"
-    deps=""
-    deps=$(modprobe $MPARGS --set-version $kernel --quiet --show-depends $1 | awk '/^insmod / { print gensub(".*/","","g",$2) }' | while read foo ; do [ "${foo%%.ko}" != "$1" ] && echo -n "${foo%%.ko} " ; done)
-    [ -n "$deps" ] && vecho ": $deps" || vecho
-}
-
-export MALLOC_PERTURB_=204
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
-export PATH
-
-# Set the umask. For iscsi, the initrd can contain plaintext
-# password (chap secret), so only allow read by owner.
-umask 077
-
-VERSION=6.0.87
-
-PROBE="yes"
-MODULES=""
-GRAPHICSMODS=""
-PREMODS=""
-DMRAIDS=""
-ncryptodevs=0
-ncryptoparts=0
-ncryptolvs=0
-ncryptoraids=0
-root=""
-scsi_wait_scan="no"
-
-NET_LIST=""
-LD_SO_CONF=/etc/ld.so.conf
-LD_SO_CONF_D=/etc/ld.so.conf.d/
-
-[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd
-
-CONFMODS="$MODULES"
-MODULES=""
-ARCH=$(uname -m | sed -e 's/s390x/s390/')
-
-compress=1
-allowmissing=""
-target=""
-kernel=""
-force=""
-img_vers=""
-builtins=""
-modulefile=/etc/modules.conf
-[ "$ARCH" != "s390" ] && withusb=1
-rc=0
-nolvm=""
-nodmraid=""
-
-IMAGESIZE=8000
-PRESCSIMODS=""
-fstab="/etc/fstab"
-
-vg_list=""
-net_list="$NET_LIST"
-
-usage () {
-    if [ "$1" == "-n" ]; then
-        cmd=echo
-    else
-        cmd=error
-    fi
-
-    $cmd "usage: `basename $0` [--version] [--help] [-v] [-f]"
-
-    if [ "$1" == "-n" ]; then
-        exit 0
-    else
-        exit 1
-    fi
-}
-
-
-qpushd() {
-    pushd "$1" >/dev/null 2>&1
-}
-
-qpopd() {
-    popd >/dev/null 2>&1
-}
-
-
-freadlink() {
-    readlink -f "$1"
-}
-
-resolve_device_name() {
-    if [ -z "${1##UUID=*}" ]; then
-        real=$(freadlink /dev/disk/by-uuid/${1##UUID=})
-        [ -b $real ] && { echo $real; return; }
-    fi
-    if [ -z "${1##LABEL=*}" ]; then
-        real=$(freadlink /dev/disk/by-label/${1##LABEL=})
-        [ -b $real ] && { echo $real; return; }
-    fi
-    echo "$1"
-}
-
-finddevnoinsys() {
-    majmin="$1"
-    if [ -n "$majmin" ]; then
-        dev=$(for x in /sys/block/* ; do find $x/ -name dev ; done | while read device ; do \
-            echo "$majmin" | cmp -s $device && echo $device ; done)
-        if [ -n "$dev" ]; then
-            dev=${dev%%/dev}
-            dev=${dev%%/}
-            echo "$dev"
-            return 0
-        fi
-    fi
-    return 1
-}
-
-finddevicedriverinsys () {
-    if is_iscsi $PWD; then
-        handleiscsi "$PWD"
-        return
-    fi
-    while [ "$PWD" != "/sys/devices" ]; do
-        deps=
-        if [ -f modalias ]; then
-            MODALIAS=$(cat modalias)
-            if [ "${MODALIAS::7}" == "scsi:t-" ]; then
-                scsi_wait_scan=yes
-            fi
-            moduledep $MODALIAS
-            unset MODALIAS
-        fi
-
-        cd ..
-    done
-}
-
-findstoragedriverinsys () {
-    local sysfs=$(freadlink "$1")
-
-    # if its a partition look at the device holding the partition
-    if [ -f "$sysfs/start" ]; then
-        sysfs=$(freadlink ${sysfs%/*})
-    fi
-
-    if [[ ! "$sysfs" =~ ^/sys/.*block/.*$ ]]; then
-        #error "WARNING: $sysfs is a not a block sysfs path, skipping"
-        return
-    fi
-
-    case " $handleddevices " in
-        *" $sysfs "*)
-            return ;;
-        *) handleddevices="$handleddevices $sysfs" ;;
-    esac
-
-    if [[ "$sysfs" =~ ^/sys/.*block/md[0-9]+$ ]]; then
-        local raid=${sysfs##*/}
-        vecho "Found MDRAID component $raid"
-        handleraid $raid
-    fi
-    if [[ "$sysfs" =~ ^/sys/.*block/dm-[0-9]+$ ]]; then
-        vecho "Found DeviceMapper component ${sysfs##*/}"
-        handledm $(cat $sysfs/dev |cut -d : -f 1) $(cat $sysfs/dev |cut -d : -f 2)
-    fi
-
-    for slave in $(ls -d "$sysfs"/slaves/* 2>/dev/null) ; do
-        findstoragedriverinsys "$slave"
-    done
-
-    if [ -L "$sysfs/device" ]; then
-        qpushd $(freadlink "$sysfs/device")
-        finddevicedriverinsys
-        qpopd
-    fi
-}
-
-findstoragedriver () {
-    local device="$1"
-
-    if [ ! -b "$device" ]; then
-        #error "WARNING: $device is a not a block device, skipping"
-        return
-    fi
-
-    local majmin=$(get_numeric_dev dec "$device")
-    local sysfs=$(finddevnoinsys "$majmin")
-
-    if [ -z "$sysfs" ]; then
-        #error "WARNING: $device major:minor $majmin not found, skipping"
-        return
-    fi
-
-    vecho "Looking for driver for $device in $sysfs"
-    findstoragedriverinsys "$sysfs"
-}
-
-iscsi_get_rec_val() {
-
-    # The open-iscsi 742 release changed to using flat files in
-    # /var/lib/iscsi.
-
-    result=$(grep "^${2} = " "$1" |  sed -e s'/.* = //')
-}
-
-iscsi_set_parameters() {
-    path=$1
-    vecho setting iscsi parameters
-
-    tmpfile=$(mktemp)
-
-    # Check once before getting explicit values, so we can output a decent
-    # error message.
-    /sbin/iscsiadm --show -m session -r $path > $tmpfile
-    if [ ! -s $tmpfile ]; then
-        echo Unable to find iscsi record for $path
-        exit 1
-    fi
-
-    nit_name=$(grep "^InitiatorName=" /etc/iscsi/initiatorname.iscsi | \
-        sed -e "s/^InitiatorName=//")
-
-    iscsi_get_rec_val $tmpfile "node.name"
-    tgt_name=${result}
-    iscsi_get_rec_val $tmpfile "node.tpgt"
-    tpgt=${result}
-    # iscsistart wants node.conn[0].address / port
-    iscsi_get_rec_val $tmpfile 'node.conn\[0\].address'
-    tgt_ipaddr=${result}
-    iscsi_get_rec_val $tmpfile 'node.conn\[0\].port'
-    tgt_port=${result}
-
-    # Note: we get chap secrets (passwords) in plaintext, and also store
-    # them in the initrd.
-
-    iscsi_get_rec_val $tmpfile "node.session.auth.username"
-    chap=${result}
-    if [ -n "${chap}" -a "${chap}" != "<empty>" ]; then
-        chap="-u ${chap}"
-        iscsi_get_rec_val $tmpfile "node.session.auth.password"
-        chap_pw="-w ${result}"
-    else
-        chap=""
-    fi
-
-    iscsi_get_rec_val $tmpfile "node.session.auth.username_in"
-    chap_in=${result}
-    if [ -n "${chap_in}" -a "${chap_in}" != "<empty>" ]; then
-        chap_in="-U ${chap_in}"
-        iscsi_get_rec_val $tmpfile "node.session.auth.password_in"
-        chap_in_pw="-W ${result}"
-    else
-        chap_in=""
-    fi
-
-    rm $tmpfile
-}
-
-emit_iscsi () {
-    if [ -n "${iscsi_devs}" ]; then
-        for dev in ${iscsi_devs}; do
-            iscsi_set_parameters $dev
-            # recid is not really used, just use 0 for it
-            echo "/bin/iscsistart -t ${tgt_name} -i ${nit_name} \
-                -g ${tpgt} -a ${tgt_ipaddr} ${chap} ${chap_pw} \
-                ${chap_in} ${chap_in_pw}"
-        done
-    fi
-}
-
-is_iscsi() {
-    path=$1
-    if echo $path | grep -q "/platform/host[0-9]*/session[0-9]*/target[0-9]*:[0-9]*:[0-9]*/[0-9]*:[0-9]*:[0-9]*:[0-9]*"; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-handledm() {
-    major=$1
-    minor=$2
-    while read dmstart dmend dmtype r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 ; do
-        case "$dmtype" in
-            crypt)
-                # this device is encrypted; find the slave device and see
-                # whether the encryption is LUKS; if not, bail.
-                slavedev=$(finddevnoinsys $r3)
-                # get the basename, then s,!,/, in case it's a cciss device
-                slavedev=$(echo ${slavedev##*/} | tr '!' '/')
-                cryptsetup isLuks "/dev/$slavedev" 2>/dev/null || continue
-                find_base_dm_mods
-                dmname=$(dmsetup info -j $major -m $minor -c --noheadings -o name)
-                # do the device resolution dance to get /dev/mapper/foo
-                # since 'lvm lvs' doesn't like dm-X device nodes
-                if [[ "$slavedev" =~ ^dm- ]]; then
-                    majmin=$(get_numeric_dev dec "/dev/$slavedev")
-                    for dmdev in /dev/mapper/* ; do
-                        dmnum=$(get_numeric_dev dev $dmdev)
-                        if [ $dmnum = $majmin ]; then
-                            slavedev=${dmdev#/dev/}
-                            break
-                        fi
-                    done
-                fi
-
-                # determine if $slavedev is an LV
-                #  if so, add the device to latecryptodevs
-                #  if not, add the device to cryptodevs
-                local vg=$(lvshow /dev/$slavedev)
-                if [ -n "$vg" ]; then
-                    eval cryptolv${ncryptolvs}='"'/dev/$slavedev $dmname'"'
-                    let ncryptolvs++
-                elif grep -q "^$slavedev :" /proc/mdstat ; then
-                    eval cryptoraid${ncryptoraids}='"'/dev/$slavedev $dmname'"'
-                    let ncryptoraids++
-                else
-                    eval cryptoparts${ncryptoparts}='"'/dev/$slavedev $dmname'"'
-                    let ncryptoparts++
-                fi
-
-                let ncryptodevs++
-                findstoragedriver "/dev/$slavedev"
-                ;;
-        esac
-    done << EOF
-        $(dmsetup table -j $major -m $minor 2>/dev/null)
-EOF
-        local name=$(dmsetup info --noheadings -c -j $major -m $minor -o name)
-        local vg=$(lvshow "/dev/mapper/$name")
-        local raids=$(/sbin/dmraid -s -craidname 2>/dev/null | grep -vi "no raid disks")
-        if [ -n "$vg" ]; then
-            vg=`echo $vg` # strip whitespace
-            case " $vg_list " in
-                *" $vg "*) ;;
-                *)  vg_list="$vg_list $vg"
-                    [ -z "$nolvm" ] && find_base_dm_mods
-                    ;;
-            esac
-        fi
-        for raid in $raids ; do
-            if [ "$raid" == "$name" ]; then
-                case " $DMRAIDS " in
-                    *" $raid "*) ;;
-                    *)  DMRAIDS="$DMRAIDS $raid"
-                        [ -z "$nodmraid" ] && find_base_dm_mods
-                        ;;
-                esac
-                break
-            fi
-        done
-}
-
-handleiscsi() {
-    vecho "Found iscsi component $1"
-
-    # We call iscsi_set_parameters once here to figure out what network to
-    # use (it sets tgt_ipaddr), and once again to emit iscsi values,
-    # not very efficient.
-    iscsi_set_parameters $1
-    iscsi_devs="$iscsi_devs $1"
-    netdev=$(/sbin/ip route get to $tgt_ipaddr | \
-        sed 's|.*dev \(.*\).*|\1|g' | awk '{ print $1; exit }')
-    addnetdev $netdev
-}
-
-handleraid() {
-    local start=0
-
-    if [ -n "$noraid" -o ! -f /proc/mdstat ]; then
-        return 0
-    fi
-
-    levels=$(awk "/^$1[  ]*:/ { print\$4 }" /proc/mdstat)
-
-    for level in $levels ; do
-        case $level in
-            linear)
-                start=1
-                ;;
-            multipath)
-                start=1
-                ;;
-            raid[01] | raid10)
-                start=1
-                ;;
-            raid[456])
-                start=1
-                ;;
-            *)
-                error "raid level $level (in /proc/mdstat) not recognized"
-                ;;
-        esac
-    done
-    if [ "$start" = 1 ]; then
-        raiddevices="$raiddevices $1"
-    fi
-    return $start
-}
-
-lvshow() {
-    lvm lvs --ignorelockingfailure --noheadings -o vg_name \
-        $1 2>/dev/null | egrep -v '^ *(WARNING:|Volume Groups with)'
-}
-
-vgdisplay() {
-    lvm vgdisplay --ignorelockingfailure -v $1 2>/dev/null |
-    sed -n 's/PV Name//p'
-}
-
-dmmods_found="n"
-find_base_dm_mods()
-{
-    [ "$dmmods_found" == "n" ] || return
-    dmmods_found="y"
-}
-
-savedargs=$*
-while [ $# -gt 0 ]; do
-    case $1 in
-        --fstab*)
-            if [ "$1" != "${1##--fstab=}" ]; then
-                fstab=${1##--fstab=}
-            else
-                fstab=$2
-                shift
-            fi
-            ;;
-
-
-        -v|--verbose)
-            set_verbose true
-            ;;
-        --net-dev*)
-            if [ "$1" != "${1##--net-dev=}" ]; then
-                net_list="$net_list ${1##--net-dev=}"
-            else
-                net_list="$net_list $2"
-                shift
-            fi
-            ;;
-        --rootdev*)
-            if [ "$1" != "${1##--rootdev=}" ]; then
-                rootdev="${1##--rootdev=}"
-            else
-                rootdev="$2"
-                shift
-            fi
-            ;;
-        --thawdev*)
-            if [ "$1" != "${1##--thawdev=}" ]; then
-                thawdev="${1##--thawdev=}"
-            else
-                thawdev="$2"
-                shift
-            fi
-            ;;
-        --rootfs*)
-            if [ "$1" != "${1##--rootfs=}" ]; then
-                rootfs="${1##--rootfs=}"
-            else
-                rootfs="$2"
-                shift
-            fi
-            ;;
-        --rootopts*)
-            if [ "$1" != "${1##--rootopts=}" ]; then
-                rootopts="${1##--rootopts=}"
-            else
-                rootopts="$2"
-                shift
-            fi
-            ;;
-        --root*)
-            if [ "$1" != "${1##--root=}" ]; then
-                root="${1##--root=}"
-            else
-                root="$2"
-                shift
-            fi
-            ;;
-        --loopdev*)
-            if [ "$1" != "${1##--loopdev=}" ]; then
-                loopdev="${1##--loopdev=}"
-            else
-                loopdev="$2"
-                shift
-            fi
-            ;;
-        --loopfs*)
-            if [ "$1" != "${1##--loopfs=}" ]; then
-                loopfs="${1##--loopfs=}"
-            else
-                loopfs="$2"
-                shift
-            fi
-            ;;
-        --loopopts*)
-            if [ "$1" != "${1##--loopopts=}" ]; then
-                loopopts="${1##--loopopts=}"
-            else
-                loopopts="$2"
-                shift
-            fi
-            ;;
-        --looppath*)
-            if [ "$1" != "${1##--looppath=}" ]; then
-                looppath="${1##--looppath=}"
-            else
-                looppath="$2"
-                shift
-            fi
-            ;;
-        --help)
-            usage -n
-            ;;
-        *)
-            if [ -z "$target" ]; then
-                target=$1
-            elif [ -z "$kernel" ]; then
-                kernel=$1
-            else
-                usage
-            fi
-            ;;
-    esac
-
-    shift
-done
-
-[ -z "$rootfs" ] && rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab)
-[ -z "$rootopts" ] && rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab)
-[ -z "$rootopts" ] && rootopts="defaults"
-
-
-[ -z "$rootdev" ] && rootdev=$(awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' $fstab)
-    # check if it's nfsroot
-physdev=""
-if [ "$rootfs" == "nfs" ]; then
-    if [ "x$net_list" == "x" ]; then
-        handlenfs $rootdev
-    fi
-else
-        # check if it's root by label
-    rdev=$rootdev
-    rdev=$(resolve_device_name "$rdev")
-    rootopts=$(echo $rootopts | sed -e 's/^r[ow],//' -e 's/,_netdev//' -e 's/_netdev//' -e 's/,_rnetdev//' -e 's/_rnetdev//' -e 's/,r[ow],$//' -e 's/,r[ow],/,/' -e 's/^r[ow]$/defaults/' -e 's/$/,ro/')
-    findstoragedriver "$rdev"
-fi
-
-    # find the first swap dev which would get used for swsusp
-[ -z "$thawdev" ] && thawdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; exit }}' $fstab)
-swsuspdev="$thawdev"
-if [ -n "$swsuspdev" ]; then
-    swsuspdev=$(resolve_device_name "$swsuspdev")
-    findstoragedriver "$swsuspdev"
-fi
-
-
-cemit()
-{
-    cat
-}
-
-emit()
-{
-    NONL=""
-    if [ "$1" == "-n" ]; then
-        NONL="-n"
-        shift
-    fi
-    echo $NONL "$@"
-}
-
-emitdmraids()
-{
-    if [ -z "$nodmraid" -a -n "$DMRAIDS" ]; then
-        for raid in $DMRAIDS; do
-            echo -n "rd_DM_UUID=$raid "
-        done
-    fi
-}
-
-
-# HACK: module loading + device creation isn't necessarily synchronous...
-# this will make sure that we have all of our devices before trying
-# things like RAID or LVM
-emitdmraids
-
-emitcrypto()
-{
-    local luksuuid=$(grep "^$2 " /etc/crypttab 2>/dev/null| awk '{ print $2 }')
-    if [ -z "$luksuuid" ]; then
-        luksuuid="$2"
-    fi
-    luksuuid=${luksuuid##UUID=}
-    echo -n "rd_LUKS_UUID=$luksuuid "
-}
-
-if [ -n "$raiddevices" ]; then
-    for dev in $raiddevices; do
-        uid=$(udevadm info --query=env --name /dev/${dev}|grep MD_UUID)
-        uid=${uid##MD_UUID=}
-        [ -n "$uid" ] && echo -n "rd_MD_UUID=$uid "
-    done
-else
-    echo -n "rd_NO_MD "
-fi
-
-if [ -z "$nolvm" -a -n "$vg_list" ]; then
-    for vg in $vg_list; do
-        echo -n "rd_LVM_VG=$vg "
-    done
-else
-    echo -n "rd_NO_LVM "
-fi
-
-cryptdevs="$(echo ${!cryptoraid@} ${!cryptopart@} ${!cryptolv@})"
-
-if [ -z "$cryptdevs" ]; then
-    echo -n "rd_NO_LUKS "
-else
-    for cryptdev in ${!cryptoraid@} ${!cryptopart@} ${!cryptolv@} ; do
-        emitcrypto `eval echo '$'$cryptdev`
-    done
-fi
-
-# output local keyboard/18n settings
-[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard
-[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
-
-for i in KEYTABLE SYSFONT SYSFONTACM UNIMAP LANG; do
-    val=$(eval echo \$$i)
-    [[ $val ]] && echo -n "$i=$val "
-done
-
-if [ -n "$KEYBOARDTYPE" -a "$KEYBOARDTYPE" != "pc" ]; then
-    echo -n "KEYBOARDTYPE=$KEYBOARDTYPE "
-fi
-
-if [ -n "$rootdev" ]; then
-    echo -n "root=$rootdev "
-fi
-
-echo
--- a/dracut-gencmdline.8.xml
+++ b/dracut-gencmdline.8.xml
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
-<!-- lifted from troff+man by doclifter -->
-<refentry id='dracutgencmdline8'>
-<refmeta>
-<refentrytitle>DRACUT-GENCMDLINE</refentrytitle>
-<manvolnum>8</manvolnum>
-<refmiscinfo class='source'>June 2009</refmiscinfo>
-<refmiscinfo class='manual'>Linux</refmiscinfo>
-</refmeta>
-<refnamediv id='name'>
-<refname>dracut-gencmdline</refname>
-<refpurpose>generates kernel command line parameters for the dracut generated initramfs</refpurpose>
-</refnamediv>
-<!-- body begins here -->
-<refsynopsisdiv id='synopsis'>
-<cmdsynopsis>
-  <command>dracut-gencmdline</command>
-    <sbr/>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1 id='description'><title>DESCRIPTION</title>
-<para><command>dracut-gencmdline</command>
-generates kernel command line parameters for the dracut generated initramfs, which are very specific to the host system.</para>
-
-</refsect1>
-
-<refsect1 id='authors'><title>AUTHORS</title>
-<literallayout remap='.nf'>
-Harald Hoyer &lt;harald@redhat.com&gt;
-</literallayout> <!-- .fi -->
-</refsect1>
-
-<refsect1 id='availability'><title>AVAILABILITY</title>
-<para>The dracut-gencmdline command is part of the dracut package and is available from
-<ulink url='https://dracut.wiki.kernel.org'>https://dracut.wiki.kernel.org</ulink></para>
-
-</refsect1>
-
-<refsect1 id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry></para>
-</refsect1>
-</refentry>
-
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
@@ -6,5 +6,14 @@ set -e
 cd /run/initramfs
 IMG="/boot/initramfs-$(uname -r).img"
 [ -f .need_shutdown -a -f "$IMG" ] || exit 1
-zcat "$IMG"  | cpio -id >/dev/null 2>&1
-rm .need_shutdown
+if zcat "$IMG"  | cpio -id >/dev/null 2>&1; then
+    rm .need_shutdown
+elif xzcat "$IMG"  | cpio -id >/dev/null 2>&1; then
+    rm .need_shutdown
+else
+    # something failed, so we clean up
+    rm -f /run/initramfs/shutdown
+    exit 1
+fi
+
+exit 0
--- a/dracut-logger.sh
+++ b/dracut-logger.sh
--- a/dracut-shutdown.service
+++ b/dracut-shutdown.service
@@ -11,6 +11,7 @@ After=getty@tty1.service prefdm.service
 Before=reboot.service
 DefaultDependencies=no
 ConditionPathExists=/run/initramfs/.need_shutdown
+ConditionPathExists=!/run/initramfs/bin/sh

 [Service]
 ExecStart=/usr/lib/dracut/dracut-initramfs-restore
--- a/dracut.8.asc
+++ b/dracut.8.asc
@@ -0,0 +1,387 @@
+DRACUT(8)
+=========
+:doctype: manpage
+:man source:   dracut
+:man manual:   dracut
+
+NAME
+----
+dracut - low-level tool for generating an initramfs image
+
+SYNOPSIS
+--------
+*dracut* ['OPTION...'] [<image> [_<kernel version>_]]
+
+DESCRIPTION
+-----------
+dracut creates an initial image used by the kernel for preloading the block
+device modules (such as IDE, SCSI or RAID) which are needed to access the root
+filesystem, mounting the root filesystem and booting into the real system.
+
+At boot time, the kernel unpacks that archive into RAM disk, mounts and uses it
+as initial root file system. All finding of the root device happens in this
+early userspace.
+
+For a complete list of kernel command line options see *dracut.cmdline*(7)
+
+OPTIONS
+-------
+**-f, --force**::
+    overwrite existing initramfs file.
+
+**-m, --modules** _<list of dracut modules>_::
+    specify a space-separated list of dracut modules to call when building the
+    initramfs. Modules are located in _/usr/lib/dracut/modules.d_. This
+    parameter can be specified multiple times.
+
+[NOTE]
+===============================
+If [LIST] has multiple arguments, then you have to put these in quotes. For
+example:
+----
+# dracut --modules "module1 module2"  ...
+----
+===============================
+
+**-o, --omit** _<list of dracut modules>_::
+    omit a space-separated list of dracut modules. This parameter can be
+    specified multiple times.
+
+[NOTE]
+===============================
+If [LIST] has multiple arguments, then you have to put these in quotes. For
+example:
+----
+# dracut --omit "module1 module2"  ...
+----
+===============================
+
+**-a, --add** _<list of dracut modules>_::
+    add a space-separated list of dracut modules to the default set of modules.
+    This parameter can be specified multiple times.
+
+[NOTE]
+===============================
+If [LIST] has multiple arguments, then you have to put these in quotes. For
+example:
+----
+# dracut --add "module1 module2"  ...
+----
+===============================
+
+**--force-add** _<list of dracut modules>_::
+    force to add a space-separated list of dracut modules to the default set of
+    modules, when -H is specified. This parameter can be specified multiple
+    times.
+
+[NOTE]
+===============================
+If [LIST] has multiple arguments, then you have to put these in quotes. For
+example:
+----
+# dracut --force-add "module1 module2"  ...
+----
+===============================
+
+**-d, --drivers** _<list of kernel modules>_::
+    specify a space-separated list of kernel modules to exclusively include
+    in the initramfs. The kernel modules have to be specified without the ".ko"
+    suffix. This parameter can be specified multiple times.
+
+[NOTE]
+===============================
+If [LIST] has multiple arguments, then you have to put these in quotes. For
+example:
+----
+# dracut --drivers "kmodule1 kmodule2"  ...
+----
+===============================
+
+**--add-drivers** _<list of kernel modules>_::
+    specify a space-separated list of kernel modules to add to the initramfs.
+    The kernel modules have to be specified without the ".ko" suffix. This
+    parameter can be specified multiple times.
+
+[NOTE]
+===============================
+If [LIST] has multiple arguments, then you have to put these in quotes. For
+example:
+----
+# dracut --add-drivers "kmodule1 kmodule2"  ...
+----
+===============================
+
+**--omit-drivers** _<list of kernel modules>_::
+    specify a space-separated list of kernel modules not to add to the
+    initramfs.
+    The kernel modules have to be specified without the ".ko" suffix. This
+    parameter can be specified multiple times.
+
+[NOTE]
+===============================
+If [LIST] has multiple arguments, then you have to put these in quotes. For
+example:
+----
+# dracut --omit-drivers "kmodule1 kmodule2"  ...
+----
+===============================
+
+**--filesystems** _<list of filesystems>_::
+    specify a space-separated list of kernel filesystem modules to exclusively
+    include in the generic initramfs. This parameter can be specified multiple
+    times.
+
+[NOTE]
+===============================
+If [LIST] has multiple arguments, then you have to put these in quotes. For
+example:
+----
+# dracut --filesystems "filesystem1 filesystem2"  ...
+----
+===============================
+
+**-k, --kmoddir** _<kernel directory>_::
+    specify the directory, where to look for kernel modules
+
+**--fwdir** _<dir>[:<dir>...]++_::
+    specify additional directories, where to look for firmwares. This parameter
+    can be specified multiple times.
+
+**--kernel-only**::
+    only install kernel drivers and firmware files
+
+**--no-kernel**::
+    do not install kernel drivers and firmware files
+
+**--mdadmconf**::
+    include local _/etc/mdadm.conf_
+
+**--nomdadmconf**::
+    do not include local _/etc/mdadm.conf_
+
+**--lvmconf**::
+    include local _/etc/lvm/lvm.conf_
+
+**--nolvmconf**::
+    do not include local _/etc/lvm/lvm.conf_
+
+**--fscks** [LIST]::
+    add a space-separated list of fsck tools, in addition to _dracut.conf_'s
+    specification; the installation is opportunistic (non-existing tools are
+    ignored)
+
+[NOTE]
+===============================
+If [LIST] has multiple arguments, then you have to put these in quotes. For
+example:
+----
+# dracut --fscks "fsck.foo barfsck"  ...
+----
+===============================
+
+**--nofscks**::
+    inhibit installation of any fsck tools
+
+**--strip**::
+    strip binaries in the initramfs (default)
+
+**--nostrip**::
+    do not strip binaries in the initramfs
+
+**--prefix** _<dir>_::
+    prefix initramfs files with the specified directory
+
+**--noprefix**::
+    do not prefix initramfs files (default)
+
+**-h, --help**::
+    display help text and exit.
+
+**--debug**::
+    output debug information of the build process
+
+**-v, --verbose**::
+    increase verbosity level (default is info(4))
+
+**-q, --quiet**:: decrease verbosity level (default is info(4))
+
+**-c, --conf** _<dracut configuration file>_::
+    specify configuration file to use.
+
+Default:
+   _/etc/dracut.conf_
+
+**--confdir** _<configuration directory>_::
+    specify configuration directory to use.
+
+Default:
+   _/etc/dracut.conf.d_
+
+**--tmpdir** _<temporary directory>_::
+    specify temporary directory to use.
+
+Default:
+   _/var/tmp_
+
+**--sshkey** _<sshkey file>_:: ssh key file used with ssh-client module.
+
+**-l, --local**::
+    activates the local mode. dracut will use modules from the current working
+    directory instead of the system-wide installed modules in
+    _/usr/lib/dracut/modules.d_.
+    This is useful when running dracut from a git checkout.
+
+**-H, --hostonly**::
+    Host-Only mode: Install only what is needed for booting
+    the local host instead of a generic host.
+
+[WARNING]
+====
+If chrooted to another root other than the real root device, use "--fstab" and
+provide a valid _/etc/fstab_.
+====
+
+**--no-hostonly**::
+    Disable Host-Only mode
+
+**--fstab**::
+    Use _/etc/fstab_ instead of _/proc/self/mountinfo_.
+
+**--add-fstab** _<filename>_ ::
+    Add entries of _<filename>_ to the initramfs /etc/fstab.
+
+**--mount** "_<device>_ _<mountpoint>_ _<filesystem type>_ _<filesystem options>_"::
+    Mount _<device>_ on _<mountpoint>_ with _<filesystem type>_ and _<filesystem
+    options>_ in the initramfs
+
+**-i, --include** _<SOURCE>_ _<TARGET>_::
+    include the files in the SOURCE directory into the
+    TARGET directory in the final initramfs. If SOURCE is a file, it will be
+    installed to TARGET in the final initramfs. This parameter can be specified
+    multiple times.
+
+**-I, --install** _<file list>_::
+    install the space separated list of files into the initramfs.
+
+[NOTE]
+===============================
+If [LIST] has multiple arguments, then you have to put these in quotes. For
+example:
+
+----
+# dracut --install "/bin/foo /sbin/bar"  ...
+----
+===============================
+
+**--gzip**::
+    Compress the generated initramfs using gzip. This will be done by default,
+    unless another compression option or --no-compress is passed. Equivalent to
+    "--compress=gzip -9"
+
+**--bzip2**::
+    Compress the generated initramfs using bzip2.
+
+[WARNING]
+====
+Make sure your kernel has bzip2 decompression support compiled in, otherwise you
+will not be able to boot. Equivalent to "--compress=bzip2"
+====
+
+**--lzma**::
+    Compress the generated initramfs using lzma.
+
+[WARNING]
+====
+Make sure your kernel has lzma decompression support compiled in, otherwise you
+will not be able to boot. Equivalent to "--compress=lzma -9"
+====
+
+**--xz**::
+    Compress the generated initramfs using xz.
+
+[WARNING]
+====
+Make sure your kernel has xz decompression support compiled in, otherwise you
+will not be able to boot. Equivalent to "--compress=xz --check=crc32
+--lzma2=dict=1MiB"
+====
+
+**--compress** _<compressor>_::
+    Compress the generated initramfs using the passed compression program. If
+    you pass it just the name of a compression program, it will call that
+    program with known-working arguments. If you pass a quoted string with
+    arguments, it will be called with exactly those arguments. Depending on what
+    you pass, this may result in an initramfs that the kernel cannot decompress.
+
+**--no-compress**::
+    Do not compress the generated initramfs. This will override any other
+    compression options.
+
+**--list-modules**::
+    List all available dracut modules.
+
+**-M, --show-modules**::
+    Print included module's name to standard output during build.
+
+**--keep**::
+    Keep the initramfs temporary directory for debugging purposes.
+
+FILES
+-----
+_/var/log/dracut.log_::
+    logfile of initramfs image creation
+
+_/tmp/dracut.log_::
+    logfile of initramfs image creation, if _/var/log/dracut.log_ is not
+    writable
+
+_/etc/dracut.conf_::
+    see dracut.conf5
+
+_/etc/dracut.conf.d/*.conf_::
+    see dracut.conf5
+
+Configuration in the initramfs
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+_/etc/conf.d/_::
+    Any files found in _/etc/conf.d/_ will be sourced in the initramfs to
+    set initial values. Command line options will override these values
+    set in the configuration files.
+
+_/etc/cmdline_::
+    Can contain additional command line options.
+
+AVAILABILITY
+------------
+The dracut command is part of the dracut package and is available from
+link:$$https://dracut.wiki.kernel.org$$[https://dracut.wiki.kernel.org]
+
+AUTHORS
+-------
+*Harald Hoyer*::
+    Project Leader and Developer
+
+*Victor Lowther*::
+    Developer
+
+*Philippe Seewer*::
+    Developer
+
+*Warren Togami*::
+    Developer
+
+*Amadeusz Żołnowski*::
+    Developer
+
+*Jeremy Katz*::
+    Developer
+
+*David Dillow*::
+    Developer
+
+*Will Woods*::
+    Developer
+
+SEE ALSO
+--------
+*dracut.cmdline*(7) *dracut.conf*(5)
--- a/dracut.8.xml
+++ b/dracut.8.xml
@@ -1,684 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
-<!-- vim: set ts=8 sts=2 sw=2 et: -->
-<refentry id="dracut8">
-  <refentryinfo>
-    <title>dracut</title>
-    <productname>dracut</productname>
-    <authorgroup>
-      <author>
-        <contrib>Project Leader, Developer</contrib>
-        <firstname>Harald</firstname>
-        <surname>Hoyer</surname>
-        <email>harald@redhat.com</email>
-      </author>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Victor</firstname>
-        <surname>Lowther</surname>
-        <email>victor.lowther@gmail.com</email>
-      </author>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Philippe</firstname>
-        <surname>Seewer</surname>
-        <email>philippe.seewer@bfh.ch</email>
-      </author>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Warren</firstname>
-        <surname>Togami</surname>
-      </author>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Amadeusz</firstname>
-        <surname>Żołnowski</surname>
-        <email>aidecoe@aidecoe.name</email>
-      </author>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Jeremy</firstname>
-        <surname>Katz</surname>
-      </author>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>David</firstname>
-        <surname>Dillow</surname>
-        <email>dave@thedillows.org</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>dracut</refentrytitle>
-    <manvolnum>8</manvolnum>
-    <refmiscinfo class="version"/>
-  </refmeta>
-  <refnamediv>
-    <refname>dracut</refname>
-    <refpurpose>create initial ramdisk images for preloading modules</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dracut</command>
-      <arg choice="opt" rep="repeat">
-        <replaceable>OPTION</replaceable>
-      </arg>
-      <arg choice="opt">
-        <replaceable>&lt;image&gt;</replaceable>
-        <arg choice="opt">
-          <replaceable>&lt;kernel-version&gt;</replaceable>
-        </arg>
-      </arg>
-      <sbr/>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>Description</title>
-    <para><command>dracut</command>
-creates an initial image used by the kernel for
-preloading the block device modules (such as IDE, SCSI or RAID)
-which are needed to access the root filesystem.</para>
-    <para>
-For a complete list of kernel command line options see
-      <citerefentry>
-        <refentrytitle>dracut.cmdline</refentrytitle>
-        <manvolnum>7</manvolnum>
-      </citerefentry>
-</para>
-    <refsect2>
-      <title>Options</title>
-      <variablelist>
-        <varlistentry>
-          <term>
-            <option>-f</option>
-          </term>
-          <term>
-            <option>--force</option>
-          </term>
-          <listitem>
-            <para>overwrite existing initramfs file.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-m</option>
-          </term>
-          <term>
-            <option>--modules&nbsp;<replaceable>&lt;list of dracut modules&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>specify a space-separated list of dracut modules to call
-when building the initramfs.
-Modules are located in
-<filename>/usr/lib/dracut/modules.d</filename>. This parameter can be specified multiple times.</para>
-	    <para>
-	      If [LIST] has multiple arguments, then you have to put these in quotes.
-	      For example:
-	      <screen># dracut --modules "module1 module2"  ...</screen>
-	    </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-o</option>
-          </term>
-          <term>
-            <option>--omit&nbsp;<replaceable>&lt;list of dracut modules&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>omit a space-separated list of dracut modules. This parameter can be specified multiple times.</para>
-	    <para>
-	      If [LIST] has multiple arguments, then you have to put these in quotes.
-	      For example:
-	      <screen># dracut --omit "module1 module2"  ...</screen>
-	    </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-a</option>
-          </term>
-          <term>
-            <option>--add&nbsp;<replaceable>&lt;list of dracut modules&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>add a space-separated list of dracut modules to the default set of modules. This parameter can be specified multiple times.</para>
-	    <para>
-	      If [LIST] has multiple arguments, then you have to put these in quotes.
-	      For example:
-	      <screen># dracut --add "module1 module2"  ...</screen>
-	    </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--force-add&nbsp;<replaceable>&lt;list of dracut modules&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>force to add a space-separated list of dracut modules to the default set of modules, when -H is specified. This parameter can be specified multiple times.</para>
-	    <para>
-	      If [LIST] has multiple arguments, then you have to put these in quotes.
-	      For example:
-	      <screen># dracut --force-add "module1 module2"  ...</screen>
-	    </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <option>-d</option>
-          </term>
-          <term>
-            <option>--drivers&nbsp;<replaceable>&lt;list of kernel modules&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>specify a space-separated list of kernel modules to exclusively include
-in the initramfs.
-The kernel modules have to be specified without the &quot;.ko&quot; suffix. This parameter can be specified multiple times.</para>
-	    <para>
-	      If [LIST] has multiple arguments, then you have to put these in quotes.
-	      For example:
-	      <screen># dracut --drivers "kmodule1 kmodule2"  ...</screen>
-	    </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--add-drivers&nbsp;<replaceable>&lt;list of kernel modules&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>specify a space-separated list of kernel modules to add to the initramfs.
-The kernel modules have to be specified without the &quot;.ko&quot; suffix. This parameter can be specified multiple times.</para>
-	    <para>
-	      If [LIST] has multiple arguments, then you have to put these in quotes.
-	      For example:
-	      <screen># dracut --add-drivers "kmodule1 kmodule2"  ...</screen>
-	    </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--omit-drivers&nbsp;<replaceable>&lt;list of kernel modules&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>specify a space-separated list of kernel modules not to add to the initramfs.
-The kernel modules have to be specified without the &quot;.ko&quot; suffix. This parameter can be specified multiple times.</para>
-	    <para>
-	      If [LIST] has multiple arguments, then you have to put these in quotes.
-	      For example:
-	      <screen># dracut --omit-drivers "kmodule1 kmodule2"  ...</screen>
-	    </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--filesystems&nbsp;<replaceable>&lt;list of filesystems&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>specify a space-separated list of kernel filesystem modules to exclusively
-include in the generic initramfs. This parameter can be specified multiple times.</para>
-	    <para>
-	      If [LIST] has multiple arguments, then you have to put these in quotes.
-	      For example:
-	      <screen># dracut --filesystems "filesystem1 filesystem2"  ...</screen>
-	    </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-k</option>
-          </term>
-          <term>
-            <option>--kmoddir&nbsp;<replaceable>&lt;kernel directory&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>specify the directory, where to look for kernel modules</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option> --fwdir&nbsp;<replaceable>&lt;dir&gt;[:&lt;dir&gt;...]</replaceable></option>
-          </term>
-          <listitem>
-            <para>specify additional directories, where to look for firmwares. This parameter can be specified multiple times.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--kernel-only</option>
-          </term>
-          <listitem>
-            <para>only install kernel drivers and firmware files</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--no-kernel</option>
-          </term>
-          <listitem>
-            <para>do not install kernel drivers and firmware files</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--mdadmconf</option>
-          </term>
-          <listitem>
-            <para>include local <filename>/etc/mdadm.conf</filename></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--nomdadmconf</option>
-          </term>
-          <listitem>
-            <para>do not include local <filename>/etc/mdadm.conf</filename></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--lvmconf</option>
-          </term>
-          <listitem>
-            <para>include local <filename>/etc/lvm/lvm.conf</filename></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--nolvmconf</option>
-          </term>
-          <listitem>
-            <para>do not include local <filename>/etc/lvm/lvm.conf</filename></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--fscks [LIST]</option>
-          </term>
-          <listitem>
-            <para>add a space-separated list of fsck tools, in addition to
-              <filename>dracut.conf</filename>'s specification; the
-              installation is opportunistic (non-existing tools are ignored)
-            </para>
-	    <para>
-	      If [LIST] has multiple arguments, then you have to put these in quotes.
-	      For example:
-	      <screen># dracut --fscks "fsck.foo barfsck"  ...</screen>
-	    </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--nofscks</option>
-          </term>
-          <listitem>
-            <para>inhibit installation of any fsck tools</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--strip</option>
-          </term>
-          <listitem>
-            <para>strip binaries in the initramfs (default)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--nostrip</option>
-          </term>
-          <listitem>
-            <para>do not strip binaries in the initramfs</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--prefix&nbsp;<replaceable>&lt;dir&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>prefix initramfs files with the specified directory</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--noprefix</option>
-          </term>
-          <listitem>
-            <para>do not prefix initramfs files (default)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--ctty</option>
-          </term>
-          <listitem>
-            <para>if possible, try to spawn an emergency shell on a terminal
-              with job control</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-h</option>
-          </term>
-          <term>
-            <option>--help</option>
-          </term>
-          <listitem>
-            <para>display help text and exit.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--debug</option>
-          </term>
-          <listitem>
-            <para>output debug information of the build process</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-v</option>
-          </term>
-          <term>
-            <option>--verbose</option>
-          </term>
-          <listitem>
-            <para>increase verbosity level (default is info(4))</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-q</option>
-          </term>
-          <term>
-            <option>--quiet</option>
-          </term>
-          <listitem>
-            <para>decrease verbosity level (default is info(4))</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-c</option>
-          </term>
-          <term>
-            <option>--conf&nbsp;<replaceable>&lt;dracut configuration file&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>specify configuration file to use.
-Default:
-<filename>/etc/dracut.conf</filename></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--confdir&nbsp;<replaceable>&lt;configuration directory&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>specify configuration directory to use.
-Default:
-<filename>/etc/dracut.conf.d</filename></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--sshkey&nbsp;<replaceable>&lt;sshkey file&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>ssh key file used with ssh-client module.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-l</option>
-          </term>
-          <term>
-            <option>--local</option>
-          </term>
-          <listitem>
-            <para>activates the local mode. dracut will use modules from the current working
-directory instead of the system-wide installed modules in
-<filename>/usr/lib/dracut/modules.d</filename>.
-This is useful when running dracut from a git checkout.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-H</option>
-          </term>
-          <term>
-            <option>--hostonly</option>
-          </term>
-          <listitem>
-            <para>Host-Only mode: Install only what is needed for booting
-the local host instead of a generic host.
-     <warning>
-                <para>If chrooted to another root other than the real root device, use &quot;--fstab&quot; and provide a valid <filename>/etc/fstab</filename>.</para>
-              </warning></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--fstab</option>
-          </term>
-          <listitem>
-            <para>Use <filename>/etc/fstab</filename> instead of <filename>/proc/self/mountinfo</filename>.</para>
-          </listitem>
-        </varlistentry>
-	<varlistentry>
-	  <term>
-	    <option>--add_fstab&nbsp;<replaceable>&lt;filename&gt;</replaceable>&nbsp;</option>
-	  </term>
-	  <listitem>
-	    <para>Add entries of <replaceable>&lt;filename&gt;</replaceable> to the initramfs /etc/fstab.</para>
-	  </listitem>
-	  </varlistentry>
-	<varlistentry>
-	  <term>
-	    <option>--mount&nbsp;&quot;<replaceable>&lt;device&gt;</replaceable> <replaceable>&lt;mountpoint&gt;</replaceable> <replaceable>&lt;filesystem type&gt;</replaceable> <replaceable>&lt;filesystem options&gt;</replaceable>&quot;</option>
-	  </term>
-	  <listitem>
-	    <para>Add entries of <replaceable>&lt;filename&gt;</replaceable> to the initramfs /etc/fstab.</para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry>
-          <term>
-            <option>-i</option>
-          </term>
-          <term>
-            <option>--include&nbsp;<replaceable>&lt;SOURCE&gt;</replaceable>&nbsp;<replaceable>&lt;TARGET&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>include the files in the SOURCE directory into the
-TARGET directory in the final initramfs. If SOURCE is a file, it will be installed to TARGET in the final initramfs. This parameter can be specified multiple times.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-I</option>
-          </term>
-          <term>
-            <option>--install&nbsp;<replaceable>&lt;file list&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>install the space separated list of files into the initramfs.</para>
-	    <para>
-	      If [LIST] has multiple arguments, then you have to put these in quotes.
-	      For example:
-	      <screen># dracut --install "/bin/foo /sbin/bar"  ...</screen>
-	    </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--gzip</option>
-          </term>
-          <listitem>
-            <para>Compress the generated initramfs using gzip.
-     This will be done by default, unless another compression option or --no-compress is passed. Equivalent to "--compress=gzip -9"</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--bzip2</option>
-          </term>
-          <listitem>
-            <para>Compress the generated initramfs using bzip2.
-     <warning>
-                <para>Make sure your kernel has bzip2 decompression support compiled in, otherwise you will not be able to boot. Equivalent to "--compress=bzip2"</para>
-              </warning></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--lzma</option>
-          </term>
-          <listitem>
-            <para>Compress the generated initramfs using lzma.
-     <warning>
-                <para>Make sure your kernel has lzma decompression support compiled in, otherwise you will not be able to boot. Equivalent to "--compress=lzma -9"</para>
-              </warning></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--xz</option>
-          </term>
-          <listitem>
-            <para>Compress the generated initramfs using xz.
-     <warning>
-                <para>Make sure your kernel has xz decompression support compiled in, otherwise you will not be able to boot. Equivalent to "--compress=xz --check=crc32 --lzma2=dict=1MiB"</para>
-              </warning></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--compress&nbsp;<replaceable>&lt;compressor&gt;</replaceable></option>
-          </term>
-          <listitem>
-            <para>Compress the generated initramfs using the passed compression program.  If you pass it just the name of a compression program, it will call that program with known-working arguments.  If you pass a quoted string with arguments, it will be called with exactly those arguments.  Depending on what you pass, this may result in an initramfs that the kernel cannot decompress.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--no-compress</option>
-          </term>
-          <listitem>
-            <para>Do not compress the generated initramfs. This will override any other compression options.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--list-modules</option>
-          </term>
-          <listitem>
-            <para>List all available dracut modules.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>-M</option>
-          </term>
-          <term>
-            <option>--show-modules</option>
-          </term>
-          <listitem>
-            <para>Print included module's name to standard output during build.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <option>--keep</option>
-          </term>
-          <listitem>
-            <para>Keep the initramfs temporary directory for debugging purposes.</para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </refsect2>
-  </refsect1>
-  <refsect1>
-    <title>Files</title>
-    <variablelist>
-      <varlistentry>
-        <term>
-          <filename>/var/log/dracut.log</filename>
-        </term>
-        <listitem>
-          <para>logfile of initramfs image creation</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <filename>/tmp/dracut.log</filename>
-        </term>
-        <listitem>
-          <para>logfile of initramfs image creation, if <filename>/var/log/dracut.log</filename> is not writable</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <filename>/etc/dracut.conf</filename>
-        </term>
-        <listitem>
-          <para>see <citerefentry>
-              <refentrytitle>dracut.conf</refentrytitle>
-              <manvolnum>5</manvolnum>
-            </citerefentry></para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <filename>/etc/dracut.conf.d/*.conf</filename>
-        </term>
-        <listitem>
-          <para>see <citerefentry>
-              <refentrytitle>dracut.conf</refentrytitle>
-              <manvolnum>5</manvolnum>
-            </citerefentry></para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    <refsect2>
-      <title>Configuration in the Initramfs</title>
-      <variablelist>
-        <varlistentry>
-          <term>
-            <filename>/etc/conf.d/</filename>
-          </term>
-          <listitem>
-            <para>Any files found in <filename>/etc/conf.d/</filename> will be sourced in the initramfs to
-set initial values. Command line options will override these values
-set in the configuration files.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <filename>/etc/cmdline</filename>
-          </term>
-          <listitem>
-            <para>Can contain additional command line options.</para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </refsect2>
-  </refsect1>
-  <refsect1>
-    <title>Availability</title>
-    <para>The dracut command is part of the dracut package and is available from
-<ulink url='https://dracut.wiki.kernel.org'>https://dracut.wiki.kernel.org</ulink></para>
-  </refsect1>
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry>
-        <refentrytitle>dracut.cmdline</refentrytitle>
-        <manvolnum>7</manvolnum>
-      </citerefentry>
-      <citerefentry>
-        <refentrytitle>dracut.conf</refentrytitle>
-        <manvolnum>5</manvolnum>
-      </citerefentry>
-    </para>
-  </refsect1>
-</refentry>
--- a/dracut.asc
+++ b/dracut.asc
--- a/dracut.cmdline.7.asc
+++ b/dracut.cmdline.7.asc
@@ -0,0 +1,653 @@
+DRACUT.CMDLINE(7)
+=================
+:doctype: manpage
+:man source:   dracut
+:man manual:   dracut
+
+NAME
+----
+dracut.cmdline - dracut kernel command line options
+
+DESCRIPTION
+-----------
+The root device used by the kernel is specified in the boot configuration
+file on the kernel command line, as always.
+
+The traditional _root=/dev/sda1_ style device specification is allowed, but not
+encouraged. The root device should better be identified by LABEL or UUID. If a
+label is used, as in _root=LABEL=<label_of_root>_ the initramfs will search all
+available devices for a filesystem with the appropriate label, and mount that
+device as the root filesystem. _root=UUID=<uuidnumber>_ will mount the partition
+with that UUID as the root filesystem.
+
+In the following all kernel command line parameters, which are processed by
+dracut, are described.
+
+"rd.*" parameters mentioned without "=" are boolean parameters. They can be
+turned on/off by setting them to {0|1}. If the assignment with "=" is missing
+"=1" is implied. For example _rd.info_ can be turned off with _rd.info=0_ or
+turned on with _rd.info=1_ or _rd.info_. The last value in the kernel command
+line is the value, which is honored.
+
+Standard
+~~~~~~~~
+**init=**_<path to real init>_::
+    specify the path to the init programm to be started after the initramfs has
+    finished
+
+**root=**_<path to blockdevice>_::
+    specify the block device to use as the root filesystem.
+
+E.g.:
+
+----
+root=/dev/sda1
+root=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1
+root=/dev/disk/by-label/Root
+root=LABEL=Root
+root=/dev/disk/by-uuid/3f5ad593-4546-4a94-a374-bcfb68aa11f7
+root=UUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7
+----
+
+**rootfstype=**_<filesystem type>_:: "auto" if not specified, e.g.:
+
+----
+rootfstype=ext3
+----
+
+**rootflags=**_<mount options>_::
+    specify additional mount options for the root filesystem. If not set,
+    _/etc/fstab_ of the real root will be parsed for special mount options and
+    mounted accordingly.
+
+**rd.fstab=0**::
+    do not honor special mount options for the root filesystem found in
+    _/etc/fstab_ of the real root.
+
+**resume=**_<path to resume partition>_
+
+E.g.:
+
+----
+resume=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1
+resume=/dev/disk/by-uuid/3f5ad593-4546-4a94-a374-bcfb68aa11f7
+resume=UUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7
+----
+
+
+Misc
+~~~~
+**rd.driver.blacklist=**_<drivername>[,<drivername>,...]_::
+    do not load kernel module <drivername>. This parameter can be specified
+    multiple times.
+
+**rd.driver.pre=**_<drivername>[,<drivername>,...]_::
+    force loading kernel module <drivername>. This parameter can be specified
+    multiple times.
+
+**rd.driver.post=**_<drivername>[,<drivername>,...]_::
+    force loading kernel module <drivername> after all automatic loading modules
+    have been loaded. This parameter can be specified multiple times.
+
+[[dracutkerneldebug]]
+Debug
+~~~~~
+**rd.info**::
+    print informational output though "quiet" is set
+
+**rd.shell**::
+    allow dropping to a shell, if root mounting fails
+
+**rd.debug**::
+    set -x for the dracut shell and logs to dmesg, console and
+    _/run/initramfs/init.log_
+
+**rd.break**::
+    drop to a shell at the end
+
+**rd.break=**_{cmdline|pre-udev|pre-trigger|initqueue|pre-mount|mount|pre-pivot|cleanup}_::
+    drop to a shell on defined breakpoint
+
+**rd.udev.info**::
+    set udev to loglevel info
+
+**rd.udev.debug**::
+    set udev to loglevel debug
+
+I18N
+~~~~
+**vconsole.keymap=**_<keymap base file name>_::
+    keyboard translation table loaded by loadkeys; taken from keymaps directory;
+    will be written as KEYMAP to _/etc/vconsole.conf_ in the initramfs, e.g.:
+
+----
+vconsole.keymap=de-latin1-nodeadkeys
+----
+
+**vconsole.keymap.ext=**_<list of keymap base file names>_::
+    list of extra keymaps to bo loaded (sep. by space); will be written as
+    EXT_KEYMAP to _/etc/vconsole.conf_ in the initramfs
+
+**vconsole.unicode**[=_{0|1}_]::
+    boolean, indicating UTF-8 mode; will be written as UNICODE to
+    _/etc/vconsole.conf_ in the initramfs
+
+**vconsole.font=**_<font base file name>_::
+    console font; taken from consolefonts directory; will be written as FONT to
+    _/etc/vconsole.conf_ in the initramfs; e.g.:
+
+----
+vconsole.font=LatArCyrHeb-16
+----
+
+**vconsole.font.map=**_<console map base file name>_::
+    see description of '-m' parameter in setfont manual; taken from consoletrans
+    directory; will be written as FONT_MAP to _/etc/vconsole.conf_ in the
+    initramfs
+
+**vconsole.font.unimap=**_<unicode table base file name>_::
+    see description of '-u' parameter in setfont manual; taken from unimaps
+    directory; will be written as FONT_UNIMAP to _/etc/vconsole.conf_ in the
+    initramfs
+
+**locale.LANG=**_<locale>_::
+    taken from the environment; if no UNICODE is defined we set its value in
+    basis of LANG value (whether it ends with ".utf8" (or similar) or not); will
+    be written as LANG to _/etc/locale.conf_ in the initramfs; e.g.:
+
+----
+locale.LANG=pl_PL.utf8
+----
+
+**locale.LC_ALL=**_<locale>_::
+    taken from the environment; will be written as LC_ALL to _/etc/locale.conf_
+    in the initramfs
+
+LVM
+~~~
+**rd.lvm=0**::
+    disable LVM detection
+
+**rd.lvm.vg=**_<volume group name>_::
+    only activate the volume groups with the given name. rd.lvm.vg can be
+    specified multiple times on the kernel command line.
+
+**rd.lvm.lv=**_<logical volume name>_::
+    only activate the logical volumes with the given name. rd.lvm.lv can be
+    specified multiple times on the kernel command line.
+
+**rd.lvm.conf=0**::
+    remove any _/etc/lvm/lvm.conf_, which may exist in the initramfs
+
+crypto LUKS
+~~~~~~~~~~~
+**rd.luks=0**::
+    disable crypto LUKS detection
+
+**rd.luks.uuid=**_<luks uuid>_::
+    only activate the LUKS partitions with the given UUID. Any "luks-" of the
+    LUKS UUID is removed before comparing to _<luks uuid>_.
+    The comparisons also matches, if _<luks uuid>_ is only the beginning of the
+    LUKS UUID, so you don't have to specify the full UUID.
+    This parameter can be specified multiple times.
+
+**rd.luks.allow-discards=**_<luks uuid>_::
+    Allow  using  of discards (TRIM) requests for LUKS partitions with the given UUID.
+    Any "luks-" of the LUKS UUID is removed before comparing to _<luks uuid>_.
+    The comparisons also matches, if _<luks uuid>_ is only the beginning of the
+    LUKS UUID, so you don't have to specify the full UUID.
+    This parameter can be specified multiple times.
+
+**rd.luks.allow-discards::
+    Allow  using  of discards (TRIM) requests on all LUKS partitions.
+
+**rd.luks.crypttab=0**::
+    do not check, if LUKS partition is in _/etc/crypttab_
+
+crypto LUKS - key on removable device support
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**rd.luks.key=**_<keypath>:<keydev>:<luksdev>_::
+    _keypath_ is a path to key file to look for. It's REQUIRED. When _keypath_ ends with '.gpg' it's considered to be key encrypted symmetrically with GPG. You will be prompted for password on boot. GPG support comes with 'crypt-gpg' module which needs to be added explicitly.
+
+_keydev_ is a device on which key file resides. It might be kernel name of devices (should start with "/dev/"), UUID (prefixed with "UUID=") or label (prefix with "LABEL="). You don't have to specify full UUID. Just its beginning will suffice, even if its ambiguous. All matching devices will be probed. This parameter is recommended, but not required. If not present, all block devices will be probed, which may significantly increase boot time.
+
+If _luksdev_ is given, the specified key will only be applied for that LUKS device. Possible values are the same as for _keydev_. Unless you have several LUKS devices, you don't have to specify this parameter. The simplest usage is:
+
+----
+rd.luks.key=/foo/bar.key
+----
+
+As you see, you can skip colons in such a case.
+
+MD RAID
+~~~~~~~
+**rd.md=0**::
+    disable MD RAID detection
+
+**rd.md.imsm=0**::
+    disable MD RAID for imsm/isw raids, use DM RAID instead
+
+**rd.md.ddf=0**::
+    disable MD RAID for SNIA ddf raids, use DM RAID instead
+
+**rd.md.conf=0**::
+    ignore mdadm.conf included in initramfs
+
+**rd.md.waitclean=1**::
+    wait for any resync, recovery, or reshape activity to finish before continuing
+
+**rd.md.uuid=**_<md raid uuid>_::
+    only activate the raid sets with the given UUID. This parameter can be
+    specified multiple times.
+
+DM RAID
+~~~~~~~
+**rd.dm=0**::
+    disable DM RAID detection
+
+**rd.dm.uuid=**_<dm raid uuid>_::
+   only activate the raid sets with the given UUID. This parameter can be
+   specified multiple times.
+
+FIPS
+~~~~
+**rd.fips**::
+    enable FIPS
+
+**boot=**_<boot device>_::
+    specify the device, where /boot is located. e.g.
+
+----
+boot=/dev/sda1
+boot=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1
+boot=UUID=<uuid>
+boot=LABEL=<label>
+----
+
+**rd.fips.skipkernel**::
+    skip checksum check of the kernel image. Useful, if the kernel image is not
+    in a separate boot partition.
+
+Network
+~~~~~~~
+**ip=**_{dhcp|on|any|dhcp6|auto6|ibft}_::
+    dhcp|on|any::: get ip from dhcp server from all interfaces. If root=dhcp, loop
+    sequentially through all interfaces (eth0, eth1, ...) and use the first with
+    a valid DHCP root-path.
+
+    auto6::: IPv6 autoconfiguration
+
+    dhcp6::: IPv6 DHCP
+
+    ibft::: iBFT autoconfiguration
+
+**ip=**_<interface>_:_{dhcp|on|any|dhcp6|auto6}_[:[_<mtu>_][:_<macaddr>_]]::
+    This parameter can be specified multiple times.
+
+dhcp|on|any|dhcp6::: get ip from dhcp server on a specific interface
+auto6::: do IPv6 autoconfiguration
+<macaddr>::: optionally set <macaddr> on the <interface>
+
+**ip=**_<client-IP>_:_<server-IP>_:_<gateway-IP>_:_<netmask>_:_<client_hostname>_:_<interface>_:_{none|off|dhcp|on|any|dhcp6|auto6|ibft}_[:[_<mtu>_][:_<macaddr>_]]::
+    explicit network configuration. If you want do define a IPv6 address, put it
+    in brackets (e.g. [2001:DB8::1]). This parameter can be specified multiple
+    times.
+
+<macaddr>::: optionally set <macaddr> on the <interface>
+
+**ifname=**_<interface>_:_<MAC>_::
+    Assign network device name <interface> (ie eth0) to the NIC with MAC <MAC>.
+    Note: If you use this option you _must_ specify an ifname= argument for all
+    interfaces used in ip= or fcoe= arguments. However, if the interface in
+    ip= or fcoe= is a bridge, bonding or vlan interface, you should specify
+    an ifname= for _each_ of its underlying interfaces. This parameter can be
+    specified multiple times.
+
+**bootdev=**_<interface>_::
+    specify network interface to use routing and netroot information from.
+    Required if multiple ip= lines are used.
+
+**nameserver=**__<IP>__ [**nameserver=**__<IP>__ ...]::
+    specify nameserver(s) to use
+
+**biosdevname=0**::
+    boolean, turn off biosdevname network interface renaming
+
+**vlan=_<vlanname>_:_<phydevice>_**::
+    Setup vlan device named <vlanname> on <phydeivce>.
+    We support the four styles of vlan names: VLAN_PLUS_VID (vlan0005), VLAN_PLUS_VID_NO_PAD (vlan5),
+    DEV_PLUS_VID (eth0.0005), DEV_PLUS_VID_NO_PAD (eth0.5)
+
+**bond=_<bondname>_[:_<bondslaves>_:[:_<options>_]]**::
+    Setup bonding device <bondname> on top of <bondslaves>.
+    <bondslaves> is a comma-separated list of physical (ethernet) interfaces.
+    <options> is a comma-separated list on bonding options (modinfo bonding for details)
+    in format compatible with initscripts. If <options> includes multi-valued arp_ip_target option,
+    then its values should be separated by semicolon.
+    Bond without parameters assumes bond=bond0:eth0,eth1:mode=balance-rr
+
+**bridge=_<bridgename>_:_<ethnames>_**::
+    Setup bridge <bridgename> with <ethnames>. <ethnames> is a comma-separated
+    list of physical (ethernet) interfaces. Bridge without parameters assumes bridge=br0:eth0
+
+
+NFS
+~~~
+**root=**[_<server-ip>_:]_<root-dir>_[:_<nfs-options>_]::
+    mount nfs share from <server-ip>:/<root-dir>, if no server-ip is given, use
+    dhcp next_server. if server-ip is an IPv6 address it has to be put in
+    brackets, e.g. [2001:DB8::1]. NFS options can be appended with the prefix
+    ":" or "," and are seperated by ",".
+
+**root=**nfs:[_<server-ip>_:]_<root-dir>_[:_<nfs-options>_], **root=**nfs4:[_<server-ip>_:]_<root-dir>_[:_<nfs-options>_], **root=**_{dhcp|dhcp6}_::
+    root=dhcp alone directs initrd to look at the DHCP root-path where NFS
+    options can be specified.
+
+----
+    root-path=<server-ip>:<root-dir>[,<nfs-options>]
+    root-path=nfs:<server-ip>:<root-dir>[,<nfs-options>]
+    root-path=nfs4:<server-ip>:<root-dir>[,<nfs-options>]
+----
+
+**root=**_/dev/nfs_ nfsroot=[_<server-ip>_:]_<root-dir>_[:_<nfs-options>_]::
+    _Deprecated!_ kernel Documentation_/filesystems/nfsroot.txt_ defines this
+    method. This is supported by dracut, but not recommended.
+
+**rd.nfs.domain=**_<NFSv4 domain name>_::
+    Set the NFSv4 domain name. Will overwrite the settings in _/etc/idmap.conf_.
+
+iSCSI
+~~~~~
+**root=**iscsi:[_<username>_:_<password>_[:_<reverse>_:_<password>_]@][_<servername>_]:[_<protocol>_]:[_<port>_][:[_<iscsi_iface_name>_]:[_<netdev_name>_]]:[_<LUN>_]:_<targetname>_::
+    protocol defaults to "6", LUN defaults to "0". If the "servername" field is
+    provided by BOOTP or DHCP, then that field is used in conjunction with other
+    associated fields to contact the boot server in the Boot stage. However, if
+    the "servername" field is not provided, then the "targetname" field is then
+    used in the Discovery Service stage in conjunction with other associated
+    fields. See
+    link:$$http://tools.ietf.org/html/rfc4173#section-5$$[rfc4173].
+    e.g.:
+
+----
+root=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0
+----
+
+If servername is an IPv6 address, it has to be put in brackets. e.g.:
+
+----
+root=iscsi:[2001:DB8::1]::::iqn.2009-06.dracut:target0
+----
+
+**root=**_???_ **netroot=**iscsi:[_<username>_:_<password>_[:_<reverse>_:_<password>_]@][_<servername>_]:[_<protocol>_]:[_<port>_][:[_<iscsi_iface_name>_]:[_<netdev_name>_]]:[_<LUN>_]:_<targetname>_ ...::
+    multiple netroot options allow setting up multiple iscsi disks. e.g.:
+
+----
+root=UUID=12424547
+netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0
+netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1
+----
+
+If servername is an IPv6 address, it has to be put in brackets. e.g.:
+
+----
+netroot=iscsi:[2001:DB8::1]::::iqn.2009-06.dracut:target0
+----
+
+**root=**_???_ **rd.iscsi.initiator=**_<initiator>_ **rd.iscsi.target.name=**_<target name>_  **rd.iscsi.target.ip=**_<target ip>_ **rd.iscsi.target.port=**_<target port>_ **rd.iscsi.target.group=**_<target group>_ **rd.iscsi.username=**_<username>_ **rd.iscsi.password=**_<password>_ **rd.iscsi.in.username=**_<in username>_ **rd.iscsi.in.password=**_<in password>_::
+    manually specify all iscsistart parameter (see **+iscsistart --help+**)
+
+**root=**_???_ **netroot=**iscsi **rd.iscsi.firmware=1**::
+ will read the iscsi parameter from the BIOS firmware
+
+**rd.iscsi.param=**_<param>_::
+    <param> will be passed as "--param <param>" to iscsistart.
+    This parameter can be specified multiple times.
+    e.g.:
+
+----
+"netroot=iscsi iscsi_firmware rd.iscsi.param=node.session.timeo.replacement_timeout=30"
+----
+
+will result in
+
+----
+iscsistart -b --param node.session.timeo.replacement_timeout=30
+----
+
+FCoE
+~~~~
+**fcoe=**_<edd|interface|MAC>_:_{dcb|nodcb}_::
+    Try to connect to a FCoE SAN through the NIC specified by _<interface>_ or
+    _<MAC>_ or EDD settings. For the second argument, currently only nodcb is
+    supported. This parameter can be specified multiple times. Note: letters in
+    the MAC-address must be lowercase!
+
+NBD
+~~~
+**root=**??? **netroot=**nbd:_<server>_:_<port>_[:_<fstype>_[:_<mountopts>_[:_<nbdopts>_]]]::
+    mount nbd share from <server>
+
+**root=dhcp** with **dhcp** **root-path=**nbd:_<server>_:_<port>_[:_<fstype>_[:_<mountopts>_[:_<nbdopts>_]]]::
+    root=dhcp alone directs initrd to look at the DHCP root-path where NBD
+    options can be specified. This syntax is only usable in cases where you are
+    directly mounting the volume as the rootfs.
+
+DASD
+~~~~
+**rd.dasd_mod.dasd=**....::
+    same syntax as the kernel module parameter (s390 only)
+
+**rd.dasd=**_<dasd_adaptor device bus ID>_[,readonly=_X_][,use_diag=_X_][,erplog=_X_]::
+    activate DASD device with the given adaptor device bus ID and setting the
+    sysfs attributes to the specified values. This parameter can be specified
+    multiple times.
+
+ZFCP
+~~~~
+**rd.zfcp=**_<zfcp adaptor device bus ID>_,_<WWPN>_,_<FCPLUN>_::
+    rd.zfcp can be specified multiple times on the kernel command line. e.g.: 
+
+----
+rd.zfcp=0.0.4000,0x5005076300C213e9,0x5022000000000000
+----
+
+**rd.zfcp.conf=0**::
+    ignore zfcp.conf included in the initramfs
+
+ZNET
+~~~~
+**rd.znet=**_<nettype>_,_<subchannels>_,_<options>_::
+    rd.znet can be specified multiple times on the kernel command line. e.g.: 
+
+----
+rd.znet=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portname=foo
+rd.znet=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar
+----
+
+Plymouth Boot Splash
+~~~~~~~~~~~~~~~~~~~~
+**plymouth.enable=0**::
+    disable the plymouth bootsplash completly.
+
+**rd.plymouth=0**::
+    disable the plymouth bootsplash only for the initramfs.
+
+Kernel keys
+~~~~~~~~~~~
+**masterkey=**_<kernel master key path name>_::
+    Set the path name of the kernel master key. e.g.: 
+
+----
+masterkey=/etc/keys/kmk-trusted.blob
+----
+
+**masterkeytype=**_<kernel master key type>_::
+    Set the type of the kernel master key. e.g.: 
+
+----
+masterkeytype=trusted
+----
+
+**evmkey=**_<EVM key path name>_::
+    Set the path name of the EVM key. e.g.: 
+
+----
+evmkey=/etc/keys/evm-trusted.blob
+----
+
+**ecryptfskey=**_<eCryptfs key path name>_::
+    Set the path name of the eCryptfs key. e.g.: 
+
+----
+ecryptfskey=/etc/keys/ecryptfs-trusted.blob
+----
+
+Deprecated, renamed Options
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Here is a list of options, which were used in dracut prior to version 008, and their new replacement.
+
+rdbreak:: rd.break
+
+rd_CCW:: rd.ccw
+
+rd_DASD_MOD:: rd.dasd_mod.dasd
+
+rd_DASD:: rd.dasd
+
+rdinitdebug rdnetdebug:: rd.debug
+
+rd_NO_DM:: rd.dm=0
+
+rd_DM_UUID:: rd.dm.uuid
+
+rdblacklist:: rd.driver.blacklist
+
+rdinsmodpost:: rd.driver.post
+
+rdloaddriver:: rd.driver.pre
+
+rd_NO_FSTAB:: rd.fstab=0
+
+rdinfo:: rd.info
+
+check:: rd.live.check
+
+rdlivedebug:: rd.live.debug
+
+live_dir:: rd.live.dir
+
+liveimg:: rd.live.image
+
+overlay:: rd.live.overlay
+
+readonly_overlay:: rd.live.overlay.readonly
+
+reset_overlay:: rd.live.overlay.reset
+
+live_ram:: rd.live.ram
+
+rd_NO_CRYPTTAB:: rd.luks.crypttab=0
+
+rd_LUKS_KEYDEV_UUID:: rd.luks.keydev.uuid
+
+rd_LUKS_KEYPATH:: rd.luks.keypath
+
+rd_NO_LUKS:: rd.luks=0
+
+rd_LUKS_UUID:: rd.luks.uuid
+
+rd_NO_LVMCONF:: rd.lvm.conf
+
+rd_LVM_LV:: rd.lvm.lv
+
+rd_NO_LVM:: rd.lvm=0
+
+rd_LVM_SNAPSHOT:: rd.lvm.snapshot
+
+rd_LVM_SNAPSIZE:: rd.lvm.snapsize
+
+rd_LVM_VG:: rd.lvm.vg
+
+rd_NO_MDADMCONF:: rd.md.conf=0
+
+rd_NO_MDIMSM:: rd.md.imsm=0
+
+rd_NO_MD:: rd.md=0
+
+rd_MD_UUID:: rd.md.uuid
+
+rd_NFS_DOMAIN:: rd.nfs.domain
+
+iscsi_initiator:: rd.iscsi.initiator
+
+iscsi_target_name:: rd.iscsi.target.name
+
+iscsi_target_ip:: rd.iscsi.target.ip
+
+iscsi_target_port:: rd.iscsi.target.port
+
+iscsi_target_group:: rd.iscsi.target.group
+
+iscsi_username:: rd.iscsi.username
+
+iscsi_password:: rd.iscsi.password
+
+iscsi_in_username:: rd.iscsi.in.username
+
+iscsi_in_password:: rd.iscsi.in.password
+
+iscsi_firmware:: rd.iscsi.firmware=0
+
+rd_NO_PLYMOUTH:: rd.plymouth=0
+
+rd_retry:: rd.retry
+
+rdshell:: rd.shell
+
+rd_NO_SPLASH:: rd.splash
+
+rdudevdebug:: rd.udev.debug
+
+rdudevinfo:: rd.udev.info
+
+rd_NO_ZFCPCONF:: rd.zfcp.conf=0
+
+rd_ZFCP:: rd.zfcp
+
+rd_ZNET:: rd.znet
+
+KEYMAP:: vconsole.keymap
+
+KEYTABLE:: vconsole.keymap
+
+SYSFONT:: vconsole.font
+
+CONTRANS:: vconsole.font.map
+
+UNIMAP:: vconsole.font.unimap
+
+UNICODE:: vconsole.unicode
+
+EXT_KEYMAP:: vconsole.keymap.ext
+
+Configuration in the Initramfs
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+_/etc/conf.d/_::
+    Any files found in _/etc/conf.d/_ will be sourced in the initramfs to
+    set initial values. Command line options will override these values
+    set in the configuration files.
+
+_/etc/cmdline_::
+    Can contain additional command line options.
+
+_/etc/cmdline.d/*.conf_::
+    Can contain additional command line options.
+
+AUTHOR
+------
+*Harald Hoyer*::
+    Project Leader and Developer
+
+SEE ALSO
+--------
+*dracut*(8) *dracut.conf*(5)
--- a/dracut.cmdline.7.xml
+++ b/dracut.cmdline.7.xml
--- a/dracut.conf
+++ b/dracut.conf
@@ -1,3 +1,7 @@
+# PUT YOUR CONFIG HERE OR IN separate files named *.conf
+# in /etc/dracut.conf.d
+# /etc/dracut.conf.d/*.conf will override the settings in here
+
 # Sample dracut config file

 logfile=/var/log/dracut.log
@@ -38,3 +42,7 @@ lvmconf="yes"

 # inhibit installation of any fsck tools
 #nofscks="yes"
+
+# set the directory for temporary files
+# default: /var/tmp
+#tmpdir=/tmp
--- a/dracut.conf.5.asc
+++ b/dracut.conf.5.asc
@@ -0,0 +1,138 @@
+DRACUT.CONF(5)
+==============
+:doctype: manpage
+:man source:   dracut
+:man manual:   dracut
+
+NAME
+----
+dracut.conf - configuration file(s) for dracut
+
+SYNOPSIS
+--------
+_/etc/dracut.conf_ _/etc/dracut.conf.d/*.conf_
+
+Description
+-----------
+_dracut.conf_ is loaded during the initialisation phase of dracut. Command line
+parameter will overwrite any values set here. _dracut.conf.d/*.conf_ files are
+read in alphanumerical order and will overwrite parameters set in
+_/etc/dracut.conf_. Each line specifies an attribute and a value. A '#'
+indicates the beginning of a comment; following characters, up to the end of the
+line are not interpreted.
+
+*dracutmodules+=*" __<dracut modules>__ "::
+    Specify a space-separated list of dracut modules to call when building the
+    initramfs. Modules are located in _/usr/lib/dracut/modules.d_.
+
+*omit_dracutmodules+=*" __<dracut modules>__ "::
+    Omit a space-separated list of dracut modules.
+
+*add_dracutmodules+=*" __<dracut modules>__ "::
+    Add a space-separated list of dracut modules.
+
+*drivers+=*" __<kernel modules>__ "::
+    Specify a space-separated list of kernel modules to exclusively include in
+    the initramfs. The kernel modules have to be specified without the ".ko"
+    suffix.
+
+*add_drivers+=*" __<kernel modules>__ "::
+    Specify a space-separated list of kernel modules to add to the initramfs.
+    The kernel modules have to be specified without the ".ko" suffix.
+
+*omit_drivers+=*" __<kernel modules>__ "::
+    Specify a space-separated list of kernel modules not to add to the
+    initramfs. The kernel modules have to be specified without the ".ko" suffix.
+
+*install_items+=*" __<kernel modules>__ "::
+    Specify a space-separated list of files, which are added to the initramfs
+    image.
+
+*filesystems+=*" __<filesystem names>__ "::
+    Specify a space-separated list of kernel filesystem modules to exclusively
+    include in the generic initramfs.
+
+*drivers_dir=*"__<kernel modules directory>__"::
+    Specify the directory, where to look for kernel modules
+
+*fw_dir+=*" :__<dir>__[:__<dir>__ ...] "::
+    Specify additional directories, where to look for firmwares, separated by :
+
+*install_items+=*" __<file>__[ __<file>__ ...] "::
+    Specify additional files to include in the initramfs, separated by spaces.
+
+*do_strip=*"__{yes|no}__"::
+    Strip binaries in the initramfs (default=yes)
+
+*hostonly=*"__{yes|no}__"::
+    Host-Only mode: Install only what is needed for booting the local host instead of a generic host.
+
+*tmpdir=*"__<temporary directory>__"::
+    Specify temporary directory to use.
+
+[WARNING]
+====
+If chrooted to another root other than the real root device, use --fstab and provide a valid _/etc/fstab_.
+====
+
+*use_fstab=*"__{yes|no}__"::
+    Use _/etc/fstab_ instead of _/proc/self/mountinfo_.
+
+*add_fstab+=*" __<filename>__ "::
+    Add entries of __<filename>__ to the initramfs /etc/fstab.
+
+*mdadmconf=*"__{yes|no}__"::
+    Include local _/etc/mdadm.conf_ (default=yes)
+
+*lvmconf=*"__{yes|no}__"::
+    Include local _/etc/lvm/lvm.conf_ (default=yes)
+
+*fscks=*" __<fsck tools>__ "::
+    Add a space-separated list of fsck tools. If nothing is specified, the
+    default is: "umount mount /sbin/fsck* xfs_db xfs_check xfs_repair e2fsck
+    jfs_fsck reiserfsck btrfsck". The installation is opportunistic
+    (non-existing tools are ignored).
+
+*nofscks=*"__{yes|no}__"::
+    If specified, inhibit installation of any fsck tools.
+
+*kernel_only=*"__{yes|no}__"::
+    Only install kernel drivers and firmware files. (default=no)
+
+*no_kernel=*"{yes|no}"::
+    Do not install kernel drivers and firmware files (default=no)
+
+*stdloglvl*="__\{0-6\}__"::
+    Set logging to standard error level.
+
+*sysloglvl*="__\{0-6\}__"::
+    Set logging to syslog level.
+
+*fileloglvl=*"__\{0-6\}__"::
+    Set logging to file level.
+
+*logfile=*"__<file>__"::
+    Path to log file.
+
+*show_modules=*"__{yes|no}__"::
+    Print included module's name to standard output during build.
+
+Files
+-----
+_/etc/dracut.conf_::
+    Old configuration file. You better use your own file in
+    _/etc/dracut/conf.d/_.
+
+_/etc/dracut/conf.d/_::
+    Any _/etc/dracut/conf.d/*.conf_ file can overwrite the values in
+    _/etc/dracut.conf_. The configuration files are read in alphanumerical
+    order.
+
+AUTHOR
+------
+Harald Hoyer
+
+See Also
+--------
+*dracut*(8) *dracut.cmdline*(7)
+
--- a/dracut.conf.5.xml
+++ b/dracut.conf.5.xml
@@ -1,297 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
-<!-- vim: set ts=8 sts=2 sw=2 et: -->
-<refentry id="dracutconf5">
-  <refentryinfo>
-    <title>dracut.conf</title>
-    <productname>dracut</productname>
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Harald</firstname>
-        <surname>Hoyer</surname>
-        <email>harald@redhat.com</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>dracut.conf</refentrytitle>
-    <manvolnum>5</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>dracut.conf</refname>
-    <refpurpose>configuration file(s) for dracut</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>/etc/dracut.conf</command>
-      <arg choice="plain">
-        <replaceable>/etc/dracut.conf.d/*.conf</replaceable>
-      </arg>
-      <sbr/>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>Description</title>
-    <para><filename>dracut.conf</filename>
-is loaded during the initialisation phase of dracut.
-Command line parameter will overwrite any values set here.
-<emphasis><filename>dracut.conf.d/*.conf</filename> files are read in alphanumerical order and will</emphasis>
-overwrite parameters set in <filename>/etc/dracut.conf</filename>. Each line specifies an attribute and a value. A &apos;#&apos; indicates the beginning of a comment; following characters, up to the end of the line are not interpreted.</para>
-    <variablelist>
-      <varlistentry>
-        <term>
-          <envar>dracutmodules+=&quot;&nbsp;<replaceable>&lt;dracut modules&gt;</replaceable>&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Specify a space-separated list of dracut modules to
-call when building the initramfs. Modules are located
-in <filename>/usr/lib/dracut/modules.d</filename>.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>omit_dracutmodules+=&quot;&nbsp;<replaceable>&lt;dracut modules&gt;</replaceable>&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Omit a space-separated list of dracut modules.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>add_dracutmodules+=&quot;&nbsp;<replaceable>&lt;dracut modules&gt;</replaceable>&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Add a space-separated list of dracut modules.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>drivers+=&quot;&nbsp;<replaceable>&lt;kernel modules&gt;</replaceable>&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Specify a space-separated list of kernel modules to
-exclusively include in the initramfs.
-The kernel modules have to be specified without the &quot;.ko&quot; suffix.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>add_drivers+=&quot;&nbsp;<replaceable>&lt;kernel modules&gt;</replaceable>&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Specify a space-separated list of kernel
-modules to add to the initramfs.
-The kernel modules have to be specified without the &quot;.ko&quot; suffix.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>omit_drivers+=&quot;&nbsp;<replaceable>&lt;kernel modules&gt;</replaceable>&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Specify a space-separated list of kernel
-modules not to add to the initramfs.
-The kernel modules have to be specified without the &quot;.ko&quot; suffix.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>install_items+=&quot;&nbsp;<replaceable>&lt;kernel modules&gt;</replaceable>&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Specify a space-separated list of files, which are added to the initramfs image.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>filesystems+=&quot;&nbsp;<replaceable>&lt;filesystem names&gt;</replaceable>&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Specify a space-separated list of kernel filesystem
-modules to exclusively include in the generic
-initramfs.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>drivers_dir=&quot;<replaceable>&lt;kernel modules directory&gt;</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Specify the directory, where to look for kernel modules</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>fw_dir+=&quot;&#160;:<replaceable>&lt;dir&gt;</replaceable>[:<replaceable>&lt;dir&gt;</replaceable>&nbsp;...]&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Specify additional directories, where to look for firmwares, separated by <constant>:</constant></para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>install_items+=&quot;&#160;<replaceable>&lt;file&gt;</replaceable>[ <replaceable>&lt;file&gt;</replaceable>&nbsp;...]&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Specify additional files to include in the initramfs, separated by spaces.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>do_strip=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Strip binaries in the initramfs (default=yes)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>hostonly=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Host-Only mode: Install only what is needed for booting
-   the local host instead of a generic host.
-   <warning><para>If chrooted to another root other than the real root device, use <option>--fstab</option> and provide a valid <filename>/etc/fstab</filename>.</para>
-            </warning>
-   </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>use_fstab=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Use <filename>/etc/fstab</filename> instead of <filename>/proc/self/mountinfo</filename>.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>add_fstab+=&quot;&nbsp;<replaceable>&lt;filename&gt;</replaceable>&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Add entries of <replaceable>&lt;filename&gt;</replaceable> to the initramfs /etc/fstab.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>mdadmconf=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Include local <filename>/etc/mdadm.conf</filename> (default=yes)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>lvmconf=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Include local <filename>/etc/lvm/lvm.conf</filename> (default=yes)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>fscks=&quot;&nbsp;<replaceable>&lt;fsck tools&gt;</replaceable>&nbsp;&quot;</envar>
-        </term>
-        <listitem>
-          <para>Add a space-separated list of fsck tools. If nothing is
-            specified, the default is: &quot;<replaceable>umount mount
-            /sbin/fsck* xfs_db xfs_check xfs_repair e2fsck jfs_fsck
-            reiserfsck btrfsck</replaceable>&quot;
-          </para>
-          <para>The installation is opportunistic (non-existing tools are ignored).</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>nofscks=&quot;<replaceable>{yes}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>If specified, inhibit installation of any fsck tools.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>kernel_only=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Only install kernel drivers and firmware files. (default=no)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>no_kernel=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Do not install kernel drivers and firmware files (default=no)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>stdloglvl=&quot;<replaceable>{0-6}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Set logging to standard error level.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>sysloglvl=&quot;<replaceable>{0-6}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Set logging to syslog level.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>fileloglvl=&quot;<replaceable>{0-6}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Set logging to file level.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>logfile=&quot;<replaceable>&lt;file&gt;</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Path to log file.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>show_modules=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
-        </term>
-        <listitem>
-          <para>Print included module's name to standard output during build.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>Files</title>
-    <variablelist>
-      <varlistentry>
-        <term>
-          <filename>/etc/dracut/conf.d/</filename>
-        </term>
-        <listitem>
-          <para>Any <filename>/etc/dracut/conf.d/*.conf</filename> file can overwrite the values in <filename>/etc/dracut.conf</filename>.
-The configuration files are read in alphanumerical order.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>See Also</title>
-    <para><citerefentry>
-        <refentrytitle>dracut</refentrytitle>
-        <manvolnum>8</manvolnum>
-      </citerefentry>
-      <citerefentry>
-        <refentrytitle>dracut.cmdline</refentrytitle>
-        <manvolnum>7</manvolnum>
-      </citerefentry>
-    </para>
-  </refsect1>
-</refentry>
--- a/dracut.conf.d/fedora.conf.example
+++ b/dracut.conf.d/fedora.conf.example
@@ -2,9 +2,9 @@

 # i18n
 i18n_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP /etc/sysconfig/i18n:SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
-add_dracutmodules+=" rpmversion "
 omit_dracutmodules+=" dash "
-omit_drivers+=" ocfs2 "
+omit_drivers+=" .*/fs/ocfs/.* "
 stdloglvl=3
 realinitpath="/usr/lib/systemd/systemd"
-install_items+=" vi /etc/virc ps grep cat rm openvt "
+install_items+=" vi /etc/virc ps grep cat rm "
+prefix="/"
--- a/dracut.sh
+++ b/dracut.sh
@@ -27,9 +27,17 @@
 dracut_args="$@"

 usage() {
+    [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
+    if [[ -f $dracutbasedir/dracut-version.sh ]]; then
+        . $dracutbasedir/dracut-version.sh
+    fi
+
 #                                                       80x25 linebreak here ^
    cat << EOF
 Usage: $0 [OPTION]... <initramfs> <kernel-version>
+
+Version: $DRACUT_VERSION
+
 Creates initial ramdisk images for preloading modules

  -f, --force           Overwrite existing initramfs file.
@@ -80,12 +88,15 @@ Creates initial ramdisk images for preloading modules
                         Default: /etc/dracut.conf
  --confdir [DIR]       Specify configuration directory to use *.conf files
                         from. Default: /etc/dracut.conf.d
+  --tmpdir [DIR]        Temporary directory to be used instead of default
+                         /var/tmp.
  -l, --local           Local mode. Use modules from the current working
                         directory instead of the system-wide installed in
                         /usr/lib/dracut/modules.d.
                         Useful when running dracut from a git checkout.
  -H, --hostonly        Host-Only mode: Install only what is needed for
                         booting the local host instead of a generic host.
+  --no-hostonly         Disables Host-Only mode
  --fstab               Use /etc/fstab to determine the root device.
  --add-fstab [FILE]    Add file to the initramfs fstab
  --mount "[DEV] [MP] [FSTYPE] [FSOPTS]"
@@ -120,8 +131,8 @@ Creates initial ramdisk images for preloading modules
  -M, --show-modules    Print included module's name to standard output during
                         build.
  --keep                Keep the temporary initramfs for debugging purposes
+  --printsize           Print out the module install size
  --sshkey [SSHKEY]     Add ssh key to initramfs (use with ssh-client module)
-  --ctty                Add control tty for emergency shells

 If [LIST] has multiple arguments, then you have to put these in quotes.
 For example:
@@ -219,6 +230,7 @@ while (($# > 0)); do
        --filesystems) push_arg filesystems_l        "$@" || shift;;
        -I|--install)  push_arg install_items_l      "$@" || shift;;
        --fwdir)       push_arg fw_dir_l             "$@" || shift;;
+        --libdirs)     push_arg libdirs_l            "$@" || shift;;
        --fscks)       push_arg fscks_l              "$@" || shift;;
        --add-fstab)   push_arg add_fstab_l          "$@" || shift;;
        --mount)       push_arg fstab_lines          "$@" || shift;;
@@ -226,6 +238,7 @@ while (($# > 0)); do
        -k|--kmoddir)  read_arg drivers_dir_l        "$@" || shift;;
        -c|--conf)     read_arg conffile             "$@" || shift;;
        --confdir)     read_arg confdir              "$@" || shift;;
+        --tmpdir)      read_arg tmpdir_l             "$@" || shift;;
        -L|--stdlog)   read_arg stdloglvl_l          "$@" || shift;;
        --compress)    read_arg compress_l           "$@" || shift;;
        --prefix)      read_arg prefix_l             "$@" || shift;;
@@ -241,12 +254,16 @@ while (($# > 0)); do
        --nolvmconf)   lvmconf_l="no";;
        --debug)       debug="yes";;
        --profile)     profile="yes";;
-        --ctty)        cttyhack="yes";;
        --sshkey)      read_arg sshkey   "$@" || shift;;
        -v|--verbose)  ((verbosity_mod_l++));;
        -q|--quiet)    ((verbosity_mod_l--));;
-        -l|--local)    allowlocal="yes" ;;
+        -l|--local)
+                       allowlocal="yes"
+                       [[ -f "$(readlink -f ${0%/*})/dracut-functions.sh" ]] \
+                           && dracutbasedir="$(readlink -f ${0%/*})"
+                       ;;
        -H|--hostonly) hostonly_l="yes" ;;
+        --no-hostonly) hostonly_l="no" ;;
        --fstab)       use_fstab_l="yes" ;;
        -h|--help)     usage; exit 1 ;;
        -i|--include)  push include_src "$2"
@@ -264,6 +281,7 @@ while (($# > 0)); do
                       show_modules_l="yes"
                       ;;
        --keep)        keep="yes";;
+        --printsize)   printsize="yes";;
        -*) printf "\nUnknown option: %s\n\n" "$1" >&2; usage; exit 1;;
        *)
            if ! [[ ${outfile+x} ]]; then
@@ -307,9 +325,6 @@ unset GREP_OPTIONS

 [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut

-[[ $allowlocal && -f "$(readlink -f ${0%/*})/dracut-functions" ]] && \
-    dracutbasedir="$(readlink -f ${0%/*})"
-
 # if we were not passed a config file, try the default one
 if [[ ! -f $conffile ]]; then
    [[ $allowlocal ]] && conffile="$dracutbasedir/dracut.conf" || \
@@ -397,6 +412,13 @@ if (( ${#fw_dir_l[@]} )); then
    done
 fi

+if (( ${#libdirs_l[@]} )); then
+    libdirs=''
+    while pop libdirs_l val; do
+        libdirs+="$val "
+    done
+fi
+
 [[ $stdloglvl_l ]] && stdloglvl=$stdloglvl_l
 [[ ! $stdloglvl ]] && stdloglvl=4
 stdloglvl=$((stdloglvl + verbosity_mod_l))
@@ -413,6 +435,8 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
 [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
 [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
 [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
+[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
+[[ $tmpdir ]] || tmpdir=/var/tmp
 [[ $do_strip ]] || do_strip=no
 [[ $compress_l ]] && compress=$compress_l
 [[ $show_modules_l ]] && show_modules=$show_modules_l
@@ -436,15 +460,19 @@ fi
 [[ $hostonly = yes ]] && hostonly="-h"
 [[ $hostonly != "-h" ]] && unset hostonly

-if [[ -f $dracutbasedir/dracut-functions ]]; then
-    . $dracutbasedir/dracut-functions
+if [[ -f $dracutbasedir/dracut-functions.sh ]]; then
+    . $dracutbasedir/dracut-functions.sh
 else
-    echo "Cannot find $dracutbasedir/dracut-functions." >&2
+    echo "Cannot find $dracutbasedir/dracut-functions.sh." >&2
    echo "Are you running from a git checkout?" >&2
    echo "Try passing -l as an argument to $0" >&2
    exit 1
 fi

+if [[ -f $dracutbasedir/dracut-version.sh ]]; then
+    . $dracutbasedir/dracut-version.sh
+fi
+
 # Verify bash version, curret minimum is 3.1
 if (( ${BASH_VERSINFO[0]} < 3 ||
    ( ${BASH_VERSINFO[0]} == 3 && ${BASH_VERSINFO[1]} < 1 ) )); then
@@ -452,7 +480,7 @@ if (( ${BASH_VERSINFO[0]} < 3 ||
    exit 1
 fi

-dracutfunctions=$dracutbasedir/dracut-functions
+dracutfunctions=$dracutbasedir/dracut-functions.sh
 export dracutfunctions

 if (( ${#drivers_l[@]} )); then
@@ -477,12 +505,12 @@ if (( ${#omit_drivers_l[@]} )); then
 fi
 omit_drivers=${omit_drivers/-/_}

-unset omit_drivers_corrected
+omit_drivers_corrected=""
 for d in $omit_drivers; do
    strstr " $drivers $add_drivers " " $d " && continue
-    omit_drivers_corrected+=" $d "
+    omit_drivers_corrected+="$d|"
 done
-omit_drivers=$omit_drivers_corrected
+omit_drivers="${omit_drivers_corrected%|}"
 unset omit_drivers_corrected


@@ -499,16 +527,23 @@ ddebug "Executing $0 $dracut_args"
 }

 # Detect lib paths
-[[ $libdir ]] || for libdir in /lib64 /lib; do
-    [[ -d $libdir ]] && break
-done || {
-    dfatal 'No lib directory?!!!'
-    exit 1
-}
-
-[[ $usrlibdir ]] || for usrlibdir in /usr/lib64 /usr/lib; do
-    [[ -d $usrlibdir ]] && break
-done || dwarn 'No usr/lib directory!'
+if ! [[ $libdir ]] || ! [[ $usrlibdir ]] ; then
+    if strstr "$(ldd /bin/sh)" "/lib64/" &>/dev/null \
+        && [[ -d /lib64 ]]; then
+        libdir=/lib64
+        usrlibdir=/usr/lib64
+    else
+        libdir=/lib
+        usrlibdir=/usr/lib
+    fi
+    for i in $libdir $usrlibdir; do
+        if [[ -d $i ]]; then
+            libdirs+=" $i"
+        else
+            dwarn 'No $i directory??!!'
+        fi
+    done
+fi

 # This is kinda legacy -- eventually it should go away.
 case $dracutmodules in
@@ -546,8 +581,8 @@ elif [[ -f "$outfile" && ! -w "$outfile" ]]; then
    exit 1
 fi

-readonly TMPDIR=/var/tmp
-readonly initdir=$(mktemp --tmpdir=/var/tmp/ -d -t initramfs.XXXXXX)
+readonly TMPDIR="$tmpdir"
+readonly initdir=$(mktemp --tmpdir="$TMPDIR/" -d -t initramfs.XXXXXX)
 [ -d "$initdir" ] || {
    dfatal "mktemp failed."
    exit 1
@@ -598,11 +633,11 @@ fi
 _get_fs_type() (
    [[ $1 ]] || return
    if [[ -b $1 ]] && get_fs_env $1; then
-        echo "$1|$ID_FS_TYPE"
+        echo "$(readlink -f $1)|$ID_FS_TYPE"
        return 1
    fi
    if [[ -b /dev/block/$1 ]] && get_fs_env /dev/block/$1; then
-        echo "/dev/block/$1|$ID_FS_TYPE"
+        echo "$(readlink -f /dev/block/$1)|$ID_FS_TYPE"
        return 1
    fi
    if fstype=$(find_dev_fstype $1); then
@@ -625,9 +660,10 @@ done
 export initdir dracutbasedir dracutmodules drivers \
    fw_dir drivers_dir debug no_kernel kernel_only \
    add_drivers omit_drivers mdadmconf lvmconf filesystems \
-    use_fstab fstab_lines libdir usrlibdir fscks nofscks cttyhack \
+    use_fstab fstab_lines libdir usrlibdir fscks nofscks \
    stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
-    debug host_fs_types host_devs sshkey
+    debug host_fs_types host_devs sshkey add_fstab \
+    DRACUT_VERSION

 # Create some directory structure first
 [[ $prefix ]] && mkdir -m 0755 -p "${initdir}${prefix}"
@@ -642,18 +678,18 @@ if [[ $prefix ]]; then
 fi

 if [[ $kernel_only != yes ]]; then
-    for d in bin etc lib "$libdir" sbin tmp usr var var/log usr/bin usr/sbin; do
+    for d in usr/bin usr/sbin bin etc lib "$libdir" sbin tmp usr var var/log var/run var/lock; do
        [[ -e "${initdir}${prefix}/$d" ]] && continue
-        if [ -h "/$d" ]; then
-            inst "/$d" "${prefix}/$d"
+        if [ -L "/$d" ]; then
+            inst_symlink "/$d" "${prefix}/$d"
        else
            mkdir -m 0755 -p "${initdir}${prefix}/$d"
        fi
    done

    for d in dev proc sys sysroot root run run/lock run/initramfs; do
-        if [ -h "/$d" ]; then
-            inst "/$d"
+        if [ -L "/$d" ]; then
+            inst_symlink "/$d"
        else
            mkdir -m 0755 -p "$initdir/$d"
        fi
@@ -672,7 +708,17 @@ else
    done
 fi

-mkdir -p "${initdir}/etc/cmdline.d"
+if [[ $kernel_only != yes ]]; then
+    mkdir -p "${initdir}/etc/cmdline.d"
+    for _d in $hookdirs; do
+        mkdir -m 0755 -p ${initdir}/lib/dracut/hooks/$_d
+    done
+    if [[ "$UID" = "0" ]]; then
+        cp -a /dev/kmsg /dev/null /dev/console $initdir/dev
+    fi
+fi
+
+mkdir -p "$initdir/.kernelmodseen"

 mods_to_load=""
 # check all our modules to see if they should be sourced.
@@ -680,6 +726,7 @@ mods_to_load=""
 for_each_module_dir check_module
 for_each_module_dir check_mount

+_isize=0 #initramfs size
 modules_loaded=" "
 # source our modules.
 for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
@@ -688,18 +735,37 @@ for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
        [[ $show_modules = yes ]] && echo "$_d_mod" || \
            dinfo "*** Including module: $_d_mod ***"
        if [[ $kernel_only = yes ]]; then
-            module_installkernel $_d_mod
+            module_installkernel $_d_mod || {
+                dfatal "installkernel failed in module $_d_mod"
+                exit 1
+            }
        else
            module_install $_d_mod
            if [[ $no_kernel != yes ]]; then
-                module_installkernel $_d_mod
+                module_installkernel $_d_mod || {
+                    dfatal "installkernel failed in module $_d_mod"
+                    exit 1
+                }
            fi
        fi
        mods_to_load=${mods_to_load// $_d_mod /}
        modules_loaded+="$_d_mod "
+
+        #print the module install size
+        if [ -n "$printsize" ]; then
+            _isize_new=$(du -sk ${initdir}|cut -f1)
+            _isize_delta=$(($_isize_new - $_isize))
+            echo "$_d_mod install size: ${_isize_delta}k"
+            _isize=$_isize_new
+        fi
    fi
 done
 unset moddir
+
+for i in $modules_loaded; do
+    echo "$i" >> $initdir/lib/dracut/modules.txt
+done
+
 dinfo "*** Including modules done ***"

 ## final stuff that has to happen
@@ -737,20 +803,20 @@ while pop include_src src && pop include_target tgt; do
    fi
 done

-for item in $install_items; do
-    dracut_install -o "$item"
-done
-unset item
-
-while pop fstab_lines line; do
-    echo "$line 0 0" >> "${initdir}/etc/fstab"
-done
-
-for f in $add_fstab; do
-    cat $f >> "${initdir}/etc/fstab"
-done
-
 if [[ $kernel_only != yes ]]; then
+    for item in $install_items; do
+        dracut_install "$item"
+    done
+    unset item
+
+    while pop fstab_lines line; do
+        echo "$line 0 0" >> "${initdir}/etc/fstab"
+    done
+
+    for f in $add_fstab; do
+        cat $f >> "${initdir}/etc/fstab"
+    done
+
    # make sure that library links are correct and up to date
    for f in /etc/ld.so.conf /etc/ld.so.conf.d/*; do
        [[ -f $f ]] && inst_simple "$f"
@@ -764,6 +830,9 @@ if [[ $kernel_only != yes ]]; then
    fi
 fi

+rm -fr "$initdir/.kernelmodseen"
+
+
 if (($maxloglvl >= 5)); then
    ddebug "Listing sizes of included files:"
    du -c "$initdir" | sort -n | ddebug
@@ -793,11 +862,14 @@ type hardlink &>/dev/null && {
 }

 if strstr "$modules_loaded" " fips " && command -v prelink >/dev/null; then
-    for i in $initdir/bin/* \
-       $initdir/sbin/* \
-       $initdir/usr/bin/* \
-       $initdir/usr/sbin/*; do
-       [ -x $i ] && prelink -u $i &>/dev/null
+    for dir in "$initdir/bin" \
+       "$initdir/sbin" \
+       "$initdir/usr/bin" \
+       "$initdir/usr/sbin"; do
+        [[ -L "$dir" ]] && continue
+        for i in "$dir"/*; do
+            [[ -x $i ]] && prelink -u $i &>/dev/null
+        done
    done
 fi

--- a/dracut.spec
+++ b/dracut.spec
@@ -13,7 +13,7 @@ Version: xxx
 Release: xxx

 Summary: Initramfs generator using udev
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel}
 Group: System Environment/Base
 %endif
 %if 0%{?suse_version}
@@ -28,22 +28,24 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar
 BuildArch: noarch
 BuildRequires: dash bash git

-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %endif
 %if 0%{?suse_version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 %endif

-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel}
 BuildRequires: docbook-style-xsl docbook-dtds libxslt
 %endif

 %if 0%{?suse_version}
-BuildRequires: docbook-xsl-stylesheets libxslt
+-BuildRequires: docbook-xsl-stylesheets libxslt
 %endif

-%if 0%{?fedora} > 12 || 0%{?rhel} >= 6
+BuildRequires: asciidoc
+
+%if 0%{?fedora} > 12 || 0%{?rhel}
 # no "provides", because dracut does not offer
 # all functionality of the obsoleted packages
 Obsoletes: mkinitrd <= 6.0.93
@@ -65,17 +67,22 @@ Obsoletes: dracut-kernel < 005
 Provides:  dracut-kernel = %{version}-%{release}

 Requires: bash
-Requires: bzip2
 Requires: coreutils
 Requires: cpio
 Requires: filesystem >= 2.1.0
 Requires: findutils
 Requires: grep
-Requires: gzip
+Requires: hardlink
+Requires: gzip xz
 Requires: module-init-tools >= 3.7-9
 Requires: sed
-Requires: udev
-Requires: util-linux >= 2.20
+Requires: file
+Requires: udev > 166
+%if 0%{?fedora} || 0%{?rhel} > 6
+Requires: util-linux >= 2.21
+%else
+Requires: util-linux-ng >= 2.21
+%endif

 %if 0%{?fedora} || 0%{?rhel} > 6
 Conflicts: initscripts < 8.63-1
@@ -99,7 +106,7 @@ Provides:  dracut-generic = %{version}-%{release}
 This package requires everything which is needed to build a generic
 all purpose initramfs with network support with dracut.

-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} >= 6
 %package fips
 Summary: Dracut modules to build a dracut initramfs with an integrity check
 Requires: %{name} = %{version}-%{release}
@@ -123,7 +130,7 @@ Requires: %{name}-fips = %{version}-%{release}

 %description fips-aesni
 This package requires everything which is needed to build an
-all purpose initramfs with dracut, which does an integrity check 
+all purpose initramfs with dracut, which does an integrity check
 and adds the aesni-intel kernel module.

 %package caps
@@ -157,19 +164,21 @@ git am -p1 %{patches}
 %endif

 %build
-make
+make all

 %install
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel}
 rm -rf $RPM_BUILD_ROOT
 %endif
 make install DESTDIR=$RPM_BUILD_ROOT \
     libdir=%{_prefix}/lib \
     bindir=%{_bindir} \
-     sysconfdir=/etc mandir=%{_mandir} \
-     systemdsystemunitdir=%{_unitdir}
+%if %{defined _unitdir}
+     systemdsystemunitdir=%{_unitdir} \
+%endif
+     sysconfdir=/etc mandir=%{_mandir}

-echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/10rpmversion/dracut-version
+echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh

 %if 0%{?fedora} == 0 && 0%{?rhel} == 0
 rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
@@ -179,13 +188,21 @@ rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
 # remove gentoo specific modules
 rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash

+%if %{defined _unitdir}
+# with systemd IMA and selinux modules do not make sense
+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/96securityfs
+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/97masterkey
+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity
+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98selinux
+%endif
+
 mkdir -p $RPM_BUILD_ROOT/boot/dracut
 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
 touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
 mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs

-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel}
 install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf
 install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/40-fips.conf
 %endif
@@ -221,11 +238,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/modules.d
+%{dracutlibdir}/dracut-functions.sh
 %{dracutlibdir}/dracut-functions
-%{dracutlibdir}/dracut-logger
+%{dracutlibdir}/dracut-version.sh
+%{dracutlibdir}/dracut-logger.sh
 %{dracutlibdir}/dracut-initramfs-restore
 %config(noreplace) /etc/dracut.conf
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %config /etc/dracut.conf.d/01-dist.conf
 %endif
 %dir /etc/dracut.conf.d
@@ -237,10 +256,10 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/00dash
 %{dracutlibdir}/modules.d/05busybox
 %{dracutlibdir}/modules.d/10i18n
-%{dracutlibdir}/modules.d/10rpmversion
 %{dracutlibdir}/modules.d/30convertfs
 %{dracutlibdir}/modules.d/45url-lib
 %{dracutlibdir}/modules.d/50plymouth
+%{dracutlibdir}/modules.d/80cms
 %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90crypt
 %{dracutlibdir}/modules.d/90dm
@@ -260,13 +279,18 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/95zfcp
 %{dracutlibdir}/modules.d/95terminfo
 %{dracutlibdir}/modules.d/95udev-rules
+%{dracutlibdir}/modules.d/95virtfs
+%if %{undefined _unitdir}
 %{dracutlibdir}/modules.d/96securityfs
-%{dracutlibdir}/modules.d/97biosdevname
 %{dracutlibdir}/modules.d/97masterkey
-%{dracutlibdir}/modules.d/98ecryptfs
-%{dracutlibdir}/modules.d/98integrity
 %{dracutlibdir}/modules.d/98selinux
+%{dracutlibdir}/modules.d/98integrity
+%endif
+%{dracutlibdir}/modules.d/97biosdevname
+%{dracutlibdir}/modules.d/98ecryptfs
+%{dracutlibdir}/modules.d/98pollcdrom
 %{dracutlibdir}/modules.d/98syslog
+%{dracutlibdir}/modules.d/98systemd
 %{dracutlibdir}/modules.d/98usrmount
 %{dracutlibdir}/modules.d/99base
 %{dracutlibdir}/modules.d/99fs-lib
@@ -275,8 +299,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/logrotate.d/dracut_log
 %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
 %dir %{_sharedstatedir}/initramfs
-%if 0%{?fedora} > 16 || 0%{?rhel} > 6
+%if %{defined _unitdir}
 %{_unitdir}/*.service
+%{_unitdir}/*.target
 %{_unitdir}/*/*.service
 %endif

@@ -292,7 +317,7 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/45ifcfg
 %{dracutlibdir}/modules.d/95znet

-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel}
 %files fips
 %defattr(-,root,root,0755)
 %{dracutlibdir}/modules.d/01fips
@@ -310,9 +335,7 @@ rm -rf $RPM_BUILD_ROOT

 %files tools
 %defattr(-,root,root,0755)
-%{_mandir}/man8/dracut-gencmdline.8*
 %{_mandir}/man8/dracut-catimages.8*
-%{_bindir}/dracut-gencmdline
 %{_bindir}/dracut-catimages
 %dir /boot/dracut
 %dir /var/lib/dracut
--- a/dracut.xml
+++ b/dracut.xml
@@ -1,729 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
-<book>
-  <title><inlinemediaobject>
-      <imageobject>
-        <imagedata valign="middle" fileref="dracut.png" format="PNG"/>
-      </imageobject>
-      <imageobject>
-        <imagedata valign="middle" fileref="dracut.svg" format="SVG"/>
-      </imageobject>
-      <imageobject>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dracut.svg" encoding="UTF-8" parse="xml"/>
-      </imageobject>
-    </inlinemediaobject>dracut</title>
-  <bookinfo>
-    <author>
-      <firstname>Harald</firstname>
-      <surname>Hoyer</surname>
-    </author>
-    <pubdate>2010</pubdate>
-    <edition>Version 1.0</edition>
-    <copyright>
-      <year>2010</year>
-      <holder>Harald Hoyer</holder>
-    </copyright>
-    <legalnotice>
-      <para>
- This work is licensed under the Creative Commons Attribution/Share-Alike License. To view a copy of this license, visit <ulink url="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</ulink> or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
-      </para>
-    </legalnotice>
-  </bookinfo>
-  <toc/>
-  <chapter>
-    <chapterinfo>
-      <legalnotice>
-        <para>
- This section is a modified version of <ulink url="http://en.wikipedia.org/wiki/Initrd">http://en.wikipedia.org/wiki/Initrd</ulink>, which is licensed under the Creative Commons Attribution/Share-Alike License.
-      </para>
-      </legalnotice>
-    </chapterinfo>
-    <title>Introduction</title>
-    <section>
-      <title>Definition</title>
-      <para>An <emphasis>initial ramdisk</emphasis> is a temporary file system used in the boot process of the Linux kernel.  <emphasis>initrd</emphasis> and <emphasis>initramfs</emphasis> refer to slightly different schemes for loading this file system into memory.  Both are commonly used to make preparations before the real root file system can be mounted.</para>
-    </section>
-    <section>
-      <title>Rationale </title>
-      <para>Many Linux distributions ship a single, generic kernel image that is intended to boot as wide a variety of hardware as possible.  The device drivers for this generic kernel image are included as loadable modules, as it is not possible to statically compile them all into the one kernel without making it too large to boot from computers with limited memory or from lower-capacity media like floppy disks.
-        </para>
-      <para>This then raises the problem of detecting and loading the modules necessary to mount the root file system at boot time (or, for that matter, deducing where or what the root file system is).
-        </para>
-      <para>To further complicate matters, the root file system may be on a software <acronym>RAID</acronym> volume, <acronym>LVM</acronym>, <acronym>NFS</acronym> (on diskless workstations), or on an encrypted partition.  All of these require special preparations to mount.
-        </para>
-      <para>Another complication is kernel support for hibernation, which suspends the computer to disk by dumping an image of the entire system to a swap partition or a regular file, then powering off.  On next boot, this image has to be made accessible before it can be loaded back into memory. </para>
-      <para>To avoid having to hardcode handling for so many special cases into the kernel, an initial boot stage with a temporary root file system—now dubbed early user space—is used.  This root file system would contain user-space helpers that would do the hardware detection, module loading and device discovery necessary to get the real root file system mounted.
-      </para>
-    </section>
-    <section>
-      <title>Implementation </title>
-      <para>An image of this initial root file system (along with the kernel image) must be stored somewhere accessible by the Linux bootloader or the boot firmware of the computer.  This can be: </para>
-      <itemizedlist>
-        <listitem>
-          <para>The root file system itself </para>
-        </listitem>
-        <listitem>
-          <para>A boot image on an optical disc
-   </para>
-        </listitem>
-        <listitem>
-          <para>A small ext2/ext3 or <acronym>FAT</acronym>-formatted partition on a local disk (a <emphasis>boot partition</emphasis>)</para>
-        </listitem>
-        <listitem>
-          <para>A <acronym>TFTP</acronym> server (on systems that can boot from Ethernet) </para>
-        </listitem>
-      </itemizedlist>
-      <para>The bootloader will load the kernel and initial root file system image into memory and then start the kernel, passing in the memory address of the image.
-    </para>
-      <para>Depending on which algorithms were compiled statically into it, the kernel can currently unpack initrd/initramfs images compressed with gzip, bzip2 and <acronym>LZMA</acronym>. </para>
-    </section>
-    <section>
-      <title>Mount preparations </title>
-      <para>dracut can generate a customized initrams image which contains only whatever is necessary to boot some particular computer, such as <acronym>ATA</acronym>, <acronym>SCSI</acronym> and filesystem kernel modules (host-only mode).</para>
-      <para>dracut can also generate a more generic initramfs image (default mode).  </para>
-      <para>dracut&apos;s initramfs starts only with the device name of the root file system (or its <acronym>UUID</acronym>) and must discover everything else at boot time.  A complex cascade of tasks must be performed to get the root file system mounted: </para>
-      <itemizedlist>
-        <listitem>
-          <para>Any hardware drivers that the boot process depends on must be loaded.  All kernel modules for common storage devices are packed onto the initramfs and then udev pulls in modules matching the computer&apos;s detected hardware. </para>
-        </listitem>
-        <listitem>
-          <para>On systems which display a boot rd.splash screen, the video hardware must be initialized and a user-space helper started to paint animations onto the display in lockstep with the boot process. </para>
-        </listitem>
-        <listitem>
-          <para>If the root file system is on NFS, dracut does  then: <itemizedlist>
-              <listitem>
-                <para>Bring up the primary network interface. </para>
-              </listitem>
-              <listitem>
-                <para>Invoke a DHCP client, with which it can obtain a DHCP lease. </para>
-              </listitem>
-              <listitem>
-                <para>Extract the name of the NFS share and the address of the NFS server from the lease. </para>
-              </listitem>
-              <listitem>
-                <para>Mount the <acronym>NFS</acronym> share. </para>
-              </listitem>
-            </itemizedlist></para>
-        </listitem>
-        <listitem>
-          <para>If the root file system appears to be on a software <acronym>RAID</acronym> device, there is no way of knowing which devices the <acronym>RAID</acronym> volume spans; the standard <acronym>MD</acronym> utilities must be invoked to scan all available block devices with a raid signature and bring the required ones online. </para>
-        </listitem>
-        <listitem>
-          <para>If the root file system appears to be on a logical volume, the <acronym>LVM</acronym> utilities must be invoked to scan for and activate the volume group containing it. </para>
-        </listitem>
-        <listitem>
-          <para>If the root file system is on an encrypted block device: <itemizedlist>
-              <listitem>
-                <para>Invoke a helper script to prompt the user to type in a passphrase and/or insert a hardware token (such as a smart card or a <acronym>USB</acronym> security dongle). </para>
-              </listitem>
-              <listitem>
-                <para>Create a decryption target with the device mapper. </para>
-              </listitem>
-            </itemizedlist></para>
-        </listitem>
-      </itemizedlist>
-      <para>dracut uses udev, an event-driven hotplug agent, which invokes helper programs as hardware devices, disk partitions and storage volumes matching certain rules come online.  This allows discovery to run in parallel, and to progressively cascade into arbitrary nestings of <acronym>LVM</acronym>, <acronym>RAID</acronym> or encryption to get at the root file system. </para>
-      <para>When the root file system finally becomes visible: <itemizedlist>
-          <listitem>
-            <para>Any maintenance tasks which cannot run on a mounted root file system are done.  </para>
-          </listitem>
-          <listitem>
-            <para>The root file system is mounted read-only. </para>
-          </listitem>
-          <listitem>
-            <para>Any processes which must continue running (such as the rd.splash screen helper and its command <acronym>FIFO</acronym>) are hoisted into the newly-mounted root file system. </para>
-          </listitem>
-        </itemizedlist></para>
-      <para>The final root file system cannot simply be mounted over /, since that would make the scripts and tools on the initial root file system inaccessible for any final cleanup tasks. On an initramfs, the initial root file system cannot be rotated away. Instead, it is simply emptied and the final root file system mounted over the top.
-    </para>
-    </section>
-  </chapter>
-  <chapter>
-    <title>User Manual</title>
-    <section>
-      <title>Creating an initramfs Image</title>
-      <para>To create a initramfs image, the most simple command is:</para>
-      <screen># dracut</screen>
-      <para>This will generate a general purpose initramfs image, with all possible functionality resulting of  the combination of the installed dracut modules and system tools. The image is /boot/initramfs-<replaceable>&lt;kernel version&gt;</replaceable>.img and contains the kernel modules of the currently active kernel with version <replaceable>&lt;kernel version&gt;</replaceable>.</para>
-      <para>If the initramfs image already exists, dracut will display an error message, and to overwrite the existing image, you have to use the <option>--force</option> option. </para>
-      <screen># dracut --force</screen>
-      <para>If you want to specify another filename for the resulting image you would issue a command like:</para>
-      <screen># dracut foobar.img</screen>
-      <para>To generate an image for a specific kernel version, the command would be:</para>
-      <screen># dracut foobar.img 2.6.40-1.rc5.f20</screen>
-      <para>A shortcut to generate the image at the default location for a specific kernel version is:</para>
-      <screen># dracut &apos;&apos; 2.6.40-1.rc5.f20</screen>
-      <para>If you want to create lighter, smaller initramfs images, you may want to specify the <option>--host-only</option> or  <option>-H</option> option. Using this option, the resulting image will contain only those dracut modules, kernel modules and filesystems, which are needed to boot this specific machine. This has the drawback, that you can&apos;t put the disk on another controller or machine, and that you can&apos;t switch to another root filesystem, without recreating the initramfs image. The usage of the <option>--host-only</option> option is only for experts and you will have to keep the broken pieces. At least keep a copy of a general purpose image (and corresponding kernel) as a fallback to rescue your system.</para>
-      <section>
-        <title>Inspecting the Contents</title>
-        <para>To see the contents of the image created by dracut, you can use the <command>lsinitrd</command> tool.</para>
-        <screen># lsinitrd /boot/initramfs-$(uname -r).img | less</screen>
-        <para>To display the contents of a file in the initramfs also use the <command>lsinitrd</command> tool:</para>
-        <screen># lsinitrd /boot/initramfs-$(uname -r).img  /etc/ld.so.conf
-include ld.so.conf.d/*.conf</screen>
-      </section>
-      <section>
-        <title>Adding dracut Modules</title>
-        <para>Some dracut modules are turned off by default and have to be activated manually. You can do this by adding the dracut modules to the configuration file <filename>/etc/dracut.conf</filename> or <filename>/etc/dracut.conf.d/myconf.conf</filename>. See the man page <xref linkend="dracutconf5"/>. You can also add dracut modules on the command line by using the <option>-a</option> or <option>--add</option> option:</para>
-        <screen># dracut --add bootchart initramfs-bootchart.img</screen>
-        <para>To see a list of available dracut modules, use the <option>--list-modules</option> option:</para>
-        <screen># dracut --list-modules</screen>
-        <para>or, if you have a dracut version earlier than <literal>008</literal>, issue the command:</para>
-        <screen># for mod in /usr/lib/dracut/modules.d/*; do echo ${mod##*/??}; done</screen>
-      </section>
-      <section>
-        <title>Omitting dracut Modules</title>
-        <para>Sometimes you don&apos;t want a dracut module to be included for reasons of speed, size or functionality. To do this, either specify the <envar>omit_dracutmodules</envar> variable in  the <filename>dracut.conf</filename> or <filename>/etc/dracut.conf.d/myconf.conf</filename> configuration file (see man page <xref linkend="dracutconf5"/>), or use the <option>-o</option> or <option>--omit</option> option on the command line:</para>
-        <screen># dracut -o &quot;multipath lvm&quot; no-multipath-lvm.img</screen>
-      </section>
-      <section>
-        <title>Adding Kernel Modules</title>
-        <para>If you need a special kernel module in the initramfs, which is not automatically picked up by dracut, you have the use the <option>--add-drivers</option> option on the command line or  the drivers vaiable in  the <filename>/etc/dracut.conf</filename> or <filename>/etc/dracut.conf.d/myconf.conf</filename> configuration file (see man page <xref linkend="dracutconf5"/>):</para>
-        <screen># dracut --add-drivers mymod initramfs-with-mymod.img</screen>
-      </section>
-    </section>
-    <section>
-      <title>Boot parameters</title>
-      <para>The generated initramfs.img file normally does not contain any system configuration files (except for some special exceptions), so the configuration has to be done on the kernel command line. With this flexibility, you can easily boot from a changed root partition, without the need to recompile the initramfs image. So, you could completly change your root partition (move it inside a md raid with encryption and LVM on top), as long as you specify the correct filesystem <varname>LABEL</varname> or <varname>UUID</varname> on the kernel command line for your root device, dracut will find it and boot from it.</para>
-      <para>The kernel command line usually can be configured in <filename>/boot/grub/grub.conf</filename>, if grub is your bootloader and it also can be edited in the real boot process in the grub menu.</para>
-      <para>The kernel command line can also be provided by the dhcp server with the root-path option. See <xref linkend="NetworkBoot"/>.</para>
-      <para>For a full reference of all kernel command line parameters, see the <xref linkend="dracutconf5"/> or <xref linkend="dracut8"/> man page.</para>
-      <section>
-        <title>Specifying the root Device</title>
-        <para>This is the only option dracut really needs to boot from your root partition. Because your root partition can live in various environments, there are a lot of formats for the <envar>root=</envar> option. The most basic one is <envar>root=<replaceable>&lt;path to device node&gt;</replaceable></envar>:</para>
-        <screen>root=/dev/sda2</screen>
-        <para>Because device node names can change, dependent on the drive ordering,  you are encouraged to use the filesystem identifier (UUID) or filesystem label (LABEL) to specify your root partition:</para>
-        <screen>root=UUID=19e9dda3-5a38-484d-a9b0-fa6b067d0331</screen>
-        <para>or</para>
-        <screen>root=LABEL=myrootpartitionlabel</screen>
-        <para>To see all <envar>UUID</envar>s or <envar>LABEL</envar>s on your system, do:</para>
-        <screen># ls -l /dev/disk/by-uuid</screen>
-        <para>or</para>
-        <screen># ls -l /dev/disk/by-label</screen>
-        <para>If your root partition is on the network see <xref linkend="NetworkBoot"/>.</para>
-      </section>
-      <section>
-        <title>Keyboard Settings</title>
-        <para>If you have to input passwords for encrypted disk volumes, you might want to set the keyboard layout and specify a display font.</para>
-        <para>A typical german kernel command would contain:</para>
-        <screen>vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys locale.LANG=de_DE.UTF-8</screen>
-        <para>Setting these options can override the setting stored on your system, if you use a modern init system, like systemd.</para>
-        <para>For dracut versions prior to version <literal>008</literal> the line would look like:</para>
-        <screen>LANG=de_DE.UTF-8 SYSFONT=latarcyrheb-sun16 KEYBOARDTYPE=pc KEYTABLE=de-latin1-nodeadkeys</screen>
-      </section>
-      <section>
-        <title>Blacklisting Kernel Modules</title>
-        <para>Sometimes it is required to prevent the automatic kernel module loading of a specific kernel module. To do this, just add <envar>rd.blacklist=<replaceable>&lt;kernel module name&gt;</replaceable></envar>, with <replaceable>&lt;kernel module name&gt;</replaceable> not containing the <filename>.ko</filename> suffix, to the kernel command line. For example:</para>
-        <screen>rd.blacklist=mptsas rd.blacklist=nouveau</screen>
-        <para>The option can be specified multiple times on the kernel command line.</para>
-      </section>
-      <section>
-        <title>Speeding up the Boot Process</title>
-        <para>If you want to speed up the boot process, you can specify as much information for dracut on the kernel command as possible. For example, you can tell dracut, that you root partition is not on a <acronym>LVM</acronym> volume or not on a raid partition, or that it lives inside a specific crypto <acronym>LUKS</acronym> encrypted volume. By default, dracut searches everywhere. A typical dracut kernel command line for a plain primary or logical partition would contain:</para>
-        <screen>rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0</screen>
-        <para>on systems with dracut version prior to <literal>008</literal> the line would look like:</para>
-        <screen>rd_NO_LUKS rd_NO_LVM rd_NO_MD rd_NO_DM</screen>
-        <para>This turns off every automatic assembly of <acronym>LVM</acronym>, <acronym>MD</acronym> raids, <acronym>DM</acronym> raids and crypto <acronym>LUKS</acronym>.</para>
-        <para>Of course, you could also omit the dracut modules in the initramfs creation process, but then you would lose the posibility to turn it on on demand.</para>
-      </section>
-      <section id="Injecting">
-        <title>Injecting custom Files</title>
-        <para>To add your own files to the initramfs image, you have several possibilities.</para>
-        <para>The <option>--include</option> option let you specify a source path and a target path. For example</para>
-        <screen># dracut --include cmdline-preset /etc/cmdline initramfs-cmdline-pre.img</screen>
-        <para>will create an initramfs image, where the file cmdline-preset will be copied inside the initramfs to  <filename>/etc/cmdline</filename>. <option>--include</option> can only be specified once.</para>
-        <screen># mkdir rd.live.overlay
-# mkdir rd.live.overlay/etc
-# mkdir rd.live.overlay/etc/conf.d
-# echo &quot;ip=auto&quot; &gt;&gt; rd.live.overlay/etc/cmdline
-# echo export TESTVAR=testtest &gt;&gt; rd.live.overlay/etc/conf.d/testvar.conf
-# echo export TESTVAR=testtest &gt;&gt; rd.live.overlay/etc/conf.d/testvar.conf
-# tree rd.live.overlay/
-rd.live.overlay/
-└── etc
-    ├── cmdline
-    └── conf.d
-        └── testvar.conf
-# dracut --include rd.live.overlay / initramfs-rd.live.overlay.img</screen>
-        <para>This will put the contents of the rd.live.overlay directory into the root of the initramfs image.</para>
-        <para>The <option>--install</option> option let you specify several files, which will get installed in the initramfs image at the same location, as they are present on initramfs creation time.</para>
-        <screen># dracut --install &apos;strace fsck.ext3 ssh&apos; initramfs-dbg.img</screen>
-        <para>This will create an initramfs with the <command>strace</command>, <command>fsck.ext3</command> and <command>ssh</command> executables, together with the libraries needed to start those. The <option>--install</option> option can be specified multiple times.</para>
-      </section>
-    </section>
-    <section id="NetworkBoot">
-      <title>Network Boot</title>
-      <para>If your root partition is on a network drive, you have to have the network dracut modules installed to create a network aware initramfs image.</para>
-      <para>On a Red Hat Enterprise Linux or Fedora system, this means, you have to install the <filename>dracut-network</filename> rpm package:</para>
-      <screen># yum install dracut-network</screen>
-      <para>The resulting initramfs image can be served by a boot manager residing on your local hard drive or it can be served by a <acronym>PXE</acronym>/<acronym>TFTP</acronym> server.</para>
-      <para>How to setup your <acronym>PXE</acronym>/<acronym>TFTP</acronym> server can be found in the <ulink url="http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/">Red Hat Enterprise Linux Storage Administration Guide</ulink>.</para>
-      <para>If you specify <envar>rd.ip=auto</envar> on the kernel command line,  then dracut asks a dhcp server about the ip adress for the machine. The dhcp server can also serve an additional root-path, which will set the root device for dracut.  With this mechanism, you have static configuration on your client machine and  a centralized boot configuration on your <acronym>TFTP</acronym>/<acronym>DHCP</acronym> server. If you can&apos;t pass a kernel command line, then you can inject <filename>/etc/cmdline</filename>, with a method described in <xref linkend="Injecting"/>.
-</para>
-      <section>
-        <title>Reducing the Image Size</title>
-        <para>To reduce the size of the initramfs, you should create it with by ommitting all dracut modules, which you know, you don&apos;t need to boot the machine.</para>
-        <para>You can also specify the exact dracut and kernel modules to produce a very tiny initramfs image.</para>
-        <para>For example for a <acronym>NFS</acronym> image, you would do:</para>
-        <screen># dracut -m &quot;nfs network  base&quot; initramfs-nfs-only.img</screen>
-        <para>Then you would boot from this image with your target machine and reduce the size once more by creating it  on the target machine with the <option>--host-only</option> option:</para>
-        <screen># dracut -m &quot;nfs network base&quot; --host-only initramfs-nfs-host-only.img</screen>
-        <para>This will reduce the size of the initramfs image significantly.</para>
-      </section>
-      <section>
-        <title>NFS Root Device</title>
-        <para/>
-      </section>
-      <section>
-        <title>iSCSI Root Device</title>
-        <para>
- </para>
-      </section>
-      <section>
-        <title>FCoE Root Device</title>
-        <para>
- </para>
-      </section>
-    </section>
-    <section>
-      <title>Troubleshooting</title>
-      <para>If the boot process does not succeed, you have several options to debug the situation. Some of the basic operations are covered here. For more information you should also visit:  <ulink url="http://fedoraproject.org/wiki/How_to_debug_Dracut_problems">http://fedoraproject.org/wiki/How_to_debug_Dracut_problems</ulink></para>
-      <section id="identifying-your-problem-area">
-        <title>Identifying your problem area</title>
-        <orderedlist>
-          <listitem>
-            <para>Remove &apos;&apos;rhgb&apos;&apos; and &apos;&apos;quiet&apos;&apos; from the kernel command line
-</para>
-          </listitem>
-          <listitem>
-            <para>Add &apos;&apos;rd.shell&apos;&apos; to the kernel command line.  This will present a shell should dracut be unable to locate your root device
-</para>
-          </listitem>
-          <listitem>
-            <para>Add &apos;&apos;rd.shell rd.debug log_buf_len=1M&apos;&apos; to the kernel command line so that dracut shell commands are printed as they are executed
-</para>
-          </listitem>
-          <listitem>
-            <para>With dracut &gt;= 002-11, you can inspect the rd.debug output with:
-</para>
-            <screen># less /run/initramfs/init.log
-# dmesg | less</screen>
-          </listitem>
-        </orderedlist>
-      </section>
-      <section id="information-to-include-in-your-report">
-        <title id="information-to-include-in-your-report-title">Information to include in your report</title>
-        <section id="all-bug-reports">
-          <title id="all-bug-reports-title">All bug reports</title>
-          <para>In all cases, the following should be mentioned and attached to your bug report:
-</para>
-          <itemizedlist>
-            <listitem>
-              <para>The exact kernel command-line used.  Typically from the bootloader configuration file (e.g. <filename>/etc/grub.conf</filename>) or from <filename>/proc/cmdline</filename>.</para>
-            </listitem>
-            <listitem>
-              <para>A copy of your disk partition information from <filename>/etc/fstab</filename>, which might be obtained booting an old working initramfs or a rescue medium.</para>
-            </listitem>
-            <listitem>
-              <para>A device listing from device-mapper.  This can be obtained by running the command <screen># dmsetup ls --tree</screen></para>
-            </listitem>
-            <listitem>
-              <para>A list of block device attributes including vol_id compatible mode.  This can be obtained by running the commands: <screen># blkid -p
-# blkid -p -o udev</screen></para>
-            </listitem>
-            <listitem>
-              <para>Turn on dracut debugging (see <filename>the &apos;debugging dracut&apos; section</filename>), and attach all relevant information from the boot log.  This can be obtained by running the command <screen># dmesg|grep dracut</screen></para>
-            </listitem>
-            <listitem>
-              <para>If you use a dracut configuration file, please include <filename>/etc/dracut.conf</filename>
- and all files in <filename>/etc/dracut.conf.d/*.conf</filename></para>
-            </listitem>
-          </itemizedlist>
-        </section>
-        <section id="logical-volume-management-related-problems">
-          <title id="logical-volume-management-related-problems-title">Logical Volume Management related problems</title>
-          <para>As well as the information from <xref linkend="all-bug-reports"/> include the following information:
-</para>
-          <itemizedlist>
-            <listitem>
-              <para>Include physical volume information by running the command: <screen># lvm pvdisplay</screen></para>
-            </listitem>
-            <listitem>
-              <para>Include volume group information by running the command: <screen># lvm vgdisplay</screen></para>
-            </listitem>
-            <listitem>
-              <para>Include logical volume information by running the command: <screen># lvm lvdisplay</screen></para>
-            </listitem>
-          </itemizedlist>
-        </section>
-        <section id="software-raid-related-problems">
-          <title id="software-raid-related-problems-title">Software RAID related problems</title>
-          <para>As well as the information from <xref linkend="all-bug-reports"/>, include the following information:
-</para>
-          <itemizedlist>
-            <listitem>
-              <para>If using software RAID disk partitions, please include the output of <screen># cat /proc/mdstat</screen></para>
-            </listitem>
-          </itemizedlist>
-        </section>
-        <section id="network-root-device-related-problems">
-          <title id="network-root-device-related-problems-title">Network root device related problems</title>
-          <para>This section details information to include when experiencing problems on a system whose root device is located on a network attached volume (e.g. iSCSI, NFS or NBD).  As well as the information from <xref linkend="all-bug-reports"/>, include the following information:
-</para>
-          <itemizedlist>
-            <listitem>
-              <para>Please include the output of  <screen># /sbin/ifup <replaceable>&lt;interfacename&gt;</replaceable>
-# ip addr show</screen></para>
-            </listitem>
-          </itemizedlist>
-        </section>
-      </section>
-      <section id="debugging-dracut">
-        <title id="debugging-dracut-title">Debugging dracut</title>
-        <section id="configure-a-serial-console">
-          <title id="configure-a-serial-console-title">Configure a serial console</title>
-          <para>Successfully debugging dracut will require some form of console logging during the system boot.  This section documents configuring a serial console connection to record boot messages.
-</para>
-          <orderedlist>
-            <listitem>
-              <para>First, enable serial console output for both the kernel and the bootloader.
-</para>
-            </listitem>
-            <listitem>
-              <para>Open the file <filename>/etc/grub.conf</filename> for editing.  Below the line &apos;&apos;timeout=5&apos;&apos;, add the following:
-<screen>serial --unit=0 --speed=9600
-terminal --timeout=5 serial console</screen></para>
-            </listitem>
-            <listitem>
-              <para>Also in <filename>/etc/grub.conf</filename>, add the following boot arguemnts to the &apos;&apos;kernel&apos;&apos; line:
-<screen>console=tty0 console=ttyS0,9600</screen></para>
-            </listitem>
-            <listitem>
-              <para>When finished, the <filename>/etc/grub.conf</filename> file should look similar to the example below.
-<screen>default=0
-timeout=5
-serial --unit=0 --speed=9600
-terminal --timeout=5 serial console
-title Fedora (2.6.29.5-191.fc11.x86_64)
-  root (hd0,0)
-  kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 console=ttyS0,9600
-  initrd /dracut-2.6.29.5-191.fc11.x86_64.img</screen></para>
-            </listitem>
-            <listitem>
-              <para>More detailed information on how to configure the kernel for console output can be found at <ulink url="http://www.faqs.org/docs/Linux-HOWTO/Remote-Serial-Console-HOWTO.html#CONFIGURE-KERNEL">http://www.faqs.org/docs/Linux-HOWTO/Remote-Serial-Console-HOWTO.html#CONFIGURE-KERNEL</ulink>.
-</para>
-            </listitem>
-          </orderedlist>
-          <note>
-            <title>Redirecting non-interactive output</title>
-            <para>You can redirect all non-interactive output to <filename>/dev/kmsg</filename> and the kernel will put it out on the console when it reaches the kernel buffer by doing<screen># exec &gt;/dev/kmsg 2&gt;&amp;1 &lt;/dev/console</screen></para>
-          </note>
-        </section>
-        <section id="using-the-dracut-shell">
-          <title id="using-the-dracut-shell-title">Using the dracut shell</title>
-          <para>Dracut offers a shell for interactive debugging in the event dracut fails to locate your root filesystem.  To enable the shell:
-<orderedlist>
-              <listitem>
-                <para>Add the boot parameter &apos;&apos;rd.shell&apos;&apos; to your bootloader configuration file (e.g. <filename>/etc/grub.conf</filename>)</para>
-              </listitem>
-              <listitem>
-                <para>Remove the boot arguments &apos;&apos;rhgb&apos;&apos; and &apos;&apos;quiet&apos;&apos;
-</para>
-                <para>
-A sample <filename>/etc/grub.conf</filename> bootloader configuration file is listed below.
-</para>
-                <para><screen>default=0
-timeout=5
-serial --unit=0 --speed=9600
-terminal --timeout=5 serial console
-title Fedora (2.6.29.5-191.fc11.x86_64)
-  root (hd0,0)
-  kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 rd.shell
-  initrd /dracut-2.6.29.5-191.fc11.x86_64.img</screen></para>
-              </listitem>
-              <listitem>
-                <para>If system boot fails, you will be dropped into a shell as seen in the example below.
-<screen>No root device found
-Dropping to debug shell.
-
-sh: can&apos;t access tty; job control turned off
-
-# </screen></para>
-              </listitem>
-              <listitem>
-                <para>Use this shell prompt to gather the information requested above (see <xref linkend="all-bug-reports"/>).
-</para>
-              </listitem>
-            </orderedlist></para>
-        </section>
-        <section id="accessing-the-root-volume-from-the-dracut-shell">
-          <title id="accessing-the-root-volume-from-the-dracut-shell-title">Accessing the root volume from the dracut shell</title>
-          <para>From the dracut debug shell, you can manually perform the task of locating and preparing your root volume for boot.  The required steps will depend on how your root volume is configured.  Common scenarios include:
-</para>
-          <itemizedlist>
-            <listitem>
-              <para>A block device (e.g. <filename>/dev/sda7</filename>)
-</para>
-            </listitem>
-            <listitem>
-              <para>A LVM logical volume (e.g. <filename>/dev/VolGroup00/LogVol00</filename>)
-</para>
-            </listitem>
-            <listitem>
-              <para>An encrypted device (e.g. <filename>/dev/mapper/luks-4d5972ea-901c-4584-bd75-1da802417d83</filename>)
-</para>
-            </listitem>
-            <listitem>
-              <para>A network attached device (e.g. netroot=iscsi:@192.168.0.4::3260::iqn.2009-02.org.fedoraproject:for.all)
-</para>
-            </listitem>
-          </itemizedlist>
-          <para>The exact method for locating and preparing will vary. However, to continue with a successful boot, the objective is to locate your root volume and create a symlink <filename>/dev/root</filename> which points to the file system. For example, the following example demonstrates accessing and booting a root volume that is an encrypted LVM Logical volume. </para>
-          <orderedlist>
-            <listitem>
-              <para>Inspect your partitions using <command>parted</command><screen># parted /dev/sda -s p
-Model: ATA HTS541060G9AT00 (scsi)
-Disk /dev/sda: 60.0GB
-Sector size (logical/physical): 512B/512B
-Partition Table: msdos
-Number  Start   End     Size    Type      File system  Flags
-1      32.3kB  10.8GB  107MB   primary   ext4         boot
-2      10.8GB  55.6GB  44.7GB  logical                lvm</screen></para>
-            </listitem>
-            <listitem>
-              <para>You recall that your root volume was a LVM logical volume.  Scan and activate any logical volumes.
-                  <screen># lvm vgscan
-# lvm vgchange -ay</screen></para>
-            </listitem>
-            <listitem>
-              <para>You should see any logical volumes now using the command <command>blkid</command>:
-<screen># blkid
-/dev/sda1: UUID=&quot;3de247f3-5de4-4a44-afc5-1fe179750cf7&quot; TYPE=&quot;ext4&quot;
-/dev/sda2: UUID=&quot;Ek4dQw-cOtq-5MJu-OGRF-xz5k-O2l8-wdDj0I&quot; TYPE=&quot;LVM2_member&quot;
-/dev/mapper/linux-root: UUID=&quot;def0269e-424b-4752-acf3-1077bf96ad2c&quot; TYPE=&quot;crypto_LUKS&quot;
-/dev/mapper/linux-home: UUID=&quot;c69127c1-f153-4ea2-b58e-4cbfa9257c5e&quot; TYPE=&quot;ext3&quot;
-/dev/mapper/linux-swap: UUID=&quot;47b4d329-975c-4c08-b218-f9c9bf3635f1&quot; TYPE=&quot;swap&quot;
-</screen></para>
-            </listitem>
-            <listitem>
-              <para>From the output above, you recall that your root volume exists on an encrypted block device.  Following the guidance disk encryption guidance from the Installation Guide, you unlock your encrypted root volume.
-<screen># UUID=$(cryptsetup luksUUID /dev/mapper/linux-root)
-# cryptsetup luksOpen /dev/mapper/linux-root luks-$UUID
-Enter passphrase for /dev/mapper/linux-root:
-Key slot 0 unlocked. </screen></para>
-            </listitem>
-            <listitem>
-              <para>Next, make a symbolic link to the unlocked root volume
-<screen># ln -s /dev/mapper/luks-$UUID /dev/root</screen></para>
-            </listitem>
-            <listitem>
-              <para>With the root volume available, you may continue booting the system by exiting the dracut shell
-<screen># exit</screen></para>
-            </listitem>
-          </orderedlist>
-        </section>
-        <section id="additional-dracut-boot-parameters">
-          <title id="additional-dracut-boot-parameters-title">Additional dracut boot parameters</title>
-          <para>For more debugging options, see <xref linkend="dracut-kernel-debug"/> in the man page <xref linkend="dracutkernel7"/>.</para>
-        </section>
-      </section>
-    </section>
-  </chapter>
-  <chapter>
-    <title>Developer Manual</title>
-    <section>
-      <title>dracut Components</title>
-      <para>dracut uses a modular system to build and extend the initramfs image. All modules are located in <filename>/usr/lib/dracut/modules.d</filename> or in <filename><replaceable>&lt;git-src&gt;</replaceable>/modules.d</filename>. The most basic dracut module is <filename>99base</filename>. In <filename>99base</filename> the initial shell script <command>init</command> is defined, which gets run by the kernel after initramfs loading. Although you can replace <command>init</command> with your own version of <filename>99base</filename>, this is not encouraged. Instead you should use, if possible, the hooks of dracut. All hooks, and the point of time in which they are executed, are described in <xref linkend="stages"/>.</para>
-      <para>The main script, which creates the initramfs is <command>dracut</command> itsself. It parses all arguments and sets up the directory, in which everything is installed. It then executes all <command>check</command>, <command>install</command>, <command>installkernel</command> scripts found in the modules, which are to be processed. After everything is installed, the install directory is archived and compressed to the final initramfs image. All helper functions used by <command>check</command>, <command>install</command> and <command>installkernel</command> are found in in the file <filename>dracut-functions</filename>. These shell functions are available to all module installer (<command>install</command>, <command>installkernel</command>) scripts, without the need to source <filename>dracut-functions</filename>.</para>
-      <para>A module can check the preconditions for <command>install</command> and <command>installkernel</command> with the <command>check</command> script. Also dependencies can be expressed with <command>check</command>. If a module passed <command>check</command>, <command>install</command> and <command>installkernel</command> will be called to install all of the necessary files for the module. To split between kernel and non-kernel parts of the installation, all kernel module related parts have to be in <command>installkernel</command>. All other files found in a module directory are module specific and mostly are hook scripts and udev rules.</para>
-    </section>
-    <section id="stages">
-      <title>Boot Process Stages</title>
-      <para>The <command>init</command> script in <filename>99base</filename> is the main script, which prepares the root file system for usage, runs udev, mounts the real root device, kills the remaining processes, and switches to the real root device for further booting. dracut modules can insert custom script at various points, to control the boot process. These hooks are plain directories containing shell scripts ending with &quot;.sh&quot;, which are sourced by <command>init</command>.
-Common used functions are in <filename>dracut-lib.sh</filename>, which can be sourced by any script.      </para>
-      <section>
-        <title>Basic Setup</title>
-        <para>The first thing <command>init</command> does, is to mount <filename>/proc</filename> and <filename>/sys</filename> and manually create the basic device nodes and symbolic links in <filename>/dev</filename> needed to execute basic commands. Then logging is setup according to kernel command line arguments. <filename>/dev/pts</filename> and <filename>/dev/shm</filename> are mounted and the first hook is sourced.</para>
-      </section>
-      <section>
-        <title>Hook: cmdline</title>
-        <para>The <literal>
-            <function>cmdline</function>
-          </literal> hook is a place to insert scripts to parse the kernel command line and prepare the later actions, like setting up udev rules and configuration files.</para>
-        <para>In this hook the most important environment variable is defined: <envar>root</envar>. The second one is <envar>rootok</envar>, which indicates, that a module claimed to be able to parse the <envar>root</envar> defined. So for example, <envar>root=</envar><replaceable>iscsi:....</replaceable> will be claimed by the <function>iscsi</function> dracut module, which then sets <envar>rootok</envar>.</para>
-      </section>
-      <section>
-        <title>Hook: pre-udev</title>
-        <para>This hook is executed right after the <function>cmdline</function> hook and a check if <envar>root</envar> and <envar>rootok</envar> were set. Here modules can take action with the final <envar>root</envar>, and before <command>udev</command> has been run.</para>
-      </section>
-      <section>
-        <title>Start Udev</title>
-        <para>Now <command>udev</command> is started and the logging for <command>udev</command> is setup.</para>
-      </section>
-      <section>
-        <title>Hook: pre-trigger</title>
-        <para>In this hook, you can set udev environment variables with <code>udevadm control --property=<envar>KEY</envar>=<replaceable>value</replaceable></code> or control the further execution of <command>udev</command> with <command>udevadm</command>.</para>
-      </section>
-      <section>
-        <title>Trigger Udev</title>
-        <para><command>udev</command> is triggered by calling <command>udevadm trigger</command>, which sends <constant>add</constant> events for all devices and subsystems.
- </para>
-      </section>
-      <section>
-        <title>Main Loop</title>
-        <para>Now the main loop of <command>99base/init</command> begins. Here we loop until <command>udev</command> has settled and all scripts in <filename>initqueue/finished</filename> returned true. In this loop there are three hooks, where scripts can be inserted by calling <command>/sbin/initqueue</command>.
- </para>
-        <section>
-          <title>Initqueue</title>
-          <para>This hook gets executed every time a script is inserted here, regardless of the <command>udev</command> state.</para>
-        </section>
-        <section>
-          <title>Initqueue settled</title>
-          <para>This hooks gets executed every time <command>udev</command> has settled.</para>
-        </section>
-        <section>
-          <title>Initqueue timeout</title>
-          <para>This hooks gets executed, when the main loop counter becomes half of the rd.retry counter.</para>
-        </section>
-        <section>
-          <title>Initqueue finished</title>
-          <para>This hook is called after <command>udev</command> has settled and if all scripts herein return <errorcode>0</errorcode> the main loop will be ended.</para>
-        </section>
-      </section>
-      <section>
-        <title>Hook: pre-mount</title>
-        <para>Before the root device is mounted all scripts in the hook pre-mount are executed. In some cases (e.g. <acronym>NFS</acronym>) the real root device is already mounted, though.</para>
-      </section>
-      <section>
-        <title>Hook: mount</title>
-        <para>This hook is mainly to mount the real root device.</para>
-      </section>
-      <section>
-        <title>Hook: pre-pivot</title>
-        <para>This hook is the last hook and is called before init finally switches root to the real root device. This is a good place to clean up and kill processes not needed anymore.</para>
-      </section>
-      <section>
-        <title>Cleanup and switch_root</title>
-        <para>Init kills all <command>udev</command> processes, cleans up the environment, sets up the arguments for the real <command>init</command> process and finally calls <command>switch_root</command>. <command>switch_root</command> removes the whole filesystem hierarchy of the initramfs, chroot()s to the real root device and calls <command>/sbin/init</command> with the specified arguments.</para>
-        <para>To ensure all files in the initramfs hierarchy can be removed, all processes still running from the initramfs should not  have any open file descriptors left.</para>
-      </section>
-    </section>
-    <section>
-      <title>Network Infrastructure</title>
-      <para>
-      </para>
-    </section>
-    <section>
-      <title>Writing a Module</title>
-      <para>A simple example module is <filename>96insmodpost</filename>, which modprobes a kernel module after udev has settled and the basic device drivers have been loaded.</para>
-      <para>All module installation information is in the file module-setup.sh.</para>
-      <para>First we create a <function>check()</function> function, which just exits with <errorcode>0</errorcode> indicating that this module should be included by default.</para>
-      <para><function>check()</function>:</para>
-      <programlisting>return 0</programlisting>
-      <para>The we create the <function>install()</function> function, which installs a cmdline hook with priority number 20 called <filename>parse-insmodpost.sh</filename>. It also installs the <filename>insmodpost.sh</filename> script in <filename>/sbin</filename>.</para>
-      <para><function>install()</function>:</para>
-      <programlisting>inst_hook cmdline 20 &quot;$moddir/parse-insmodpost.sh&quot;
-inst_simple &quot;$moddir/insmodpost.sh&quot; /sbin/insmodpost.sh</programlisting>
-      <para>The <filename>pase-instmodpost.sh</filename> parses the kernel command line for a argument <envar>rd.driver.post</envar>, blacklists the module from being autoloaded and installs the hook <filename>insmodpost.sh</filename> in the <filename>initqueue/settled</filename>.</para>
-      <para><filename>parse-insmodpost.sh</filename>:</para>
-      <programlisting>for p in $(getargs rd.driver.post=); do
-    echo &quot;blacklist $p&quot; &gt;&gt; /etc/modprobe.d/initramfsblacklist.conf
-    _do_insmodpost=1
-done
-
-[ -n &quot;$_do_insmodpost&quot; ] &amp;&amp; /sbin/initqueue --settled --unique --onetime /sbin/insmodpost.sh
-unset _do_insmodpost
-</programlisting>
-      <para><filename>insmodpost.sh</filename>, which is called in the <filename>initqueue/settled</filename> hook will just modprobe the kernel modules specified in all <envar>rd.driver.post</envar> kernel command line parameters. It runs after <command>udev</command> has settled and is only called once (<parameter>--onetime</parameter>).</para>
-      <para><filename>insmodpost.sh</filename>:</para>
-      <programlisting>. /lib/dracut-lib.sh
-
-for p in $(getargs rd.driver.post=); do
-    modprobe $p
-done
-</programlisting>
-      <section>
-        <title>check()</title>
-        <para><filename>
-            <function>check()</function>
-          </filename> is called by dracut to evaluate the inclusion of a dracut module in the initramfs.</para>
-        <variablelist>
-          <varlistentry>
-            <term> $hostonly</term>
-            <listitem>
-              <para>If  the $hostonly variable is set, then the module check() function  should be in &quot;hostonly&quot; mode, which means, that the check() should only return 0, if the module is really needed to boot this specific host.</para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-        <para><function>check()</function> should return with:</para>
-        <variablelist>
-          <varlistentry>
-            <term>0</term>
-            <listitem>
-              <para>Include the dracut module in the initramfs.</para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>1</term>
-            <listitem>
-              <para>Do not include the dracut module. The requirements are not fullfilled (missing tools, etc.)</para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>255</term>
-            <listitem>
-              <para>Only include the dracut module, if another module requires it or  if explicitly specified in the config file or on the argument list.</para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </section>
-      <section>
-        <title>depends()</title>
-        <para>The function <function>depends()</function> should <function>echo</function> all other dracut module names the module depends on.</para>
-      </section>
-      <section>
-        <title>install()</title>
-        <para>dracut_install</para>
-        <para>inst</para>
-        <para>inst_hook</para>
-        <para>inst_rules</para>
-        <para/>
-      </section>
-      <section>
-        <title>installkernel()</title>
-        <para>instmods</para>
-      </section>
-      <section>
-        <title>Creation Functions</title>
-        <para>
- </para>
-      </section>
-      <section>
-        <title>Initramfs Functions</title>
-        <para>
- </para>
-      </section>
-      <section>
-        <title>Network Modules</title>
-        <para>
- </para>
-      </section>
-    </section>
-  </chapter>
-  <appendix>
-    <title>Man Pages</title>
-    <section id="dracut.man">
-      <title>dracut</title>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dracut.8.xml" encoding="UTF-8" parse="xml"/>
-    </section>
-    <section id="dracut.conf">
-      <title>dracut.conf</title>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dracut.conf.5.xml" encoding="UTF-8" parse="xml"/>
-    </section>
-    <section id="dracut.cmdline">
-      <title>dracut.cmdline</title>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dracut.cmdline.7.xml" encoding="UTF-8" parse="xml"/>
-    </section>
-  </appendix>
-</book>
--- a/git2spec.pl
+++ b/git2spec.pl
@@ -20,7 +20,7 @@ sub create_patches {
    my $tag=shift;
    my $pdir=shift;
    my $num=0;
-    open( GIT, 'git format-patch -N --no-signature -o "'.$pdir.'" '.$tag.' |');
+    open( GIT, 'git format-patch -M -N --no-signature -o "'.$pdir.'" '.$tag.' |');
    @lines=<GIT>;
    close GIT;         # be done
    return @lines;
--- a/lsinitrd.sh
+++ b/lsinitrd.sh
@@ -34,20 +34,22 @@ image="${1:-/boot/initramfs-$(uname -r).img}"
 [[ -f "$image" ]]    || { echo "$image does not exist" ; exit 1 ; }

 CAT=zcat
-FILE_T=$(file "$image")
+FILE_T=$(file --dereference "$image")

 if echo "test"|xz|xz -dc --single-stream >/dev/null 2>&1; then
    XZ_SINGLE_STREAM="--single-stream"
 fi

-if [[ "$FILE_T" =~ ": gzip compressed data" ]]; then
+if [[ "$FILE_T" =~ :\ gzip\ compressed\ data ]]; then
    CAT=zcat
-elif [[ "$FILE_T" =~ ": xz compressed data" ]]; then
+elif [[ "$FILE_T" =~ :\ xz\ compressed\ data ]]; then
    CAT="xzcat $XZ_SINGLE_STREAM"
-elif [[ "$FILE_T" =~ ": XZ compressed data" ]]; then
+elif [[ "$FILE_T" =~ :\ XZ\ compressed\ data ]]; then
+    CAT="xzcat $XZ_SINGLE_STREAM"
+elif [[ "$FILE_T" =~ :\ LZMA ]]; then
+    CAT="xzcat $XZ_SINGLE_STREAM"
+elif [[ "$FILE_T" =~ :\ data ]]; then
    CAT="xzcat $XZ_SINGLE_STREAM"
-elif [[ "$FILE_T" =~ ": data" ]]; then
-    CAT=lzcat
 fi

 if [[ $# -eq 2 ]]; then
--- a/modules.d/01fips/module-setup.sh
+++ b/modules.d/01fips/module-setup.sh
@@ -12,18 +12,19 @@ depends() {

 installkernel() {
    local _fipsmodules _mod
-    _fipsmodules="aead aes_generici aes-xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr"
+    _fipsmodules="aead aes_generic aes-xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr"
    _fipsmodules+=" des deflate ecb eseqiv hmac seqiv sha256 sha512"
    _fipsmodules+=" cryptomgr crypto_null tcrypt dm-mod dm-crypt"

    mkdir -m 0755 -p "${initdir}/etc/modprobe.d"

    for _mod in $_fipsmodules; do
-        if instmods $_mod; then
+        if hostonly='' instmods $_mod; then
            echo $_mod >> "${initdir}/etc/fipsmodules"
            echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
        fi
    done
+    hostonly='' instmods scsi_wait_scan
 }

 install() {
@@ -34,12 +35,11 @@ install() {

    dracut_install sha512hmac rmmod insmod mount uname umount

-    for _dir in "$usrlibdir" "$libdir"; do
-        [[ -e $_dir/libsoftokn3.so ]] && \
-            dracut_install $_dir/libsoftokn3.so $_dir/libsoftokn3.chk \
-            $_dir/libfreebl3.so $_dir/libfreebl3.chk && \
-            break
-    done
+    inst_libdir_file libsoftokn3.so
+    inst_libdir_file libsoftokn3.so
+    inst_libdir_file libsoftokn3.chk
+    inst_libdir_file libfreebl3.so
+    inst_libdir_file libfreebl3.chk

    dracut_install $usrlibdir/hmaccalc/sha512hmac.hmac
    if command -v prelink >/dev/null; then
--- a/modules.d/10i18n/console_init.sh
+++ b/modules.d/10i18n/console_init.sh
--- a/modules.d/10i18n/module-setup.sh
+++ b/modules.d/10i18n/module-setup.sh
@@ -84,7 +84,7 @@ install() {
    install_base() {
        dracut_install setfont loadkeys kbd_mode stty

-        inst ${moddir}/console_init /lib/udev/console_init
+        inst ${moddir}/console_init.sh /lib/udev/console_init
        inst_rules ${moddir}/10-console.rules
        inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
    }
@@ -92,16 +92,23 @@ install() {
    install_all_kbd() {
        local rel f

-        for f in $(eval find ${kbddir}/{${KBDSUBDIRS}} -type f -print)
-        do
+        find $(eval echo ${kbddir}/{${KBDSUBDIRS}}) -type f -print | \
+            while read f; do
            inst_simple $f
        done

        # remove unnecessary files
        rm -f "${initdir}${kbddir}/consoletrans/utflist"
        find "${initdir}${kbddir}/" -name README\* -delete
+        find "${initdir}${kbddir}/" -name '*.gz' -print -quit \
+            | while read line; do
+            dracut_install gzip
+            done

-        dracut_install gzip bzip2
+        find "${initdir}${kbddir}/" -name '*.bz2' -print -quit \
+            | while read line; do
+            dracut_install bzip2
+            done
    }

    install_local_i18n() {
--- a/modules.d/10rpmversion/module-setup.sh
+++ b/modules.d/10rpmversion/module-setup.sh
@@ -1,30 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-check() {
-    [[ "$mount_needs" ]] && return 1
-    [ -f /etc/redhat-release ]
-}
-
-depends() {
-    return 0
-}
-
-install() {
-    local _line
-    local _dracut_rpm_version
-    if [ -e "$moddir/dracut-version" ]; then
-        _dracut_rpm_version=$(cat "$moddir/dracut-version")
-        inst "$moddir/dracut-version" /lib/dracut/$_dracut_rpm_version
-    else
-        if rpm -qf $(type -P $0) &>/dev/null; then
-            _dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(type -P $0) | { ver="";while read _line;do ver=$_line;done;echo $ver;} )
-            mkdir -m 0755 -p $initdir/lib/dracut
-            echo $_dracut_rpm_version > $initdir/lib/dracut/$_dracut_rpm_version
-        fi
-    fi
-    inst_hook cmdline 01 "$moddir/version.sh"
-
-}
-
--- a/modules.d/30convertfs/convertfs.sh
+++ b/modules.d/30convertfs/convertfs.sh
@@ -21,13 +21,13 @@ while [[ "$ROOT" != "${ROOT%/}" ]]; do
    ROOT=${ROOT%/}
 done

-if [ ! -L $ROOT/var/run ]; then
+if [ ! -L $ROOT/var/run -a -e $ROOT/var/run ]; then
    echo "Converting /var/run to symlink"
    mv -f $ROOT/var/run $ROOT/var/run.runmove~
    ln -sfn ../run $ROOT/var/run
 fi

-if [ ! -L $ROOT/var/lock ]; then
+if [ ! -L $ROOT/var/lock -a -e $ROOT/var/lock ]; then
    echo "Converting /var/lock to symlink"
    mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~
    ln -sfn ../run/lock $ROOT/var/lock
@@ -42,6 +42,14 @@ needconvert() {
    return 1
 }

+if ! [ -e "$ROOT/usr/bin" ]; then
+    echo "$ROOT/usr/bin does not exist!"
+    echo "Make sure, the kernel command line has enough information"
+    echo "to mount /usr (man dracut.cmdline)"
+    exit 1
+fi
+
+
 if ! needconvert; then
    echo "Your system is already converted."
    exit 0
@@ -101,7 +109,7 @@ for dir in bin sbin lib lib64; do
    [[ -d "$ROOT/$dir" ]] || continue
    echo "Make a copy of \`$ROOT/usr/$dir'."
    [[ -d "$ROOT/usr/$dir" ]] \
-        && cp -ax $CP_HARDLINK "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
+        && cp -ax -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
    echo "Merge the copy with \`$ROOT/$dir'."
    [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \
        || mkdir -p "$ROOT/usr/${dir}.usrmove-new"
--- a/modules.d/40network/dhclient-script.sh
+++ b/modules.d/40network/dhclient-script.sh
@@ -22,15 +22,15 @@ setup_interface() {
    # disallow MTUs from 576 and below by default, so that broken
    # MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
    if [ -n "$mtu" ] && [ $mtu -gt 576 ] ; then
-        echo "if ! ip link set $netif mtu $mtu ; then"
-        echo "ip link set $netif down"
-        echo "ip link set $netif mtu $mtu"
-        echo "ip link set $netif up"
-        echo wait_for_if_up $netif
-        echo "fi"
-    fi > /tmp/net.$netif.up
+        if ! ip link set $netif mtu $mtu ; then
+            ip link set $netif down
+            ip link set $netif mtu $mtu
+            ip link set $netif up
+            wait_for_if_up $netif
+        fi
+    fi

-    echo ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} dev $netif >> /tmp/net.$netif.up
+    ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} dev $netif

    [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw

@@ -66,23 +66,32 @@ case $reason in
        ;;
    BOUND)
        echo "dhcp: BOND setting $netif"
-        if ! arping -q -D -c 2 -I $netif $new_ip_address ; then
-            warn "Duplicate address detected for $new_ip_address while doing dhcp. retrying"
-            exit 1
+        unset layer2
+        if [ -f /sys/class/net/$netif/device/layer2 ]; then
+            read layer2 < /sys/class/net/$netif/device/layer2
        fi
+        if [ "$layer2" != "0" ]; then
+            if ! arping -q -D -c 2 -I $netif $new_ip_address ; then
+                warn "Duplicate address detected for $new_ip_address while doing dhcp. retrying"
+                exit 1
+            fi
+        fi
+        unset layer2
        setup_interface
        set | while read line; do
            [ "${line#new_}" = "$line" ] && continue
            echo "$line"
        done >/tmp/dhclient.$netif.dhcpopts
-        echo online > /sys/class/net/$netif/uevent

-        if [ -e /tmp/net.$netif.manualup ]; then
-            /sbin/netroot $netif -m
-            rm -f /tmp/net.$netif.manualup
-        else
-            initqueue --onetime --name netroot-$netif netroot $netif
-        fi
+        {
+            echo '. /lib/net-lib.sh'
+            echo "setup_net $netif"
+            echo "source_hook initqueue/online $netif"
+            [ -e /tmp/net.$netif.manualup ] || echo "/sbin/netroot $netif"
+            echo "rm -f $hookdir/initqueue/setup_net_$netif.sh"
+        } > $hookdir/initqueue/setup_net_$netif.sh
+
+        >/tmp/net.$netif.up
        ;;
    *) echo "dhcp: $reason";;
 esac
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -10,9 +10,7 @@
 PATH=/usr/sbin:/usr/bin:/sbin:/bin

 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-export PS4="ifup.$1.$$ + "
-exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh

 # Huh? No $1?
 [ -z "$1" ] && exit 1
@@ -33,24 +31,31 @@ fi
 # bridge this interface?
 if [ -e /tmp/bridge.info ]; then
    . /tmp/bridge.info
-    if [ "$netif" = "$ethname" ]; then
+    for ethname in $ethnames ; do
+        if [ "$netif" = "$ethname" ]; then
+            if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
+                : # We need to really setup bond (recursive call)
+            else
+                netif="$bridgename"
+            fi
+        fi
+    done
+fi
+
+if [ -e /tmp/vlan.info ]; then
+    . /tmp/vlan.info
+    if [ "$netif" = "$phydevice" ]; then
        if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
            : # We need to really setup bond (recursive call)
        else
-            netif="$bridgename"
+            netif="$vlanname"
        fi
    fi
 fi

-# bail immediately if the interface is already up
-# or we don't need the network
-[ -f "/tmp/net.$netif.up" ] && exit 0
-[ -f "/tmp/root.info" ] || exit 0
-. /tmp/root.info
-
 # disable manual ifup while netroot is set for simplifying our logic
 # in netroot case we prefer netroot to bringup $netif automaticlly
-[ -n "$2" ] && [ -z "$netroot" ] && manualup="$2"
+[ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
 [ -z "$netroot" ] && [ -z "$manualup" ] && exit 0
 [ -n "$manualup" ] && >/tmp/net.$netif.manualup

@@ -76,13 +81,11 @@ load_ipv6() {

 do_ipv6auto() {
    load_ipv6
-    {
-        echo 0 > /proc/sys/net/ipv6/conf/$netif/forwarding
-        echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra
-        echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects
-        echo ip link set $netif up
-        echo wait_for_if_up $netif
-    } > /tmp/net.$netif.up
+    echo 0 > /proc/sys/net/ipv6/conf/$netif/forwarding
+    echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra
+    echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects
+    ip link set $netif up
+    wait_for_if_up $netif

    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname

@@ -92,28 +95,20 @@ do_ipv6auto() {
            echo nameserver $s
        done
    fi >> /tmp/net.$netif.resolv.conf
-
-
-    echo online > /sys/class/net/$netif/uevent
-    if [ -n "$manualup" ]; then
-        /sbin/netroot $netif -m
-    else
-        initqueue --onetime --name netroot-$netif netroot $netif
-    fi
 }

 # Handle static ip configuration
 do_static() {
    strstr $ip '*:*:*' && load_ipv6

-    {
-        echo ip link set $netif up
-        echo wait_for_if_up $netif
-        # do not flush addr for ipv6
-        strstr $ip '*:*:*' || \
-            echo ip addr flush dev $netif
-        echo ip addr add $ip/$mask brd + dev $netif
-    } > /tmp/net.$netif.up
+    ip link set $netif up
+    wait_for_if_up $netif
+    [ -n "$macaddr" ] && ip link set address $macaddr
+    [ -n "$mtu" ] && ip link set mtu $mtu
+    # do not flush addr for ipv6
+    strstr $ip '*:*:*' || \
+        ip addr flush dev $netif
+    ip addr add $ip/$mask brd + dev $netif

    [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
@@ -124,20 +119,12 @@ do_static() {
            echo nameserver $s
        done
    fi >> /tmp/net.$netif.resolv.conf
-
-    echo online > /sys/class/net/$netif/uevent
-    if [ -n "$manualup" ]; then
-        /sbin/netroot $netif -m
-    else
-        initqueue --onetime --name netroot-$netif netroot $netif
-    fi
 }

 # loopback is always handled the same way
 if [ "$netif" = "lo" ] ; then
    ip link set lo up
    ip addr add 127.0.0.1/8 dev lo
-    >/tmp/net.$netif.up
    exit 0
 fi

@@ -171,7 +158,7 @@ if [ -e /tmp/bond.info ]; then

        for slave in $bondslaves ; do
            ip link set $slave down
-            ifenslave $bondname $slave
+            echo "+$slave" > /sys/class/net/$bondname/bonding/slaves
            ip link set $slave up
            wait_for_if_up $slave
        done
@@ -190,18 +177,40 @@ fi

 # XXX need error handling like dhclient-script

+if [ -e /tmp/bridge.info ]; then
+    . /tmp/bridge.info
 # start bridge if necessary
-if [ "$netif" = "$bridgename" ] && [ ! -e /tmp/net.$bridgename.up ]; then
-    if [ "$ethname" = "$bondname" ] ; then
-        DO_BOND_SETUP=yes ifup $bondname
-    else
-        ip link set $ethname up
+    if [ "$netif" = "$bridgename" ] && [ ! -e /tmp/net.$bridgename.up ]; then
+        brctl addbr $bridgename
+        brctl setfd $bridgename 0
+        for ethname in $ethnames ; do
+            if [ "$ethname" = "$bondname" ] ; then
+                DO_BOND_SETUP=yes ifup $bondname
+            else
+                ip link set $ethname up
+            fi
+            wait_for_if_up $ethname
+            brctl addif $bridgename $ethname
+        done
    fi
-    wait_for_if_up $ethname
-    # Create bridge and add eth to bridge
-    brctl addbr $bridgename
-    brctl setfd $bridgename 0
-    brctl addif $bridgename $ethname
+fi
+
+get_vid() {
+    case "$1" in
+    vlan*)
+        return ${1#vlan}
+        ;;
+    *.*)
+        return ${1##*.}
+        ;;
+    esac
+}
+
+if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
+    modprobe 8021q
+    ip link set "$phydevice" up
+    wait_for_if_up "$phydevice"
+    ip link add dev "$vlanname" link "$phydevice" type vlan id "$(get_vid $vlanname; echo $?)"
 fi

 # No ip lines default to dhcp
@@ -221,12 +230,12 @@ for p in $(getargs ip=); do
    ip_to_var $p
    # skip ibft
    [ "$autoconf" = "ibft" ] && continue
-	
+
    # If this option isn't directed at our interface, skip it
    [ -n "$dev" ] && [ "$dev" != "$netif" ] && continue

    # Store config for later use
-    for i in ip srv gw mask hostname; do
+    for i in ip srv gw mask hostname macaddr; do
        eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
    done > /tmp/net.$netif.override

@@ -240,6 +249,21 @@ for p in $(getargs ip=); do
        *)
            do_static ;;
    esac
+
+    case $autoconf in
+        dhcp|on|any|dhcp6)
+            ;;
+        *)
+            if [ $? -eq 0 ]; then
+                setup_net $netif
+                source_hook initqueue/online $netif
+                if [ -z "$manualup" ]; then
+                    /sbin/netroot $netif
+                fi
+            fi
+            ;;
+    esac
+
    break
 done
 exit 0
--- a/modules.d/40network/kill-dhclient.sh
+++ b/modules.d/40network/kill-dhclient.sh
@@ -5,7 +5,7 @@
 for f in /tmp/dhclient.*.pid; do
    [ -e $f ] || continue
    read PID < $f;
-    kill $PID;
+    kill $PID >/dev/null 2>&1
 done

 sleep 0.1
@@ -13,5 +13,5 @@ sleep 0.1
 for f in /tmp/dhclient.*.pid; do
    [ -e $f ] || continue
    read PID < $f;
-    kill -9 $PID;
+    kill -9 $PID >/dev/null 2>&1
 done
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -27,6 +27,7 @@ installkernel() {
    net_module_filter() {
        local _net_drivers='eth_type_trans|register_virtio_device'
        local _unwanted_drivers='/(wireless|isdn|uwb)/'
+        local _ret
        # subfunctions inherit following FDs
        local _merge=8 _side2=9
        function nmf1() {
@@ -55,46 +56,47 @@ installkernel() {
        # Use two parallel streams to filter alternating modules.
        set +x
        eval "( ( rotor ) ${_side2}>&1 | nmf1 ) ${_merge}>&1"
+        _ret=$?
        [[ $debug ]] && set -x
+        return $_ret
    }

    { find_kernel_modules_by_path drivers/net; find_kernel_modules_by_path drivers/s390/net; } \
        | net_module_filter | instmods

+    instmods =drivers/net/phy
    instmods ecb arc4
    # bridge modules
    instmods bridge stp llc
    instmods ipv6
    # bonding
    instmods bonding
+    # vlan
+    instmods 8021q
 }

 install() {
    local _arch _i _dir
    dracut_install ip arping tr dhclient
-    dracut_install -o brctl ifenslave
-    inst "$moddir/ifup" "/sbin/ifup"
-    inst "$moddir/netroot" "/sbin/netroot"
-    inst "$moddir/dhclient-script" "/sbin/dhclient-script"
+    dracut_install -o brctl
+    inst "$moddir/ifup.sh" "/sbin/ifup"
+    inst "$moddir/netroot.sh" "/sbin/netroot"
+    inst "$moddir/dhclient-script.sh" "/sbin/dhclient-script"
    inst "$moddir/net-lib.sh" "/lib/net-lib.sh"
    inst_simple "$moddir/dhclient.conf" "/etc/dhclient.conf"
    inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
    inst_hook pre-udev 60 "$moddir/net-genrules.sh"
    inst_hook cmdline 91 "$moddir/dhcp-root.sh"
+    inst_hook cmdline 95 "$moddir/parse-vlan.sh"
    inst_hook cmdline 96 "$moddir/parse-bond.sh"
    inst_hook cmdline 97 "$moddir/parse-bridge.sh"
    inst_hook cmdline 98 "$moddir/parse-ip-opts.sh"
    inst_hook cmdline 99 "$moddir/parse-ifname.sh"
-    inst_hook pre-pivot 10 "$moddir/kill-dhclient.sh"
+    inst_hook cleanup 10 "$moddir/kill-dhclient.sh"

    _arch=$(uname -m)

-    for _dir in "$usrlibdir/tls/$_arch" "$usrlibdir/tls" "$usrlibdir/$_arch" \
-        "$usrlibdir" "$libdir"; do
-        for _i in "$_dir"/libnss_dns.so.* "$_dir"/libnss_mdns4_minimal.so.*; do
-            [ -e "$_i" ] && dracut_install "$_i"
-        done
-    done
-
+    inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*"
+    inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*"
 }

--- a/modules.d/40network/net-genrules.sh
+++ b/modules.d/40network/net-genrules.sh
@@ -14,14 +14,14 @@ fix_bootif() {
 }

 # Don't continue if we don't need network
-[ -z "$netroot" ] && ! getargbool 0 rd.neednet && return;
+[ -z "$netroot" ] && ! [ -e "/tmp/net.ifaces" ] && return;

 # Write udev rules
 {
    # bridge: attempt only the defined interface
    if [ -e /tmp/bridge.info ]; then
        . /tmp/bridge.info
-        IFACES=$ethname
+        IFACES=${ethnames%% *}
    fi

    # bond: attempt only the defined interface (override bridge defines)
@@ -31,33 +31,29 @@ fix_bootif() {
        IFACES=${bondslaves%% *}
    fi

+    if [ -e /tmp/vlan.info ]; then
+        . /tmp/vlan.info
+        IFACES=$phydevice
+    fi
+
+    ifup='/sbin/ifup $env{INTERFACE}'
+    [ -z "$netroot" ] && ifup="$ifup -m"
+
    # BOOTIF says everything, use only that one
    BOOTIF=$(getarg 'BOOTIF=')
    if [ -n "$BOOTIF" ] ; then
        BOOTIF=$(fix_bootif "$BOOTIF")
-        if [ -n "$netroot" ]; then
-            printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE}"\n' "$BOOTIF"
-        else
-            printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE} -m"\n' "$BOOTIF"
-        fi
+        printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", RUN+="%s"\n' "$BOOTIF" "/sbin/initqueue --onetime $ifup"

    # If we have to handle multiple interfaces, handle only them.
    elif [ -n "$IFACES" ] ; then
        for iface in $IFACES ; do
-            if [ -n "$netroot" ]; then
-                printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE}"\n' "$iface"
-            else
-                printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE} -m"\n' "$iface"
-            fi
+            printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", RUN+="%s"\n' "$iface" "/sbin/initqueue --onetime $ifup"
        done

    # Default: We don't know the interface to use, handle all
    else
-        if [ -n "$netroot" ]; then
-            printf 'SUBSYSTEM=="net", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE}"\n'
-        else
-            printf 'SUBSYSTEM=="net", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE} -m"\n'
-        fi
+        printf 'SUBSYSTEM=="net", RUN+="%s"\n' "/sbin/initqueue --onetime $ifup"
    fi

 } > /etc/udev/rules.d/60-net.rules
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@@ -31,3 +31,261 @@ iface_has_link() {
    [ "$(cat $interface/carrier)" = 1 ] || return 1
    # XXX Do we need to reset the flags here? anaconda never bothered..
 }
+
+all_ifaces_up() {
+    local iface="" IFACES=""
+    [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
+    for iface in $IFACES; do
+        [ -e /tmp/net.$iface.up ] || return 1
+    done
+}
+
+get_netroot_ip() {
+    local prefix="" server="" rest=""
+    splitsep "$1" ":" prefix server rest
+    case $server in
+        [0-9]*\.[0-9]*\.[0-9]*\.[0-9]*) echo "$server"; return 0 ;;
+    esac
+    return 1
+}
+
+ip_is_local() {
+    strstr "$(ip route get $1 2>/dev/null)" " via "
+}
+
+ifdown() {
+    local netif="$1"
+    # ip down/flush ensures that routing info goes away as well
+    ip link set $netif down
+    ip addr flush dev $netif
+    echo "#empty" > /etc/resolv.conf
+    rm -f /tmp/net.$netif.did-setup
+    # TODO: send "offline" uevent?
+}
+
+setup_net() {
+    local netif="$1" f="" gw_ip="" netroot_ip="" iface="" IFACES=""
+    [ -e /tmp/net.$netif.did-setup ] && return
+    [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
+    [ -z "$IFACES" ] && IFACES="$netif"
+    # run the scripts written by ifup
+    [ -e /tmp/net.$netif.gw ]            && . /tmp/net.$netif.gw
+    [ -e /tmp/net.$netif.hostname ]      && . /tmp/net.$netif.hostname
+    [ -e /tmp/net.$netif.override ]      && . /tmp/net.$netif.override
+    [ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
+    # set up resolv.conf
+    [ -e /tmp/net.$netif.resolv.conf ] && \
+        cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf
+
+    # Handle STP Timeout: arping the default gateway.
+    # (or the root server, if a) it's local or b) there's no gateway.)
+    # Note: This assumes that if no router is present the
+    # root server is on the same subnet.
+
+    # Get DHCP-provided router IP, or the cmdline-provided "gw=" argument
+    [ -n "$new_routers" ] && gw_ip=${new_routers%%,*}
+    [ -n "$gw" ] && gw_ip=$gw
+
+    # Get the "netroot" IP (if there's an IP address in there)
+    netroot_ip=$(get_netroot_ip $netroot)
+
+    # try netroot if it's local (or there's no gateway)
+    if ip_is_local $netroot_ip || [ -z "$gw_ip" ]; then
+        dest="$netroot_ip"
+    else
+        dest="$gw_ip"
+    fi
+
+    unset layer2
+    if [ -f /sys/class/net/$netif/device/layer2 ]; then
+        read layer2 < /sys/class/net/$netif/device/layer2
+    fi
+
+    if [ "$layer2" != "0" ] && [ -n "$dest" ] && ! arping -q -f -w 60 -I $netif $dest ; then
+        info "Resolving $dest via ARP on $netif failed"
+    fi
+    unset layer2
+
+    > /tmp/net.$netif.did-setup
+}
+
+save_netinfo() {
+    local netif="$1" IFACES="" f="" i=""
+    [ -e /tmp/net.ifaces ] && read IFACES < /tmp/net.ifaces
+    # Add $netif to the front of IFACES (if it's not there already).
+    set -- "$netif"
+    for i in $IFACES; do [ "$i" != "$netif" ] && set -- "$@" "$i"; done
+    IFACES="$*"
+    for i in $IFACES; do
+        for f in /tmp/dhclient.$i.*; do
+            [ -f $f ] && cp -f $f /tmp/net.${f#/tmp/dhclient.}
+        done
+    done
+    echo $IFACES > /tmp/.net.ifaces.new
+    mv /tmp/.net.ifaces.new /tmp/net.ifaces
+}
+
+set_ifname() {
+    local name="$1" mac="$2" num=0 n=""
+    # if it's already set, return the existing name
+    for n in $(getargs ifname=); do
+        strstr "$n" "$mac" && echo ${n%%:*} && return
+    done
+    # otherwise, pick a new name and use that
+    while [ -e /sys/class/$name$num ]; do num=$(($num+1)); done
+    echo "ifname=$name$num:$mac" >> /etc/cmdline.d/45-ifname.conf
+    echo "$name$num"
+}
+
+ibft_to_cmdline() {
+    local iface="" mac="" dev=""
+    local dhcp="" ip="" gw="" mask="" hostname=""
+    modprobe -q iscsi_ibft
+    (
+        for iface in /sys/firmware/ibft/ethernet*; do
+            [ -e ${iface}/mac ] || continue
+            mac=$(read a < ${iface}/mac; echo $a)
+            [ -z "$ifname_mac" ] && continue
+            dev=$(set_ifname ibft $ifname_mac)
+            dhcp=$(read a < ${iface}/dhcp; echo $a)
+            if [ -n "$dhcp" ]; then
+                echo "ip=$dev:dhcp"
+            else
+                ip=$(read a < ${iface}/ip-addr; echo $a)
+                gw=$(read a < ${iface}/gateway; echo $a)
+                mask=$(read a < ${iface}/subnet-mask; echo $a)
+                hostname=$(read a < ${iface}/hostname; echo $a)
+                echo "ip=$ip::$gw:$mask:$hostname:$dev:none"
+            fi
+        done
+    ) >> /etc/cmdline.d/40-ibft.conf
+    # reread cmdline
+    unset CMDLINE
+}
+
+parse_iscsi_root()
+{
+    local v
+    v=${1#iscsi:}
+
+# extract authentication info
+    case "$v" in
+	*@*:*:*:*:*)
+	    authinfo=${v%%@*}
+	    v=${v#*@}
+    # allow empty authinfo to allow having an @ in iscsi_target_name like this:
+    # netroot=iscsi:@192.168.1.100::3260::iqn.2009-01.com.example:testdi@sk
+	    if [ -n "$authinfo" ]; then
+		OLDIFS="$IFS"
+		IFS=:
+		set $authinfo
+		IFS="$OLDIFS"
+		if [ $# -gt 4 ]; then
+		    warn "Wrong authentication info in iscsi: parameter!"
+		    return 1
+		fi
+		iscsi_username=$1
+		iscsi_password=$2
+		if [ $# -gt 2 ]; then
+		    iscsi_in_username=$3
+		    iscsi_in_password=$4
+		fi
+	    fi
+	    ;;
+    esac
+
+# extract target ip
+    case "$v" in
+	[[]*[]]:*)
+	    iscsi_target_ip=${v#[[]}
+		iscsi_target_ip=${iscsi_target_ip%%[]]*}
+	    v=${v#[[]$iscsi_target_ip[]]:}
+	    ;;
+	*)
+	    iscsi_target_ip=${v%%[:]*}
+	    v=${v#$iscsi_target_ip:}
+	    ;;
+    esac
+
+# extract target name
+    case "$v" in
+	*:iqn.*)
+	    iscsi_target_name=iqn.${v##*:iqn.}
+	    v=${v%:iqn.*}:
+	    ;;
+	*:eui.*)
+	    iscsi_target_name=iqn.${v##*:eui.}
+	    v=${v%:iqn.*}:
+	    ;;
+	*:naa.*)
+	    iscsi_target_name=iqn.${v##*:naa.}
+	    v=${v%:iqn.*}:
+	    ;;
+	*)
+	    warn "Invalid iscii target name, should begin with 'iqn.' or 'eui.' or 'naa.'"
+	    return 1
+	    ;;
+    esac
+
+# parse the rest
+    OLDIFS="$IFS"
+    IFS=:
+    set $v
+    IFS="$OLDIFS"
+
+    iscsi_protocol=$1; shift # ignored
+    iscsi_target_port=$1; shift
+    if [ $# -eq 3 ]; then
+	iscsi_iface_name=$1; shift
+    fi
+    if [ $# -eq 2 ]; then
+	iscsi_netdev_name=$1; shift
+    fi
+    iscsi_lun=$1; shift
+    if [ $# -ne 0 ]; then
+	warn "Invalid parameter in iscsi: parameter!"
+	return 1
+    fi
+}
+
+ip_to_var() {
+    local v=${1}:
+    local i
+    set --
+    while [ -n "$v" ]; do
+        if [ "${v#\[*:*:*\]:}" != "$v" ]; then
+            # handle IPv6 address
+            i="${v%%\]:*}"
+            i="${i##\[}"
+            set -- "$@" "$i"
+            v=${v#\[$i\]:}
+        else
+            set -- "$@" "${v%%:*}"
+            v=${v#*:}
+        fi
+    done
+
+    unset ip srv gw mask hostname dev autoconf macaddr mtu
+    case $# in
+        0)  autoconf="error" ;;
+        1)  autoconf=$1 ;;
+        2)  dev=$1; autoconf=$2 ;;
+        3)  dev=$1; autoconf=$2; mtu=$3 ;;
+        4)  dev=$1; autoconf=$2; mtu=$3; macaddr=$4 ;;
+        *)  ip=$1; srv=$2; gw=$3; mask=$4; hostname=$5; dev=$6; autoconf=$7; mtu=$8; macaddr=$9 ;;
+    esac
+    # anaconda-style argument cluster
+    if strstr "$autoconf" "*.*.*.*"; then
+        ip="$autoconf"
+        gw=$(getarg gateway=)
+        mask=$(getarg netmask=)
+        hostname=$(getarg hostname=)
+        dev=$(getarg ksdevice=)
+        autoconf="none"
+        mtu=$(getarg mtu=)
+        case "$dev" in
+            # ignore fancy values for ksdevice=XXX
+            link|bootif|BOOTIF|ibft|*:*:*:*:*:*) dev="" ;;
+        esac
+    fi
+}
--- a/modules.d/40network/netroot
+++ b/modules.d/40network/netroot
@@ -1,161 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
-# Huh? Empty $1?
-[ -z "$1" ] && exit 1
-
-# Huh? No interface config?
-[ ! -e /tmp/net.$1.up ] && exit 1
-
-# [ ! -z $2 ] means this is for manually bringing up network
-# instead of real netroot; If It's called without $2, then there's
-# no sense in doing something if no (net)root info is available
-# or root is already there
-[ -e /tmp/root.info ] || exit 1
-. /tmp/root.info
-if [ -z "$2" ]; then
-    [ -d $NEWROOT/proc ] && exit 0
-    [ -z "$netroot" ] && exit 1
-fi
-
-# Let's see if we have to wait for other interfaces
-# Note: exit works just fine, since the last interface to be
-#       online'd should see all files
-[ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
-for iface in $IFACES ; do
-    [ -e /tmp/net.$iface.up ] || exit 1
-done
-
-# Set or override primary interface
-netif=$1
-[ -e "/tmp/net.bootdev" ] && read netif < /tmp/net.bootdev
-
-if [ -e /tmp/net.$netif.manualup ]; then
-    rm -f /tmp/net.$netif.manualup
-fi
-
-# Figure out the handler for root=dhcp by recalling all netroot cmdline
-# handlers when this is not called from manually network bringing up.
-if [ -z "$2" ]; then
-    if [ "$netroot" = "dhcp" ] || [ "$netroot" = "dhcp6" ] ; then
-        # Unset root so we can check later
-        unset root
-
-        # Load dhcp options
-        [ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
-
-        # If we have a specific bootdev with no dhcpoptions or empty root-path,
-        # we die. Otherwise we just warn
-        if [ -z "$new_root_path" ] ; then
-            [ -n "$BOOTDEV" ] && die "No dhcp root-path received for '$BOOTDEV'"
-            warn "No dhcp root-path received for '$BOOTDEV' trying other interfaces if available"
-            exit 1
-        fi
-
-        # Set netroot to new_root_path, so cmdline parsers don't call
-        netroot=$new_root_path
-
-        # FIXME!
-        for f in $hookdir/cmdline/90*.sh; do
-            [ -f "$f" ] && . "$f";
-        done
-    else
-        rootok="1"
-    fi
-
-    # Check: do we really know how to handle (net)root?
-    [ -z "$root" ] && die "No or empty root= argument"
-    [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
-
-    handler=${netroot%%:*}
-    handler=${handler%%4}
-    handler=$(command -v ${handler}root)
-    if [ -z "$netroot" ] || [ ! -e "$handler" ] ; then
-        die "No handler for netroot type '$netroot'"
-    fi
-fi
-
-# We're here, so we can assume that upping interfaces is now ok
-[ -z "$IFACES" ] && IFACES="$netif"
-for iface in $IFACES ; do
-    . /tmp/net.$iface.up
-done
-
-[ -e /tmp/net.$netif.gw ]          && . /tmp/net.$netif.gw
-[ -e /tmp/net.$netif.hostname ]    && . /tmp/net.$netif.hostname
-[ -e /tmp/net.$netif.resolv.conf ] && cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf
-
-# Load interface options
-[ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override
-[ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
-
-# Handle STP Timeout: arping the default router if root server is
-# unknown or not local, or if not available the root server.
-# Note: This assumes that if no router is present the
-# root server is on the same subnet.
-#
-# TODO There's some netroot variants that don't (yet) have their
-# server-ip netroot
-
-# Get router IP if set
-[ -n "$new_routers" ] && gw_ip=${new_routers%%,*}
-[ -n "$gw" ] && gw_ip=$gw
-# Get root server IP if set
-if [ -n "$netroot" ]; then
-    dummy=${netroot#*:}
-    dummy=${dummy%%:*}
-    case "$dummy" in
-        [0-9]*\.[0-9]*\.[0-9]*\.[0-9]*) netroot_ip=$dummy;;
-    esac
-fi
-# Default arping dest to router
-dest="$gw_ip"
-# Change to arping root server if appropriate
-if [ -n "$netroot_ip" ]; then
-    if [ -z "$dest" ]; then
-         # no gateway so check root server
-        dest="$netroot_ip"
-    else
-        r=$(ip route get "$netroot_ip")
-        if ! strstr "$r" ' via ' ; then
-            # local root server, so don't arping gateway
-            dest="$netroot_ip"
-        fi
-    fi
-fi
-if [ -n "$dest" ] && ! arping -q -f -w 60 -I $netif $dest ; then
-    dinfo "Resolving $dest via ARP on $netif failed"
-fi
-
-# exit in case manually bring up network
-[ -n "$2" ] && exit 0
-
-# Source netroot hooks before we start the handler
-source_all $hookdir/netroot
-
-# Run the handler; don't store the root, it may change from device to device
-# XXX other variables to export?
-if $handler $netif $netroot $NEWROOT; then
-    # Network rootfs mount successful
-    for iface in $IFACES ; do
-        [ -f /tmp/dhclient.$iface.lease ] &&    cp /tmp/dhclient.$iface.lease    /tmp/net.$iface.lease
-        [ -f /tmp/dhclient.$iface.dhcpopts ] && cp /tmp/dhclient.$iface.dhcpopts /tmp/net.$iface.dhcpopts
-    done
-
-    # Save used netif for later use
-    [ ! -f /tmp/net.ifaces ] && echo $netif > /tmp/net.ifaces
-else
-    warn "Mounting root via '$netif' failed"
-    # If we're trying with multiple interfaces, put that one down.
-    # ip down/flush ensures that routeing info goes away as well
-    if [ -z "$BOOTDEV" ] ; then
-        ip link set $netif down
-        ip addr flush dev $netif
-        echo "#empty" > /etc/resolv.conf
-    fi
-fi
-exit 0
--- a/modules.d/40network/netroot.sh
+++ b/modules.d/40network/netroot.sh
@@ -0,0 +1,73 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+command -v getarg >/dev/null    || . /lib/dracut-lib.sh
+command -v setup_net >/dev/null || . /lib/net-lib.sh
+
+# Huh? Empty $1?
+[ -z "$1" ] && exit 1
+
+# [ ! -z $2 ] means this is for manually bringing up network
+# instead of real netroot; If It's called without $2, then there's
+# no sense in doing something if no (net)root info is available
+# or root is already there
+[ -d $NEWROOT/proc ] && exit 0
+[ -z "$netroot" ] && exit 1
+
+# Set or override primary interface
+netif=$1
+[ -e "/tmp/net.bootdev" ] && read netif < /tmp/net.bootdev
+
+# Figure out the handler for root=dhcp by recalling all netroot cmdline
+# handlers when this is not called from manually network bringing up.
+if [ -z "$2" ]; then
+    if [ "$netroot" = "dhcp" ] || [ "$netroot" = "dhcp6" ] ; then
+        # Unset root so we can check later
+        unset root
+
+        # Load dhcp options
+        [ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
+
+        # If we have a specific bootdev with no dhcpoptions or empty root-path,
+        # we die. Otherwise we just warn
+        if [ -z "$new_root_path" ] ; then
+            [ -n "$BOOTDEV" ] && die "No dhcp root-path received for '$BOOTDEV'"
+            warn "No dhcp root-path received for '$BOOTDEV' trying other interfaces if available"
+            exit 1
+        fi
+
+        # Set netroot to new_root_path, so cmdline parsers don't call
+        netroot=$new_root_path
+
+        # FIXME!
+        for f in $hookdir/cmdline/90*.sh; do
+            [ -f "$f" ] && . "$f";
+        done
+    else
+        rootok="1"
+    fi
+
+    # Check: do we really know how to handle (net)root?
+    [ -z "$root" ] && die "No or empty root= argument"
+    [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
+
+    handler=${netroot%%:*}
+    handler=${handler%%4}
+    handler=$(command -v ${handler}root)
+    if [ -z "$netroot" ] || [ ! -e "$handler" ] ; then
+        die "No handler for netroot type '$netroot'"
+    fi
+fi
+
+# Source netroot hooks before we start the handler
+source_hook netroot $netif
+
+# Run the handler; don't store the root, it may change from device to device
+# XXX other variables to export?
+if $handler $netif $netroot $NEWROOT; then
+    # Network rootfs mount successful - save interface info for ifcfg etc.
+    save_netinfo $netif
+fi
+exit 0
--- a/modules.d/40network/parse-bond.sh
+++ b/modules.d/40network/parse-bond.sh
@@ -15,10 +15,7 @@

 # Check if bond parameter is valid
 if getarg bond= >/dev/null ; then
-    if [ -z "$netroot" ] ; then
-        die "No netboot configured, bond is invalid"
-    fi
-    command -v brctl >/dev/null 2>&1 || die "No 'brctl' installed"
+    :
 fi

 # We translate list of slaves to space-separated here to mwke it easier to loop over them in ifup
--- a/modules.d/40network/parse-bridge.sh
+++ b/modules.d/40network/parse-bridge.sh
@@ -3,8 +3,9 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 #
 # Format:
-#       bridge=<bridgename>:<ethname>
+#       bridge=<bridgename>:<ethnames>
 #
+#       <ethnames> is a comma-separated list of physical (ethernet) interfaces
 #       bridge without parameters assumes bridge=br0:eth0
 #

@@ -13,9 +14,6 @@

 # Check if bridge parameter is valid
 if getarg bridge= >/dev/null ; then
-    if [ -z "$netroot" ] ; then
-        die "No netboot configured, bridge is invalid"
-    fi
    command -v brctl >/dev/null 2>&1 || die "No 'brctl' installed" 
 fi

@@ -27,16 +25,16 @@ parsebridge() {
        v=${v#*:}
    done

-    unset bridgename ethname
+    unset bridgename ethnames
    case $# in
-        0)  bridgename=br0; ethname=$iface ;;
+        0)  bridgename=br0; ethnames=$iface ;;
        1)  die "bridge= requires two parameters" ;;
-        2)  bridgename=$1; ethname=$2 ;;
+        2)  bridgename=$1; ethnames=$(echo $2|tr "," " ") ;;
        *)  die "bridge= requires two parameters" ;;
    esac
 }

-unset bridgename ethname
+unset bridgename ethnames

 iface=eth0
 if [ -e /tmp/bond.info ]; then
@@ -46,7 +44,7 @@ if [ -e /tmp/bond.info ]; then
    fi
 fi

-# Parse bridge for bridgename and ethname
+# Parse bridge for bridgename and ethnames
 if bridge="$(getarg bridge)"; then
    # Read bridge= parameters if they exist
    if [ -n "$bridge" ]; then
@@ -55,9 +53,9 @@ if bridge="$(getarg bridge)"; then
    # Simple default bridge
    if [ -z "$bridgename" ]; then
        bridgename=br0
-        ethname=$iface
+        ethnames=$iface
    fi
    echo "bridgename=$bridgename" > /tmp/bridge.info
-    echo "ethname=$ethname" >> /tmp/bridge.info
+    echo "ethnames=\"$ethnames\"" >> /tmp/bridge.info
    return
 fi
--- a/modules.d/40network/parse-ip-opts.sh
+++ b/modules.d/40network/parse-ip-opts.sh
@@ -5,24 +5,17 @@
 # Format:
 #       ip=[dhcp|on|any]
 #
-#       ip=<interface>:[dhcp|on|any]
+#       ip=<interface>:[dhcp|on|any][:[<mtu>][:<macaddr>]]
 #
-#       ip=<client-IP-number>:<server-IP-number>:<gateway-IP-number>:<netmask>:<client-hostname>:<interface>:[dhcp|on|any|none|off]
+#       ip=<client-IP-number>:<server-IP-number>:<gateway-IP-number>:<netmask>:<client-hostname>:<interface>:{dhcp|on|any|none|off}[:[<mtu>][:<macaddr>]]
 #
 # When supplying more than only ip= line, <interface> is mandatory and
 # bootdev= must contain the name of the primary interface to use for
 # routing,dns,dhcp-options,etc.
 #

-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
-# Check if ip= lines should be used
-if getarg ip= >/dev/null ; then
-    if [ -z "$netroot" ] ; then
-        echo "Warning: No netboot configured, ignoring ip= lines"
-        return;
-    fi
-fi
+command -v getarg >/dev/null          || . /lib/dracut-lib.sh
+command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh

 # Don't mix BOOTIF=macaddr from pxelinux and ip= lines
 getarg ip= >/dev/null && getarg BOOTIF= >/dev/null && \
@@ -38,12 +31,13 @@ fi

 # Count ip= lines to decide whether we need bootdev= or not
 if [ -z "$NEEDBOOTDEV" ] ; then
-    local count=0
+    count=0
    for p in $(getargs ip=); do
        count=$(( $count + 1 ))
    done
    [ $count -gt 1 ] && NEEDBOOTDEV=1
 fi
+unset count

 # If needed, check if bootdev= contains anything usable
 if [ -n "$NEEDBOOTDEV" ] ; then
@@ -51,50 +45,15 @@ if [ -n "$NEEDBOOTDEV" ] ; then
    [ -z "$BOOTDEV" ] && die "Bootdev argument is empty"
 fi

-if [ "ibft" = "$(getarg ip=)" ]; then
-    modprobe iscsi_ibft
-    num=0
-    (
-	for iface in /sys/firmware/ibft/ethernet*; do
-	    [ -e ${iface}/mac ] || continue
-            ifname_mac=$(read a < ${iface}/mac; echo $a)
-	    [ -z "$ifname_mac" ] && continue
-            unset dev
-            for ifname in $(getargs ifname=); do
-		if strstr "$ifname" "$ifname_mac"; then
-		    dev=${ifname%%:*}
-                    break
-                fi
-	    done
-            if [ -z "$dev" ]; then
-		ifname_if=ibft$num
-		num=$(( $num + 1 ))
-		echo "ifname=$ifname_if:$ifname_mac"
-		dev=$ifname_if
-	    fi
-
-	    dhcp=$(read a < ${iface}/dhcp; echo $a)
-	    if [ -n "$dhcp" ]; then
-		echo "ip=$dev:dhcp"
-	    else
-		ip=$(read a < ${iface}/ip-addr; echo $a)
-		gw=$(read a < ${iface}/gateway; echo $a)
-		mask=$(read a < ${iface}/subnet-mask; echo $a)
-		hostname=$(read a < ${iface}/hostname; echo $a)
-		echo "ip=$ip::$gw:$mask:$hostname:$dev:none"
-	    fi
-	done
-    ) >> /etc/cmdline
-    # reread cmdline
-    unset CMDLINE
-fi
+# If ibft is requested, read ibft vals and write ip=XXX cmdline args
+[ "ibft" = "$(getarg ip=)" ] && ibft_to_cmdline

 # Check ip= lines
 # XXX Would be nice if we could errorcheck ip addresses here as well
 for p in $(getargs ip=); do
    ip_to_var $p

-    # skip ibft
+    # skip ibft since we did it above
    [ "$autoconf" = "ibft" ] && continue

    # We need to have an ip= line for the specified bootdev
@@ -110,7 +69,7 @@ for p in $(getargs ip=); do
    case $autoconf in
        error) die "Error parsing option 'ip=$p'";;
        bootp|rarp|both) die "Sorry, ip=$autoconf is currenty unsupported";;
-        none|off) \
+        none|off)
            [ -z "$ip" ] && \
            die "For argument 'ip=$p'\nValue '$autoconf' without static configuration does not make sense"
            [ -z "$mask" ] && \
--- a/modules.d/40network/parse-vlan.sh
+++ b/modules.d/40network/parse-vlan.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# Format:
+#	vlan=<vlanname>:<phydevice>
+#
+
+# return if vlan already parsed
+[ -n "$vlanname" ] && return
+
+# Check if vlan parameter is valid
+if getarg vlan= >/dev/null ; then
+    :
+fi
+
+parsevlan() {
+    local v=${1}:
+    set --
+    while [ -n "$v" ]; do
+        set -- "$@" "${v%%:*}"
+        v=${v#*:}
+    done
+
+    unset vlanname phydevice
+    case $# in
+    2)  vlanname=$1; phydevice=$2 ;;
+    *)  die "vlan= requires two parameters" ;;
+    esac
+}
+
+unset vlanname phydevice
+
+if getarg vlan >/dev/null; then
+    # Read vlan= parameters if they exist
+    vlan="$(getarg vlan=)"
+    if [ ! "$vlan" = "vlan" ]; then
+        parsevlan "$(getarg vlan=)"
+    fi
+
+    echo "vlanname=\"$vlanname\"" > /tmp/vlan.info
+    echo "phydevice=\"$phydevice\"" >> /tmp/vlan.info
+    return
+fi
--- a/modules.d/45ifcfg/write-ifcfg.sh
+++ b/modules.d/45ifcfg/write-ifcfg.sh
@@ -18,11 +18,77 @@ if [ -e /tmp/bridge.info ]; then
 fi

 mkdir -m 0755 -p /tmp/ifcfg/
+mkdir -m 0755 -p /tmp/ifcfg-leases/
+
+get_config_line_by_subchannel()
+{
+    local CHANNEL
+    local line
+
+    CHANNELS="$1"
+    while read line; do
+        if strstr "$line" "$CHANNELS"; then
+            echo $line
+            return 0
+        fi
+    done < /etc/ccw.conf
+    return 1
+}
+
+print_s390() {
+    local _netif
+    local SUBCHANNELS
+    local OPTIONS
+    local NETTYPE
+    local CONFIG_LINE
+    local i
+    local channel
+    local OLD_IFS
+
+    _netif="$1"
+    # if we find ccw channel, then use those, instead of
+    # of the MAC
+    SUBCHANNELS=$({
+        for i in /sys/class/net/$_netif/device/cdev[0-9]*; do
+            [ -e $i ] || continue
+            channel=$(readlink -f $i)
+            echo -n "${channel##*/},"
+        done
+    })
+    [ -n "$SUBCHANNELS" ] || return 1
+
+    SUBCHANNELS=${SUBCHANNELS%,}
+    echo "SUBCHANNELS=\"${SUBCHANNELS}\""
+    CONFIG_LINE=$(get_config_line_by_subchannel $SUBCHANNELS)
+
+    [ $? -ne 0 -o -z "$CONFIG_LINE" ] && return
+
+    OLD_IFS=$IFS
+    IFS=","
+    set -- $CONFIG_LINE
+    IFS=$OLD_IFS
+    NETTYPE=$1
+    shift
+    SUBCHANNELS="$1"
+    OPTIONS=""
+    shift
+    while [ $# -gt 0 ]; do
+        case $1 in
+            *=*) OPTIONS="$OPTIONS $1";;
+        esac
+        shift
+    done
+    OPTIONS=${OPTIONS## }
+    echo "NETTYPE=\"${NETTYPE}\""
+    echo "OPTIONS=\"${OPTIONS}\""
+}
+

 for netif in $IFACES ; do
    # bridge?
    unset bridge
    unset bond
+    uuid=$(cat /proc/sys/kernel/random/uuid)
    if [ "$netif" = "$bridgename" ]; then
        bridge=yes
    elif [ "$netif" = "$bondname" ]; then
@@ -35,16 +101,23 @@ for netif in $IFACES ; do
        echo "DEVICE=$netif"
        echo "ONBOOT=yes"
        echo "NETBOOT=yes"
+        echo "UUID=$uuid"
+        [ -n "$mtu" ] && echo "MTU=$mtu"
        if [ -f /tmp/net.$netif.lease ]; then
            strstr "$ip" '*:*:*' &&
            echo "DHCPV6C=yes"
            echo "BOOTPROTO=dhcp"
+            cp /tmp/net.$netif.lease /tmp/ifcfg-leases/dhclient-$uuid-$netif.lease
        else
            echo "BOOTPROTO=none"
        # If we've booted with static ip= lines, the override file is there
            [ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override
            echo "IPADDR=$ip"
-            echo "NETMASK=$mask"
+            if strstr "$mask" "."; then
+                echo "NETMASK=$mask"
+            else
+                echo "PREFIX=$mask"
+            fi
            [ -n "$gw" ] && echo "GATEWAY=$gw"
        fi
    } > /tmp/ifcfg/ifcfg-$netif
@@ -53,9 +126,15 @@ for netif in $IFACES ; do
    if [ -z "$bridge" ] && [ -z "$bond" ]; then
        # standard interface
        {
-            echo "HWADDR=$(cat /sys/class/net/$netif/address)"
+            if [ -n "$macaddr" ]; then
+                echo "MACADDR=$macaddr"
+            else
+                echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\""
+            fi
+            print_s390 $netif
            echo "TYPE=Ethernet"
            echo "NAME=\"Boot Disk\""
+            [ -n "$mtu" ] && echo "MTU=$mtu"
        } >> /tmp/ifcfg/ifcfg-$netif
    fi

@@ -131,14 +210,21 @@ for netif in $IFACES ; do
            } >> /tmp/ifcfg/ifcfg-$ethname
        fi
    fi
+    i=1
+    for ns in $(getargs nameserver); do
+        echo "DNS${i}=${ns}" >> /tmp/ifcfg/ifcfg-$netif
+        i=$((i+1))
+    done
 done

 # Pass network opts
-[ -d /run/initramfs ] || mkdir -m 0755 -p /run/initramfs
-cp /tmp/net.* /run/initramfs/ >/dev/null 2>&1
-for i in /run/initramfs/state /run/initramfs/state/etc/ /run/initramfs/state/etc/sysconfig /run/initramfs/state/etc/sysconfig/network-scripts; do
-    [ -d $i ] || mkdir -m 0755 -p $i
-done
-cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ >/dev/null 2>&1
-echo "files /etc/sysconfig/network-scripts" > /run/initramfs/rwtab
-cp -a -t /run/initramfs/state/etc/sysconfig/network-scripts/ /tmp/ifcfg/* >/dev/null 2>&1
+mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
+mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient
+echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
+echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
+{
+    cp /tmp/net.* /run/initramfs/
+    cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf
+    copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts
+    cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient
+} > /dev/null 2>&1
--- a/modules.d/45url-lib/url-lib.sh
+++ b/modules.d/45url-lib/url-lib.sh
@@ -43,6 +43,7 @@ add_url_handler() {
    local schemes="$@" scheme=""
    set --
    for scheme in $schemes; do
+        [ "$(get_url_handler $scheme)" = "$handler" ] && continue
        set -- "$@" "$scheme:$handler"
    done
    set -- $@ $url_handler_map # add new items to *front* of list
@@ -54,20 +55,19 @@ add_url_handler() {
 export CURL_HOME="/run/initramfs/url-lib"
 mkdir -p $CURL_HOME
 curl_args="--location --retry 3 --fail --show-error"
+
 curl_fetch_url() {
    local url="$1" outloc="$2"
+    echo "$url" > /proc/self/fd/0
    if [ -n "$outloc" ]; then
        curl $curl_args --output "$outloc" "$url" || return $?
    else
        local outdir="$(mkuniqdir /tmp curl_fetch_url)"
-        local cwd="$(pwd)"
-        cd "$outdir"
-        curl $curl_args --remote-name "$url" || return $?
-        cd "$cwd"
-        outloc="$(echo $outdir/*)"
+        ( cd "$outdir"; curl $curl_args --remote-name "$url" || return $? )
+        outloc="$outdir/$(ls -A $outdir)"
    fi
    [ -f "$outloc" ] || return 253
-    echo "$outloc"
+    if [ -z "$2" ]; then echo "$outloc" ; fi
 }
 add_url_handler curl_fetch_url http https ftp

@@ -77,7 +77,7 @@ set_http_header() {

 ### NFS ##############################################################

-. /lib/nfs-lib.sh
+[ -e /lib/nfs-lib.sh ] && . /lib/nfs-lib.sh

 nfs_already_mounted() {
    local server="$1" path="$2" localdir="" s="" p=""
@@ -102,7 +102,7 @@ nfs_fetch_url() {
    mntdir=$(nfs_already_mounted $server $path)
    if [ -z "$mntdir" ]; then
        local mntdir="$(mkuniqdir /run nfs_mnt)"
-        mount_nfs $nfs:$server:$path${options:+:$options} $mntdir
+        mount_nfs $nfs:$server:$filepath${options:+:$options} $mntdir
        # lazy unmount during pre-pivot hook
        inst_hook --hook pre-pivot --name 99url-lib-umount-nfs umount -l $mntdir
    fi
@@ -113,6 +113,6 @@ nfs_fetch_url() {
        cp -f "$mntdir/$filename" "$outloc" || return $?
    fi
    [ -f "$outloc" ] || return 253
-    echo "$outloc"
+    if [ -z "$2" ]; then echo "$outloc" ; fi
 }
-add_url_handler nfs_fetch_url nfs nfs4
+command -v nfs_to_var >/dev/null && add_url_handler nfs_fetch_url nfs nfs4
--- a/modules.d/50plymouth/module-setup.sh
+++ b/modules.d/50plymouth/module-setup.sh
@@ -38,7 +38,7 @@ install() {
    if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
        || ! grep -q PLYMOUTH_POPULATE_SOURCE_FUNCTIONS /usr/libexec/plymouth/plymouth-populate-initrd \
        || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
-        . "$moddir"/plymouth-populate-initrd
+        . "$moddir"/plymouth-populate-initrd.sh
    else
        PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
            /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir
--- a/modules.d/50plymouth/plymouth-populate-initrd.sh
+++ b/modules.d/50plymouth/plymouth-populate-initrd.sh
--- a/modules.d/50plymouth/plymouth-pretrigger.sh
+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
@@ -2,27 +2,29 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh

-if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then
-    [ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3
-    # first trigger graphics subsystem
-    udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
-    # first trigger graphics and tty subsystem
-    udevadm trigger --action=add --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty >/dev/null 2>&1
+if [ -x /bin/plymouthd ]; then
+    if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then
+        [ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3
+        # first trigger graphics subsystem
+        udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
+        # first trigger graphics and tty subsystem
+        udevadm trigger --action=add --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty >/dev/null 2>&1

-    udevadm settle --timeout=30 2>&1 | vinfo
-    [ -c /dev/zero ] || mknod -m 0666 /dev/zero c 1 5
-    [ -c /dev/tty0 ] || mknod -m 0620 /dev/tty0 c 4 0
-    [ -e /dev/systty ] || ln -s tty0 /dev/systty
-    [ -c /dev/fb0 ] || mknod -m 0660 /dev/fb0 c 29 0
-    [ -e /dev/fb ] || ln -s fb0 /dev/fb
+        udevadm settle --timeout=30 2>&1 | vinfo
+        [ -c /dev/zero ] || mknod -m 0666 /dev/zero c 1 5
+        [ -c /dev/tty0 ] || mknod -m 0620 /dev/tty0 c 4 0
+        [ -e /dev/systty ] || ln -s tty0 /dev/systty
+        [ -c /dev/fb0 ] || mknod -m 0660 /dev/fb0 c 29 0
+        [ -e /dev/fb ] || ln -s fb0 /dev/fb

-    info "Starting plymouth daemon"
-    mkdir -m 0755 /run/plymouth
-    consoledev=$(getarg console= | sed -e 's/,.*//')
-    consoledev=${consoledev:-tty0}
-    [ -x /lib/udev/console_init ] && /lib/udev/console_init "/dev/$consoledev"
-    [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
-    /bin/plymouth --show-splash 2>&1 | vinfo
-    # reset tty after plymouth messed with it
-    [ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0
+        info "Starting plymouth daemon"
+        mkdir -m 0755 /run/plymouth
+        read consoledev rest < /sys/class/tty/console/active
+        consoledev=${consoledev:-tty0}
+        [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
+        [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
+        /bin/plymouth --show-splash 2>&1 | vinfo
+        # reset tty after plymouth messed with it
+        [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
+    fi
 fi
--- a/modules.d/80cms/cms-write-ifcfg.sh
+++ b/modules.d/80cms/cms-write-ifcfg.sh
@@ -0,0 +1,104 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
+
+function cms_write_config()
+{
+    . /tmp/cms.conf
+    OLDIFS=$IFS
+    IFS=,
+    read -a subch_array <<< "indexzero,$SUBCHANNELS"
+    IFS=$OLDIFS
+    devbusid=${subch_array[1]}
+    if [ "$NETTYPE" = "ctc" ]; then
+	driver="ctcm"
+    else
+	driver=$NETTYPE
+    fi
+
+    DEVICE=$(cd /sys/devices/${driver}/$devbusid/net/ && set -- * && [ "$1" != "*" ] && echo $1)
+
+    uuid=$(cat /proc/sys/kernel/random/uuid)
+
+    IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE
+
+    strstr "$IPADDR" '*:*:*' && ipv6=1
+
+# to please NetworkManager on startup in loader before loader reconfigures net
+    cat > /etc/sysconfig/network << EOF
+HOSTNAME=$HOSTNAME
+EOF
+    if [ "$ipv6" ]; then
+	echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network
+    else
+	echo "NETWORKING=yes" >> /etc/sysconfig/network
+    fi
+
+    cat > $IFCFGFILE << EOF
+DEVICE=$DEVICE
+UUID=$uuid
+ONBOOT=yes
+BOOTPROTO=static
+MTU=$MTU
+SUBCHANNELS=$SUBCHANNELS
+EOF
+    if [ "$ipv6" ]; then
+	cat >> $IFCFGFILE << EOF
+IPV6INIT=yes
+IPV6_AUTOCONF=no
+IPV6ADDR=$IPADDR/$NETMASK
+IPV6_DEFAULTGW=$GATEWAY
+EOF
+    else
+	cat >> $IFCFGFILE << EOF
+IPADDR=$IPADDR
+NETMASK=$NETMASK
+BROADCAST=$BROADCAST
+GATEWAY=$GATEWAY
+EOF
+    fi
+    if [ "$ipv6" ]; then
+	DNS1=$(set -- ${DNS/,/ }; echo $1)
+	DNS2=$(set -- ${DNS/,/ }; echo $2)
+    else
+	DNS1=$(set -- ${DNS/:/ }; echo $1)
+	DNS2=$(set -- ${DNS/:/ }; echo $2)
+    fi
+# real DNS config for NetworkManager to generate /etc/resolv.conf
+    [ "$DNS1" != "" ] && echo "DNS1=$DNS1" >> $IFCFGFILE
+    [ "$DNS2" != "" ] && echo "DNS2=$DNS2" >> $IFCFGFILE
+# just to please loader's readNetInfo && writeEnabledNetInfo
+# which eats DNS1,DNS2,... and generates it themselves based on DNS
+    if [ "$ipv6" ]; then
+	[ "$DNS" != "" ] && echo "DNS=\"$DNS\"" >> $IFCFGFILE
+    else
+	[ "$DNS" != "" ] && echo "DNS=\"${DNS/:/,}\"" >> $IFCFGFILE
+    fi
+# colons in SEARCHDNS already replaced with spaces above for /etc/resolv.conf
+    [ "$SEARCHDNS" != "" ] && echo "DOMAIN=\"$SEARCHDNS\"" >> $IFCFGFILE
+    [ "$NETTYPE" != "" ] && echo "NETTYPE=$NETTYPE" >> $IFCFGFILE
+    [ "$PEERID" != "" ] && echo "PEERID=$PEERID" >> $IFCFGFILE
+    [ "$PORTNAME" != "" ] && echo "PORTNAME=$PORTNAME" >> $IFCFGFILE
+    [ "$CTCPROT" != "" ] && echo "CTCPROT=$CTCPROT" >> $IFCFGFILE
+    [ "$MACADDR" != "" ] && echo "MACADDR=$MACADDR" >> $IFCFGFILE
+    optstr=""
+    for option in LAYER2 PORTNO; do
+	[ -z "${!option}" ] && continue
+	[ -n "$optstr" ] && optstr=${optstr}" "
+	optstr=${optstr}$(echo ${option} | tr [[:upper:]] [[:lower:]])"="${!option}
+    done
+# write single quotes since network.py removes double quotes but we need quotes
+    echo "OPTIONS='$optstr'" >> $IFCFGFILE
+    unset option
+    unset optstr
+    unset DNS1
+    unset DNS2
+    echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
+    echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
+}
+
+[ -f /tmp/cms.conf ] && cms_write_config
--- a/modules.d/80cms/cmsifup.sh
+++ b/modules.d/80cms/cmsifup.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+DEVICE=$1
+
+. /tmp/cms.conf
+
+strstr "$IPADDR" '*:*:*' && ipv6=1
+
+if [ "$ipv6" ] && ! str_starts "$IPADDR" "["; then
+    IPADDR="[$IPADDR]"
+fi
+
+if [ "$ipv6" ] && ! str_starts "$GATEWAY" "["; then
+    GATEWAY="[$GATEWAY]"
+fi
+
+if [ "$ipv6" ]; then
+    DNS1=$(set -- ${DNS/,/ }; echo $1)
+    DNS2=$(set -- ${DNS/,/ }; echo $2)
+else
+    DNS1=$(set -- ${DNS/:/ }; echo $1)
+    DNS2=$(set -- ${DNS/:/ }; echo $2)
+fi
+
+{
+    echo "ip=$IPADDR::$GATEWAY:$NETMASK:$HOSTNAME:$DEVICE:none:$MACADDR"
+    for i in $DNS1 $DNS2; do
+	echo "nameserver=$i"
+    done
+} > /etc/cmdline.d/80-cms.conf
+unset CMDLINE
+
+[ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
+IFACES="$IFACES $DEVICE"
+echo "$IFACES" >> /tmp/net.ifaces
+
+ifup $DEVICE -m
--- a/modules.d/80cms/cmssetup.sh
+++ b/modules.d/80cms/cmssetup.sh
@@ -0,0 +1,200 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+function sysecho () {
+    file="$1"
+    shift
+    local i=1
+    while [ $i -le 10 ] ; do
+        if [ ! -f "$file" ]; then
+            sleep 1
+            i=$((i+1))
+        else
+            break
+        fi
+    done
+    local status
+    read status < "$file"
+    if [[ ! $status == $* ]]; then
+        [ -f "$file" ] && echo $* > "$file"
+    fi
+}
+
+function dasd_settle() {
+    local dasd_status=/sys/bus/ccw/devices/$1/status
+    if [ ! -f $dasd_status ]; then
+        return 1
+    fi
+    local i=1
+    while [ $i -le 60 ] ; do
+        local status
+        read status < $dasd_status
+        case $status in
+            online|unformatted)
+                return 0 ;;
+            *)
+                sleep 0.1
+                i=$((i+1)) ;;
+        esac
+    done
+    return 1
+}
+
+function dasd_settle_all() {
+    for dasdccw in $(while read line; do echo ${line%%(*}; done < /proc/dasd/devices) ; do
+        if ! dasd_settle $dasdccw ; then
+            echo $"Could not access DASD $dasdccw in time"
+            return 1
+        fi
+    done
+    return 0
+}
+
+# prints a canonocalized device bus ID for a given devno of any format
+function canonicalize_devno()
+{
+    case ${#1} in
+        3) echo "0.0.0${1}" ;;
+        4) echo "0.0.${1}" ;;
+        *) echo "${1}" ;;
+    esac
+    return 0
+}
+
+# read file from CMS and write it to /tmp
+function readcmsfile() # $1=dasdport $2=filename
+{
+    local dev
+    local numcpus
+    local devname
+    local ret=0
+    if [ $# -ne 2 ]; then return; fi
+    # precondition: udevd created dasda block device node
+    if ! dasd_cio_free -d $1 ; then
+        echo $"DASD $1 could not be cleared from device blacklist"
+        return 1
+    fi
+
+    modprobe dasd_mod dasd=$CMSDASD
+    modprobe dasd_eckd_mod
+    udevadm settle
+
+    # precondition: dasd_eckd_mod driver incl. dependencies loaded,
+    #               dasd_mod must be loaded without setting any DASD online
+    dev=$(canonicalize_devno $1)
+    numcpus=$(
+	while read line; do
+	    if strstr "$line" "# processors"; then
+		echo ${line##*:};
+		break;
+	    fi;
+	done < /proc/cpuinfo
+    )
+
+    if [ ${numcpus} -eq 1 ]; then
+        echo 1 > /sys/bus/ccw/devices/$dev/online
+    else
+        if ! sysecho /sys/bus/ccw/devices/$dev/online 1; then
+            echo $"DASD $dev could not be set online"
+            return 1
+        fi
+        udevadm settle
+        if ! dasd_settle $dev ; then
+            echo $"Could not access DASD $dev in time"
+            return 1
+        fi
+    fi
+
+    udevadm settle
+
+    devname=$(cd /sys/bus/ccw/devices/$dev/block; set -- *; [ -b /dev/$1 ] && echo $1)
+    devname=${devname:-dasda}
+
+    [[ -d /mnt ]] || mkdir /mnt
+    if cmsfs-fuse --to=UTF-8 -a /dev/$devname /mnt; then
+	cat /mnt/$2 > /run/initramfs/$2
+        umount /mnt || umount -l /mnt
+        udevadm settle
+    else
+        echo $"Could not read conf file $2 on CMS DASD $1."
+        ret=1
+    fi
+
+    if ! sysecho /sys/bus/ccw/devices/$dev/online 0; then
+        echo $"DASD $dev could not be set offline again"
+        #return 1
+    fi
+    udevadm settle
+
+    # unbind all dasds to unload the dasd modules for a clean start
+    ( cd /sys/bus/ccw/drivers/dasd-eckd; for i in *.*; do echo $i > unbind;done)
+    udevadm settle
+    modprobe -r dasd_eckd_mod
+    udevadm settle
+    modprobe -r dasd_diag_mod
+    udevadm settle
+    modprobe -r dasd_mod
+    udevadm settle
+    return $ret
+}
+
+processcmsfile()
+{
+    source /tmp/cms.conf
+
+    if [[ $NETTYPE ]]; then
+	(
+	    echo -n $NETTYPE,$SUBCHANNELS
+	    [[ $PORTNAME ]] && echo ",portname=$PORTNAME"
+	    [[ $LAYER2 ]] && echo ",layer2=$LAYER"
+	    [[ "$NETTYPE" = "ctc" ]] && [[ $CTCPROT ]] && echo ",protocol=$CTCPROT"
+	    echo
+	) >> /etc/ccw.conf
+
+	OLDIFS=$IFS
+	IFS=,
+	read -a subch_array <<< "indexzero,$SUBCHANNELS"
+	IFS=$OLDIFS
+	devbusid=${subch_array[1]}
+        if [ "$NETTYPE" = "ctc" ]; then
+            driver="ctcm"
+        else
+            driver=$NETTYPE
+        fi
+
+	printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="%s", KERNELS=="%s", ENV{INTERFACE}=="?*", RUN+="/sbin/initqueue --onetime --unique --name cmsifup-$env{INTERFACE} /sbin/cmsifup $env{INTERFACE}"\n' "$driver" "$devbusid" > /etc/udev/rules.d/99-cms.rules
+	[[ -f /etc/udev/rules.d/60-net.rules ]] \
+	    || printf 'SUBSYSTEM=="net", ACTION=="online", RUN+="/sbin/initqueue --onetime --env netif=$env{INTERFACE} source_hook initqueue/online"\n' >> /etc/udev/rules.d/99-cms.rules
+
+	znet_cio_free
+    fi
+
+    if [[ $DASD ]]; then
+	echo $DASD | normalize_dasd_arg > /etc/dasd.conf
+	echo "options dasd_mod dasd=$DASD" > /etc/modprobe.d/dasd_mod.conf
+	dasd_cio_free
+    fi
+
+    unset _do_zfcp
+    for i in ${!FCP_*}; do
+	echo "${!i}" >> /etc/zfcp.conf
+	_do_zfcp=1
+    done
+    [[ $_do_zfcp ]] && zfcp_cio_free
+    unset _do_zfcp
+}
+
+[[ $CMSDASD ]] || CMSDASD=$(getarg "CMSDASD=")
+[[ $CMSCONFFILE ]] || CMSCONFFILE=$(getarg "CMSCONFFILE=")
+
+# Parse configuration
+if [ -n "$CMSDASD" -a -n "$CMSCONFFILE" ]; then
+    if readcmsfile $CMSDASD $CMSCONFFILE; then
+        ln -s /run/initramfs/$CMSCONFFILE /tmp/$CMSCONFFILE
+        ln -s /run/initramfs/$CMSCONFFILE /tmp/cms.conf
+        processcmsfile
+    fi
+fi
--- a/modules.d/80cms/module-setup.sh
+++ b/modules.d/80cms/module-setup.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    arch=$(uname -m)
+    [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1
+    return 255
+}
+
+depends() {
+    arch=$(uname -m)
+    [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1
+    echo znet zfcp dasd dasd_mod
+    return 0
+}
+
+installkernel() {
+    instmods zfcp
+}
+
+install() {
+    inst_hook pre-trigger 30 "$moddir/cmssetup.sh"
+    inst_hook pre-pivot 95 "$moddir/cms-write-ifcfg.sh"
+    inst "$moddir/cmsifup.sh" /sbin/cmsifup
+    inst /etc/cmsfs-fuse/filetypes.conf
+    inst /etc/udev/rules.d/99-fuse.rules
+    inst /etc/fuse.conf
+
+    for file in $(rpm -ql s390utils-base); do
+	[[ -f $file ]] && inst $file
+    done
+
+    inst_libdir_file "gconv/*"
+#inst /usr/lib/locale/locale-archive
+
+    dracut_install cmsfs-fuse fusermount ulockmgr_server bash tr insmod rmmod cat normalize_dasd_arg
+}
--- a/modules.d/90crypt/cryptroot-ask.sh
+++ b/modules.d/90crypt/cryptroot-ask.sh
@@ -32,9 +32,12 @@ else
    device="$1"
 fi

+# number of tries
+numtries=${3:-10}
+
 # TODO: improve to support what cmdline does
 if [ -f /etc/crypttab ] && getargbool 1 rd.luks.crypttab -n rd_NO_CRYPTTAB; then
-    while read name dev luksfile rest; do
+    while read name dev luksfile luksoptions; do
        # ignore blank lines and comments
        if [ -z "$name" -o "${name#\#}" != "$name" ]; then
            continue
@@ -57,17 +60,59 @@ if [ -f /etc/crypttab ] && getargbool 1 rd.luks.crypttab -n rd_NO_CRYPTTAB; then
            fi
        fi
    done < /etc/crypttab
-    unset name dev rest
+    unset name dev
 fi

 #
 # Open LUKS device
 #

-info "luksOpen $device $luksname $luksfile"
+info "luksOpen $device $luksname $luksfile $luksoptions"
+
+OLD_IFS="$IFS"
+IFS=,
+set -- $luksoptions
+IFS="$OLD_IFS"
+
+while [ $# -gt 0 ]; do
+    case $1 in
+        noauto)
+            # skip this
+            exit 0
+            ;;
+        swap)
+            # skip this
+            exit 0
+            ;;
+        tmp)
+            # skip this
+            exit 0
+            ;;
+        allow-discards)
+            allowdiscards="--allow-discards"
+    esac
+    shift
+done
+
+# parse for allow-discards
+if strstr "$(cryptsetup --help)" "allow-discards"; then
+    if discarduuids=$(getargs "rd.luks.allow-discards"); then
+        if strstr " $discarduuids " " ${luksdev##luks-}"; then
+            allowdiscards="--allow-discards"
+        fi
+    elif getargbool rd.luks.allow-discards; then
+        allowdiscards="--allow-discards"
+    fi
+fi
+
+if strstr "$(cryptsetup --help)" "allow-discards"; then
+    cryptsetupopts="$cryptsetupopts $allowdiscards"
+fi
+
+unset allowdiscards

 if [ -n "$luksfile" -a "$luksfile" != "none" -a -e "$luksfile" ]; then
-    if cryptsetup --key-file "$luksfile" luksOpen "$device" "$luksname"; then
+    if cryptsetup --key-file "$luksfile" $cryptsetupopts luksOpen "$device" "$luksname"; then
        ask_passphrase=0
    fi
 else
@@ -76,26 +121,22 @@ else
            keydev="${tmp%%:*}"
            keypath="${tmp#*:}"
        else
-            if [ $# -eq 3 ]; then
-                if [ $3 -eq 0 ]; then
-                    info "No key found for $device.  Fallback to passphrase mode."
-                    break
-                fi
-                info "No key found for $device.  Will try $3 time(s) more later."
-                set -- "$1" "$2" "$(($3 - 1))"
-            else
-                info "No key found for $device.  Will try later."
+            if [ $numtries -eq 0 ]; then
+                warn "No key found for $device.  Fallback to passphrase mode."
+                break
            fi
+            sleep 1
+            info "No key found for $device.  Will try $numtries time(s) more later."
            initqueue --unique --onetime --settled \
                --name cryptroot-ask-$luksname \
-                $(command -v cryptroot-ask) "$@"
+                $(command -v cryptroot-ask) "$device" "$luksname" "$(($numtries-1))"
            exit 0
        fi
        unset tmp

        info "Using '$keypath' on '$keydev'"
        readkey "$keypath" "$keydev" "$device" \
-            | cryptsetup -d - luksOpen "$device" "$luksname"
+            | cryptsetup -d - $cryptsetupopts luksOpen "$device" "$luksname"
        unset keypath keydev
        ask_passphrase=0
        break
@@ -103,7 +144,7 @@ else
 fi

 if [ $ask_passphrase -ne 0 ]; then
-    luks_open="$(command -v cryptsetup) luksOpen"
+    luks_open="$(command -v cryptsetup) $cryptsetupopts luksOpen"
    ask_for_password --ply-tries 5 \
        --ply-cmd "$luks_open -T1 $device $luksname" \
        --ply-prompt "Password ($device)" \
--- a/modules.d/90crypt/module-setup.sh
+++ b/modules.d/90crypt/module-setup.sh
@@ -11,7 +11,7 @@ check() {

    check_crypt() {
        local dev=$1 fs=$2
-        [[ $fs = "crypto_LUKS" ]] || continue
+        [[ $fs = "crypto_LUKS" ]] || return 1
        ID_FS_UUID=$(udevadm info --query=property --name=$dev \
            | while read line; do
                [[ ${line#ID_FS_UUID} = $line ]] && continue
@@ -19,13 +19,15 @@ check() {
                echo $ID_FS_UUID
                break
                done)
-        [[ ${ID_FS_UUID} ]] || continue
-        echo " rd.luks.uuid=luks-${ID_FS_UUID} " >> "${initdir}/etc/cmdline.d/90crypt.conf"
+        [[ ${ID_FS_UUID} ]] || return 1
+        if ! [[ $kernel_only ]]; then
+            echo " rd.luks.uuid=luks-${ID_FS_UUID} " >> "${initdir}/etc/cmdline.d/90crypt.conf"
+        fi
+        return 0
    }

    [[ $hostonly ]] || [[ $mount_needs ]] && {
-        for_each_host_dev_fs check_crypt
-        [ -f "${initdir}/etc/cmdline.d/90crypt.conf" ] || return 1
+        for_each_host_dev_fs check_crypt || return 1
    }

    return 0
@@ -46,7 +48,7 @@ install() {
    inst "$moddir"/probe-keydev.sh /sbin/probe-keydev
    inst_hook cmdline 10 "$moddir/parse-keydev.sh"
    inst_hook cmdline 30 "$moddir/parse-crypt.sh"
-    inst_hook pre-pivot 30 "$moddir/crypt-cleanup.sh"
+    inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
    inst_simple /etc/crypttab
    inst "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
 }
--- a/modules.d/90crypt/parse-crypt.sh
+++ b/modules.d/90crypt/parse-crypt.sh
@@ -24,21 +24,10 @@ else
                printf -- '$env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $tout
            } >> /etc/udev/rules.d/70-luks.rules.new

-
-            [ -e $hookdir/initqueue/finished/90-crypt.sh ] || \
-            {
-                printf -- 'UUIDS=:\n'
-                printf -- 'for dm in /dev/dm-*; do\n'
-                printf -- '[ -e "$dm" ] || exit 1\n'
-                printf -- 'dmid=`/sbin/dmsetup info -c -o uuid --noheadings "$dm"`\n'
-                printf -- 'uuid=${dmid#CRYPT-LUKS*-}\n'
-                printf -- '[ "x$uuid" = "x$dmid" ] && continue\n'
-                printf -- 'UUIDS="${UUIDS}${uuid%%%%-*}:"\n'
-                printf -- 'done\n'
-            } > $hookdir/initqueue/finished/90-crypt.sh
            uuid=$luksid
            while [ "$uuid" != "${uuid#*-}" ]; do uuid=${uuid%%-*}${uuid#*-}; done
-            printf -- '[ "x${UUIDS#*:%s*:}" != "x$UUIDS" ] || exit 1\n' $uuid >> $hookdir/initqueue/finished/90-crypt.sh
+            printf -- '[ -e /dev/disk/by-id/dm-uuid-CRYPT-LUKS?-*%s*-* ] || exit 1\n' $uuid \
+                >> $hookdir/initqueue/finished/90-crypt.sh

            {
                printf -- '[ -e /dev/disk/by-uuid/*%s* ] || ' $luksid
--- a/modules.d/90dm/module-setup.sh
+++ b/modules.d/90dm/module-setup.sh
@@ -22,9 +22,7 @@ install() {

    type -P dmeventd >/dev/null && dracut_install dmeventd

-    for _i in {"$libdir","$usrlibdir"}/libdevmapper-event.so*; do
-        [ -e "$_i" ] && dracut_install "$_i"
-    done
+    inst_libdir_file "libdevmapper-event.so*"

    inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules
    # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
--- a/modules.d/90dmraid/module-setup.sh
+++ b/modules.d/90dmraid/module-setup.sh
@@ -13,8 +13,7 @@ check() {

    check_dmraid() {
        local dev=$1 fs=$2 holder DEVPATH DM_NAME
-        [[ "$fs" = "linux_raid_member" ]] && continue
-        [[ "$fs" = "${fs%%_raid_member}" ]] && continue
+        [[ "$fs" = "${fs%%_raid_member}" ]] && return 1

        DEVPATH=$(udevadm info --query=property --name=$dev \
            | while read line; do
@@ -34,13 +33,15 @@ check() {
                    done)
        done

-        [[ ${DM_NAME} ]] || continue
-        echo " rd.dm.uuid=${DM_NAME} " >> "${initdir}/etc/cmdline.d/90dmraid.conf"
+        [[ ${DM_NAME} ]] || return 1
+        if ! [[ $kernel_only ]]; then
+            echo " rd.dm.uuid=${DM_NAME} " >> "${initdir}/etc/cmdline.d/90dmraid.conf"
+        fi
+        return 0
    }

    [[ $hostonly ]] || [[ $mount_needs ]] && {
-        for_each_host_dev_fs check_dmraid
-        [ -f "${initdir}/etc/cmdline.d/90dmraid.conf" ] || return 1
+        for_each_host_dev_fs check_dmraid || return 1
    }

    return 0
@@ -57,13 +58,9 @@ install() {

    inst "$moddir/dmraid.sh" /sbin/dmraid_scan

-    if [ ! -x /lib/udev/vol_id ]; then
-        inst_rules 64-md-raid.rules
-    fi
+    inst_rules 64-md-raid.rules

-    for _i in {"$libdir","$usrlibdir"}/libdmraid-events*.so*; do
-        [ -e "$_i" ] && dracut_install "$_i"
-    done
+    inst_libdir_file "libdmraid-events*.so*"

    inst_rules "$moddir/61-dmraid-imsm.rules"
    #inst "$moddir/dmraid-cleanup.sh" /sbin/dmraid-cleanup
--- a/modules.d/90dmsquash-live/apply-live-updates.sh
+++ b/modules.d/90dmsquash-live/apply-live-updates.sh
@@ -1,9 +1,15 @@
 #!/bin/sh
-if [ -b /dev/mapper/live-rw ]; then
-    if [ -d /updates ]; then
-        echo "Applying updates to live image..."
+
+if [ -b /dev/mapper/live-rw ] && [ -d /updates ]; then
+    info "Applying updates to live image..."
+    # avoid overwriting symlinks (e.g. /lib -> /usr/lib) with directories
+    (
        cd /updates
-        /bin/cp -a -t $NEWROOT .
-        cd -
-    fi
+        find . -depth -type d | while read dir; do
+            [ -d "$NEWROOT/$dir" ] || mkdir -p "$NEWROOT/$dir"
+        done
+        find . -depth \! -type d | while read file; do
+            cp -a "$file" "$NEWROOT/$file"
+        done
+    )
 fi
--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
@@ -5,8 +5,6 @@
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 type det_fs >/dev/null 2>&1 || . /lib/fs-lib.sh

-[ -f /tmp/root.info ] && . /tmp/root.info
-
 PATH=/usr/sbin:/usr/bin:/sbin:/bin

 if getargbool 0 rd.live.debug -y rdlivedebug; then
@@ -35,7 +33,7 @@ fi
 getarg rd.live.check check || check=""
 if [ -n "$check" ]; then
    [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
-    checkisomd5 --verbose $livedev || :
+    checkisomd5 --verbose $livedev
    if [ $? -ne 0 ]; then
        die "CD check failed!"
        exit 1
@@ -43,6 +41,8 @@ if [ -n "$check" ]; then
    [ -x /bin/plymouth ] && /bin/plymouth --show-splash
 fi

+ln -s $livedev /run/initramfs/livedev
+
 # determine filesystem type for a filesystem image
 det_img_fs() {
    blkid -s TYPE -u noraid -o value "$1"
@@ -204,7 +204,7 @@ if [ -b "$BASE_LOOPDEV" ]; then
    ln -s $BASE_LOOPDEV /run/initramfs/live-baseloop
 fi
 ln -s /dev/mapper/live-rw /dev/root
-printf '/bin/mount %s /dev/mapper/live-rw %s\n' "$ROOTFLAGS" "$NEWROOT" > $hookdir/mount/01-$$-live.sh
+printf 'mount %s /dev/mapper/live-rw %s\n' "$ROOTFLAGS" "$NEWROOT" > $hookdir/mount/01-$$-live.sh

 need_shutdown

--- a/modules.d/90dmsquash-live/module-setup.sh
+++ b/modules.d/90dmsquash-live/module-setup.sh
@@ -35,7 +35,7 @@ install() {
    inst_hook pre-udev 30 "$moddir/dmsquash-live-genrules.sh"
    inst_hook pre-udev 30 "$moddir/dmsquash-liveiso-genrules.sh"
    inst_hook pre-pivot 20 "$moddir/apply-live-updates.sh"
-    inst "$moddir/dmsquash-live-root" "/sbin/dmsquash-live-root"
+    inst "$moddir/dmsquash-live-root.sh" "/sbin/dmsquash-live-root"
    # should probably just be generally included
    inst_rules 60-cdrom_id.rules
 }
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -35,8 +35,11 @@ installkernel() {
        hostonly='' instmods pcmcia firewire-ohci
        hostonly='' instmods usb_storage sdhci sdhci-pci

+        # arm specific modules
+        hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap sdhci_dove ahci_platform pata_imx sata_mv
+
        # install keyboard support
-        hostonly='' instmods atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech hid-logitech-dj hid-microsoft ehci-hcd ohci-hcd uhci-hcd
+        hostonly='' instmods atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech hid-logitech-dj hid-microsoft ehci-hcd ohci-hcd uhci-hcd xhci-hcd
        # install unix socket support
        hostonly='' instmods unix
        instmods "=drivers/pcmcia" =ide "=drivers/usb/storage"
@@ -45,7 +48,7 @@ installkernel() {
        # if the required list is not set via the filesystems variable
        if ! [[ $hostonly ]]; then
            if [[ -z $filesystems ]]; then
-                instmods '=fs'
+                omit_drivers="$omit_drivers|kernel/fs/nfs|kernel/fs/nfsd|kernel/fs/lockd" omit_drivers="${omit_drivers##|}" instmods '=fs'
            fi
        else
            inst_fs() {
@@ -58,21 +61,12 @@ installkernel() {
        hostonly='' instmods $drivers
    fi

-    [[ $add_drivers ]] && hostonly='' instmods $add_drivers
-    [[ $filesystems ]] && hostonly='' instmods $filesystems
-
-    # force install of scsi_wait_scan
-    hostonly='' instmods scsi_wait_scan
-}
-
-install() {
-    local _f i
-    [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf
-    for i in $(find -L /etc/modprobe.d/ -maxdepth 1 -type f -name '*.conf'); do
-        inst_simple "$i"
-    done
-    inst_hook cmdline 01 "$moddir/parse-kernel.sh"
-    inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
+    if [[ $add_drivers ]]; then
+        hostonly='' instmods -c $add_drivers || return 1
+    fi
+    if [[ $filesystems ]]; then
+        hostonly='' instmods -c $filesystems || return 1
+    fi

    for _f in modules.builtin.bin modules.builtin; do
        [[ $srcmods/$_f ]] && break
@@ -84,4 +78,15 @@ install() {
    for _f in modules.builtin.bin modules.builtin modules.order; do
        [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
    done
+
+}
+
+install() {
+    local _f i
+    [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf
+    for i in $(find -L /etc/modprobe.d/ -maxdepth 1 -type f -name '*.conf'); do
+        inst_simple "$i"
+    done
+    inst_hook cmdline 01 "$moddir/parse-kernel.sh"
+    inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
 }
--- a/modules.d/90livenet/fetch-liveupdate.sh
+++ b/modules.d/90livenet/fetch-liveupdate.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+# fetch-liveupdate - fetch an update image for dmsquash-live media.
+# this gets called by the "initqueue/online" hook for each network interface
+# that comes online.
+
+# no updates requested? we're not needed.
+[ -e /tmp/liveupdates.info ] || return 0
+
+command -v getarg >/dev/null || . /lib/dracut-lib.sh
+command -v fetch_url >/dev/null || . /lib/url-lib.sh
+command -v unpack_img >/dev/null || . /lib/img-lib.sh
+
+read url < /tmp/liveupdates.info
+
+info "fetching live updates from $url"
+
+fetch_url "$url" /tmp/updates.img
+if [ $? != 0 ]; then
+    warn "failed to fetch update image!"
+    warn "url: $url"
+    return 1
+fi
+
+unpack_img /tmp/updates.img /updates.tmp.$$
+if [ $? != 0 ]; then
+    warn "failed to unpack update image!"
+    warn "url: $url"
+    return 1
+fi
+copytree /updates.tmp.$$ /updates
+mv /tmp/liveupdates.info /tmp/liveupdates.done
--- a/modules.d/90livenet/livenetroot.sh
+++ b/modules.d/90livenet/livenetroot.sh
@@ -2,7 +2,6 @@
 # livenetroot - fetch a live image from the network and run it

 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-[ -f /tmp/root.info ] && . /tmp/root.info

 . /lib/url-lib.sh

--- a/modules.d/90livenet/module-setup.sh
+++ b/modules.d/90livenet/module-setup.sh
@@ -12,6 +12,7 @@ depends() {

 install() {
    inst_hook cmdline 29 "$moddir/parse-livenet.sh"
-    inst "$moddir/livenetroot" "/sbin/livenetroot"
+    inst_hook initqueue/online 95 "$moddir/fetch-liveupdate.sh"
+    inst "$moddir/livenetroot.sh" "/sbin/livenetroot"
 }

--- a/modules.d/90livenet/parse-livenet.sh
+++ b/modules.d/90livenet/parse-livenet.sh
@@ -1,10 +1,23 @@
-#!/bin/bash
+#!/bin/sh
 # live net images - just like live images, but specified like:
 # root=live:[url-to-backing-file]

 [ -z "$root" ] && root=$(getarg root=)
 . /lib/url-lib.sh

+# live updates
+updates=$(getarg live.updates=)
+if [ -n "$updates" ]; then
+    # make sure network comes up even if we're doing a local live device
+    if [ -z "$netroot" ]; then
+	echo > /tmp/net.ifaces
+	unset CMDLINE
+    fi
+    echo "$updates" > /tmp/liveupdates.info
+    echo '[ -e /tmp/liveupdates.done ]' > \
+        $hookdir/initqueue/finished/liveupdates.sh
+fi
+
 str_starts "$root" "live:" && liveurl="$root"
 str_starts "$liveurl" "live:" || return
 liveurl="${liveurl#live:}"
@@ -15,8 +28,7 @@ if get_url_handler "$liveurl" >/dev/null; then
    netroot="livenet:$liveurl"
    root="livenet" # quiet complaints from init
    rootok=1
+    wait_for_dev /dev/root
 else
    info "livenet: no url handler for $liveurl"
 fi
-
-wait_for_dev /dev/root
--- a/modules.d/90lvm/lvm_scan.sh
+++ b/modules.d/90lvm/lvm_scan.sh
@@ -35,10 +35,12 @@ if [ ! -e /etc/lvm/lvm.conf ]; then
        if [ -n $SNAPSHOT ]; then
            echo 'global {';
            echo '    locking_type = 1';
+            echo '    use_lvmetad = 0';
            echo '}';
        else
            echo 'global {';
            echo '    locking_type = 4';
+            echo '    use_lvmetad = 0';
            echo '}';
        fi
    } > /etc/lvm/lvm.conf
--- a/modules.d/90lvm/module-setup.sh
+++ b/modules.d/90lvm/module-setup.sh
@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh

 check() {
-    local _rootdev
+    local _rootdev _activated
    # No point trying to support lvm if the binaries are missing
    type -P lvm >/dev/null || return 1

@@ -11,16 +11,21 @@ check() {
    [[ $debug ]] && set -x

    check_lvm() {
-        unset DM_VG_NAME
-        unset DM_LV_NAME
-        eval $(udevadm info --query=property --name=$1|egrep '(DM_VG_NAME|DM_LV_NAME)=')
-        [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return
-        echo " rd.lvm.lv=${DM_VG_NAME}/${DM_LV_NAME} " >> "${initdir}/etc/cmdline.d/90lvm.conf"
+        local DM_VG_NAME DM_LV_NAME DM_UDEV_DISABLE_DISK_RULES_FLAG
+        eval $(udevadm info --query=property --name=$1|egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')
+        [[ "$DM_UDEV_DISABLE_DISK_RULES_FLAG" = "1" ]] && return 1
+        [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
+        if ! strstr " ${_activated[*]} " " ${DM_VG_NAME}/${DM_LV_NAME} "; then
+            if ! [[ $kernel_only ]]; then
+                echo " rd.lvm.lv=${DM_VG_NAME}/${DM_LV_NAME} " >> "${initdir}/etc/cmdline.d/90lvm.conf"
+            fi
+            push _activated "${DM_VG_NAME}/${DM_LV_NAME}"
+        fi
+        return 0
    }

    [[ $hostonly ]] || [[ $mount_needs ]] && {
-        for_each_host_dev_fs check_lvm
-        [ -f "${initdir}/etc/cmdline.d/90lvm.conf" ] || return 1
+        for_each_host_dev_fs check_lvm || return 1
    }

    return 0
@@ -44,6 +49,7 @@ install() {
            # FIXME: near-term hack to establish read-only locking;
            # use command-line lvm.conf editor once it is available
            sed -i -e 's/\(^[[:space:]]*\)locking_type[[:space:]]*=[[:space:]]*[[:digit:]]/\1locking_type = 4/' ${initdir}/etc/lvm/lvm.conf
+            sed -i -e 's/\(^[[:space:]]*\)use_lvmetad[[:space:]]*=[[:space:]]*[[:digit:]]/\1use_lvmetad = 0/' ${initdir}/etc/lvm/lvm.conf
        fi
    fi

@@ -55,8 +61,6 @@ install() {
    inst "$moddir/lvm_scan.sh" /sbin/lvm_scan
    inst_hook cmdline 30 "$moddir/parse-lvm.sh"

-    for _i in {"$libdir","$usrlibdir"}/libdevmapper-event-lvm*.so; do
-        [ -e "$_i" ] && dracut_install "$_i"
-    done
+    inst_libdir_file "libdevmapper-event-lvm*.so"
 }

--- a/modules.d/90mdraid/module-setup.sh
+++ b/modules.d/90mdraid/module-setup.sh
@@ -12,35 +12,25 @@ check() {

    check_mdraid() {
        local dev=$1 fs=$2 holder DEVPATH MD_UUID
-        [[ "$fs" = "linux_raid_member" ]] && continue
-        [[ "$fs" = "${fs%%_raid_member}" ]] && continue
+        [[ "$fs" = "${fs%%_raid_member}" ]] && return 1

-        DEVPATH=$(udevadm info --query=property --name=$dev \
+        MD_UUID=$(/sbin/mdadm --examine --export $dev \
            | while read line; do
-                [[ ${line#DEVPATH} = $line ]] && continue
+                [[ ${line#MD_UUID} = $line ]] && continue
                eval "$line"
-                echo $DEVPATH
+                echo $MD_UUID
                break
                done)

-        for holder in /sys/$DEVPATH/holders/*; do
-            [[ -e $holder ]] || continue
-            MD_UUID=$(udevadm info --query=property --path=$holder \
-                | while read line; do
-                    [[ ${line#MD_UUID} = $line ]] && continue
-                    eval "$line"
-                    echo $MD_UUID
-                    break
-                    done)
-        done
-
-        [[ ${MD_UUID} ]] || continue
-        echo " rd.md.uuid=${MD_UUID} " >> "${initdir}/etc/cmdline.d/90mdraid.conf"
+        [[ ${MD_UUID} ]] || return 1
+        if ! [[ $kernel_only ]]; then
+            echo " rd.md.uuid=${MD_UUID} " >> "${initdir}/etc/cmdline.d/90mdraid.conf"
+        fi
+        return 0
    }

    [[ $hostonly ]] || [[ $mount_needs ]] && {
-        for_each_host_dev_fs check_mdraid
-        [[ -f "${initdir}/etc/cmdline.d/90mdraid.conf" ]] || return 1
+        for_each_host_dev_fs check_mdraid || return 1
    }

    return 0
@@ -67,14 +57,12 @@ install() {
     # inst /etc/passwd
     # inst /etc/group

-    if [ ! -x /lib/udev/vol_id ]; then
-        inst_rules 64-md-raid.rules
-        # remove incremental assembly from stock rules, so they don't shadow
-        # 65-md-inc*.rules and its fine-grained controls, or cause other problems
-        # when we explicitly don't want certain components to be incrementally
-        # assembled
-        sed -i -r -e '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode)"/d' "${initdir}/lib/udev/rules.d/64-md-raid.rules"
-    fi
+     inst_rules 64-md-raid.rules
+     # remove incremental assembly from stock rules, so they don't shadow
+     # 65-md-inc*.rules and its fine-grained controls, or cause other problems
+     # when we explicitly don't want certain components to be incrementally
+     # assembled
+     sed -i -r -e '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode)"/d' "${initdir}${udevdir}/rules.d/64-md-raid.rules"

    inst_rules "$moddir/65-md-incremental-imsm.rules"

--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -11,18 +11,16 @@ check() {
    [[ $debug ]] && set -x

    is_mpath() {
-        [ -e /sys/dev/block/$1/dm/uuid ] || return 1
-        [[ $(cat /sys/dev/block/$1/dm/uuid) =~ ^mpath- ]] && return 0
+        local _dev
+        _dev=$(get_maj_min $1)
+        [ -e /sys/dev/block/$_dev/dm/uuid ] || return 1
+        [[ $(cat /sys/dev/block/$_dev/dm/uuid) =~ ^mpath- ]] && return 0
        return 1
    }

-    if [[ $hostonly ]]; then
-        _rootdev=$(find_root_block_device)
-        if [[ $_rootdev ]]; then
-            check_block_and_slaves is_mpath "$_rootdev" && return 0
-        fi
-        return 1
-    fi
+    [[ $hostonly ]] || [[ $mount_needs ]] && {
+        for_each_host_dev_fs is_mpath || return 1
+    }

    return 0
 }
@@ -33,6 +31,7 @@ depends() {
 }

 installkernel() {
+    local _ret
    set +x
    mp_mod_filter() {
        local _mpfuncs='scsi_register_device_handler|dm_dirty_log_type_register|dm_register_path_selector|dm_register_target'
@@ -47,7 +46,9 @@ installkernel() {

    ( find_kernel_modules_by_path drivers/scsi; find_kernel_modules_by_path drivers/s390/scsi ;
      find_kernel_modules_by_path drivers/md )  |  mp_mod_filter  |  instmods
+    _ret=$?
    [[ $debug ]] && set -x
+    return $_ret
 }

 install() {
@@ -62,13 +63,15 @@ install() {
        /sbin/xdrgetprio \
        /etc/xdrdevices.conf \
        /etc/multipath.conf \
-        /etc/multipath/* \
-        "$libdir"/libmultipath* "$libdir"/multipath/*; do
+        /etc/multipath/*; do
        [ -e "$_f" ] && inst "$_f"
    done

+    inst_libdir_file "libmultipath*"
+    inst_libdir_file "multipath/*"
+
    inst_hook pre-trigger 02 "$moddir/multipathd.sh"
-    inst_hook pre-pivot   02 "$moddir/multipathd-stop.sh"
+    inst_hook cleanup   02 "$moddir/multipathd-stop.sh"
    inst_rules 40-multipath.rules
 }

--- a/modules.d/95dasd/module-setup.sh
+++ b/modules.d/95dasd/module-setup.sh
@@ -18,7 +18,7 @@ installkernel() {

 install() {
    inst_hook cmdline 30 "$moddir/parse-dasd.sh"
-    dracut_install tr dasdinfo dasdconf.sh
+    dracut_install tr dasdinfo dasdconf.sh normalize_dasd_arg
    if [[ $hostonly ]]; then
        inst /etc/dasd.conf
    fi
--- a/modules.d/95dasd/parse-dasd.sh
+++ b/modules.d/95dasd/parse-dasd.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-for dasd_arg in $(getargs rd.dasd 'rd_DASD='); do
+for dasd_arg in $(getargs rd.dasd= rd_DASD= DASD=); do
    (
        IFS=","
        set $dasd_arg
-        echo "$@" >> /etc/dasd.conf
+        echo "$@" | normalize_dasd_arg >> /etc/dasd.conf
    )
 done
--- a/modules.d/95dasd_mod/parse-dasd-mod.sh
+++ b/modules.d/95dasd_mod/parse-dasd-mod.sh
@@ -1,12 +1,52 @@
 #!/bin/sh
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-[ -d /etc/modprobe.d ] || mkdir -m 0755 -p /etc/modprobe.d
+mod_args=""

-dasd_arg=$(getarg rd.dasd_mod.dasd rd_DASD_MOD=)
-if [ -n "$dasd_arg" ]; then
-    echo "options dasd_mod dasd=$dasd_arg" >> /etc/modprobe.d/dasd_mod.conf
+convert_dasd_param() {
+    local bus_id params
+    params=""
+    bus_id=$1; shift
+    while [ $# -gt 0 ]; do
+        case "$1" in
+            use_diag\=1)
+                params="$params,diag"
+                ;;
+            readonly\=1)
+                params="$params,ro"
+                ;;
+            erplog\=1)
+                params="$params,erplog"
+                ;;
+            failfast\=1)
+                params="$params,failfast"
+                ;;
+        esac
+        shift
+    done
+    params="${params#*,}"
+    if [ -n "$params" ]; then
+        echo "$bus_id($params)"
+    else
+        echo "$bus_id"
+    fi
+}
+
+for dasd_arg in $(getargs rd.dasd= rd_DASD= DASD=); do
+    OLD_IFS=$IFS
+    IFS=","
+    set -- $dasd_arg
+    IFS=$OLD_IFS
+    dasd_arg=$(convert_dasd_param "$@")
+    mod_args="$mod_args,$dasd_arg"
+done
+
+mod_args="${mod_args#*,}"
+
+if [ -n "$mod_args" ]; then
+    [ -d /etc/modprobe.d ] || mkdir -m 0755 -p /etc/modprobe.d
+    echo "options dasd_mod dasd=$mod_args" >> /etc/modprobe.d/dasd_mod.conf
 fi
-unset dasd_arg

+unset dasd_arg
 dasd_cio_free
--- a/modules.d/95fcoe/fcoe-up.sh
+++ b/modules.d/95fcoe/fcoe-up.sh
--- a/modules.d/95fcoe/module-setup.sh
+++ b/modules.d/95fcoe/module-setup.sh
@@ -29,7 +29,7 @@ install() {

    mkdir -m 0755 -p "$initdir/var/lib/lldpad"

-    inst "$moddir/fcoe-up" "/sbin/fcoe-up"
+    inst "$moddir/fcoe-up.sh" "/sbin/fcoe-up"
    inst "$moddir/fcoe-edd.sh" "/sbin/fcoe-edd"
    inst "$moddir/fcoe-genrules.sh" "/sbin/fcoe-genrules.sh"
    inst_hook cmdline 99 "$moddir/parse-fcoe.sh"
--- a/modules.d/95fstab-sys/module-setup.sh
+++ b/modules.d/95fstab-sys/module-setup.sh
@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh

 check() {
-    test -f /etc/fstab.sys || [[ -n $use_fstab  ||  -n $fstab_lines ]]
+    test -f /etc/fstab.sys || [[ -n $add_fstab  ||  -n $fstab_lines ]]
 }

 depends() {
@@ -11,6 +11,7 @@ depends() {
 }

 install() {
-    inst /etc/fstab.sys /etc/fstab
+    [ -f /etc/fstab.sys ] && inst /etc/fstab.sys
    inst_hook pre-pivot 00 "$moddir/mount-sys.sh"
+    inst_hook cmdline 00 "$moddir/wait-mount-dev.sh"
 }
--- a/modules.d/95fstab-sys/mount-sys.sh
+++ b/modules.d/95fstab-sys/mount-sys.sh
@@ -11,25 +11,26 @@ fstab_mount() {
    info "Mounting from $1"
    while read _dev _mp _fs _opts _dump _pass _rest; do
        [ -z "${_dev%%#*}" ] && continue # Skip comment lines
-        if [[ ! "$_fs" =~ "nfs" ]] && [ ! -e "$_dev" ]; then
-            warn "Device $_dev doesn't exist, skipping mount."
-            continue
-        fi
        if [ "$_pass" -gt 0 ] && ! strstr "$_opts" _netdev; then
-            fsck_single "$_dev" "$_fs"
+            fsck_single "$_dev" "$_fs" "$_opts"
        fi
        _fs=$(det_fs "$_dev" "$_fs")
        info "Mounting $_dev"
-        if [[ -d $NEWROOT/$_mp ]]; then
-            mount -v -t $_fs -o $_opts $_dev $NEWROOT/$_mp 2>&1 | vinfo
+        if [ -d "$NEWROOT/$_mp" ]; then
+            mount -v -t $_fs -o $_opts $_dev "$NEWROOT/$_mp" 2>&1 | vinfo
        else
-            mkdir -p "$_mp"
+            [ -d "$_mp" ] || mkdir -p "$_mp"
            mount -v -t $_fs -o $_opts $_dev $_mp 2>&1 | vinfo
        fi
    done < $1
    return 0
 }

-for r in $NEWROOT/etc/fstab.sys /etc/fstab; do
-    fstab_mount $r && break
-done
+[ -f /etc/fstab ] && fstab_mount /etc/fstab
+
+# prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys
+if [ -f $NEWROOT/etc/fstab.sys ]; then
+    fstab_mount $NEWROOT/etc/fstab.sys
+elif [ -f /etc/fstab.sys ]; then
+    fstab_mount /etc/fstab.sys
+fi
--- a/modules.d/95fstab-sys/wait-mount-dev.sh
+++ b/modules.d/95fstab-sys/wait-mount-dev.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+type det_fs >/dev/null 2>&1 || . /lib/fs-lib.sh
+
+fstab_wait_dev() {
+    local _dev _mp _fs _opts _dump _pass _rest
+    test -e "$1" || return 1
+    while read _dev _mp _fs _opts _dump _pass _rest; do
+        [ -z "${_dev%%#*}" ] && continue # Skip comment lines
+        case "$_dev" in
+        /dev/?*)
+            wait_for_dev $_dev;;
+        *) ;;
+        esac
+    done < $1
+    return 0
+}
+
+[ -f /etc/fstab ] && fstab_wait_dev /etc/fstab
--- a/modules.d/95iscsi/iscsiroot.sh
+++ b/modules.d/95iscsi/iscsiroot.sh
@@ -9,6 +9,7 @@
 #

 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+type parse_iscsi_root >/dev/null 2>&1 || . /lib/net-lib.sh

 PATH=/usr/sbin:/usr/bin:/sbin:/bin

@@ -37,94 +38,58 @@ iroot=${iroot#iscsi:}
 # figured out a way how to check whether this is built-in or not
 modprobe crc32c 2>/dev/null

-
-[ -e /tmp/root.info ] && . /tmp/root.info
-
 [ -e /sys/module/bnx2i ] && iscsiuio

 if getargbool 0 rd.iscsi.firmware -y iscsi_firmware ; then
-    if [ -n "${root%%block:*}" ]; then
+    if [ -z "$root" -o -n "${root%%block:*}" ]; then
        # if root is not specified try to mount the whole iSCSI LUN
        printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
+        udevadm control --reload
    fi
-    iscsistart -b
+
+    for p in $(getargs rd.iscsi.param iscsi_param); do
+	iscsi_param="$iscsi_param --param $p"
+    done
+
+    iscsistart -b $iscsi_param
    exit 0
 fi

-unset iscsi_initiator iscsi_target_name iscsi_target_ip iscsi_target_port
-unset iscsi_target_group iscsi_protocol iscsirw iscsi_lun
-unset iscsi_username iscsi_password 
-unset iscsi_in_username iscsi_in_password
-
-# override conf settings by command line options
-arg=$(getargs rd.iscsi.initiator iscsi_initiator=)
-[ -n "$arg" ] && iscsi_initiator=$arg
-arg=$(getargs rd.iscsi.target.name iscsi_target_name=)
-[ -n "$arg" ] && iscsi_target_name=$arg
-arg=$(getargs rd.iscsi.target.ip iscsi_target_ip)
-[ -n "$arg" ] && iscsi_target_ip=$arg
-arg=$(getargs rd.iscsi.target.port iscsi_target_port=)
-[ -n "$arg" ] && iscsi_target_port=$arg
-arg=$(getargs rd.iscsi.target.group iscsi_target_group=)
-[ -n "$arg" ] && iscsi_target_group=$arg
-arg=$(getargs rd.iscsi.username iscsi_username=)
-[ -n "$arg" ] && iscsi_username=$arg
-arg=$(getargs rd.iscsi.password iscsi_password)
-[ -n "$arg" ] && iscsi_password=$arg
-arg=$(getargs rd.iscsi.in.username iscsi_in_username=)
-[ -n "$arg" ] && iscsi_in_username=$arg
-arg=$(getargs rd.iscsi.in.password iscsi_in_password=)
-[ -n "$arg" ] && iscsi_in_password=$arg
-
 handle_netroot()
 {
-    iroot=$1
-    # override conf/commandline options by dhcp root_path
-    # FIXME this assumes that all values have been provided
-    OLDIFS="$IFS"
-    IFS=@
-    set $iroot
-    if [ $# -gt 1 ]; then
-        authinfo=$1; shift
-        iroot=$*
-    # allow empty authinfo to allow having an @ in iscsi_target_name like this:
-    # netroot=iscsi:@192.168.1.100::3260::iqn.2009-01.com.example:testdi@sk
-        if [ -n "$authinfo" ]; then
-            IFS=:
-            set $authinfo
-            iscsi_username=$1
-            iscsi_password=$2
-            if [ $# -gt 2 ]; then
-                iscsi_in_username=$3
-                iscsi_in_password=$4
-            fi
-        fi
-    fi
+    local iscsi_initiator iscsi_target_name iscsi_target_ip iscsi_target_port
+    local iscsi_target_group iscsi_protocol iscsirw iscsi_lun
+    local iscsi_username iscsi_password
+    local iscsi_in_username iscsi_in_password
+    local iscsi_iface_name iscsi_netdev_name
+    local iscsi_param
+    local p

-    IFS="$OLDIFS"
-
-    local v=${iroot}:
-    local i
-    set --
-    while [ -n "$v" ]; do
-        if [ "${v#\[*:*:*\]:}" != "$v" ]; then
-        # handle IPv6 address
-            i="${v%%\]:*}"
-            i="${i##\[}"
-            set -- "$@" "$i"
-            v=${v#\[$i\]:}
-        else
-            set -- "$@" "${v%%:*}"
-            v=${v#*:}
-        fi
+    # override conf settings by command line options
+    arg=$(getargs rd.iscsi.initiator iscsi_initiator=)
+    [ -n "$arg" ] && iscsi_initiator=$arg
+    arg=$(getargs rd.iscsi.target.name iscsi_target_name=)
+    [ -n "$arg" ] && iscsi_target_name=$arg
+    arg=$(getargs rd.iscsi.target.ip iscsi_target_ip)
+    [ -n "$arg" ] && iscsi_target_ip=$arg
+    arg=$(getargs rd.iscsi.target.port iscsi_target_port=)
+    [ -n "$arg" ] && iscsi_target_port=$arg
+    arg=$(getargs rd.iscsi.target.group iscsi_target_group=)
+    [ -n "$arg" ] && iscsi_target_group=$arg
+    arg=$(getargs rd.iscsi.username iscsi_username=)
+    [ -n "$arg" ] && iscsi_username=$arg
+    arg=$(getargs rd.iscsi.password iscsi_password)
+    [ -n "$arg" ] && iscsi_password=$arg
+    arg=$(getargs rd.iscsi.in.username iscsi_in_username=)
+    [ -n "$arg" ] && iscsi_in_username=$arg
+    arg=$(getargs rd.iscsi.in.password iscsi_in_password=)
+    [ -n "$arg" ] && iscsi_in_password=$arg
+    for p in $(getargs rd.iscsi.param iscsi_param); do
+	iscsi_param="$iscsi_param --param $p"
    done
-    iscsi_target_ip=$1; shift
-    iscsi_protocol=$1; shift # ignored
-    iscsi_target_port=$1; shift
-    iscsi_lun=$1; shift
-    IFS=:
-    iscsi_target_name=$*
-    IFS="$OLDIFS"
+
+    parse_iscsi_root "$1" || return 1
+
 # XXX is this needed?
    getarg ro && iscsirw=ro
    getarg rw && iscsirw=rw
@@ -169,9 +134,12 @@ handle_netroot()

 # FIXME $iscsi_protocol??

-    if [ -n "${root%%block:*}" ]; then
-    # if root is not specified try to mount the whole iSCSI LUN
+    if [ -z "$root" -o -n "${root%%block:*}" ]; then
+        # if root is not specified try to mount the whole iSCSI LUN
        printf 'SYMLINK=="disk/by-path/*-iscsi-*-%s", SYMLINK+="root"\n' $iscsi_lun >> /etc/udev/rules.d/99-iscsi-root.rules
+
+        # install mount script
+        echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh
    fi

    # inject new exit_if_exists
@@ -186,13 +154,11 @@ handle_netroot()
        ${iscsi_username+-u $iscsi_username} \
        ${iscsi_password+-w $iscsi_password} \
        ${iscsi_in_username+-U $iscsi_in_username} \
-        ${iscsi_in_password+-W $iscsi_in_password} || :
-
-# install mount script
-    if [ -n "${root%%block:*}" ]; then
-    # if root is not specified try to mount the whole iSCSI LUN
-        echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh
-    fi
+        ${iscsi_in_password+-W $iscsi_in_password} \
+	${iscsi_iface_name+--param iface.iscsi_ifacename=$iscsi_iface_name} \
+	${iscsi_netdev_name+--param iface.net_ifacename=$iscsi_netdev_name} \
+        ${iscsi_param} \
+	|| :
 }

 # loop over all netroot parameter
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -15,8 +15,11 @@ check() {
    [[ $debug ]] && set -x

    is_iscsi() (
-        [[ -L /sys/dev/block/$1 ]] || return
-        cd "$(readlink -f /sys/dev/block/$1)"
+        local _dev
+        _dev=$(get_maj_min $1)
+
+        [[ -L /sys/dev/block/$_dev ]] || return
+        cd "$(readlink -f /sys/dev/block/$_dev)"
        until [[ -d sys || -d iscsi_session ]]; do
            cd ..
        done
@@ -24,14 +27,7 @@ check() {
    )

    [[ $hostonly ]] || [[ $mount_needs ]] && {
-        _rootdev=$(find_root_block_device)
-        if [[ $_rootdev ]]; then
-            # root lives on a block device, so we can be more precise about
-            # hostonly checking
-            check_block_and_slaves is_iscsi "$_rootdev" || return 1
-        else
-            return 1
-        fi
+        for_each_host_dev_fs is_iscsi || return 1
    }
    return 0
 }
@@ -63,7 +59,7 @@ install() {
    inst hostname
    inst iscsi-iname
    inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
-    inst_hook pre-pivot 90 "$moddir/cleanup-iscsi.sh"
-    inst "$moddir/iscsiroot" "/sbin/iscsiroot"
+    inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
+    inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"
    inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
 }
--- a/modules.d/95iscsi/parse-iscsiroot.sh
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
@@ -28,9 +28,11 @@
 if [ "${root%%:*}" = "iscsi" ] ; then
    if [ -n "$netroot" ] ; then
        echo "Warning: root takes precedence over netroot. Ignoring netroot"
-
    fi
    netroot=$root
+    # if root is not specified try to mount the whole iSCSI LUN
+    printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
+    root=/dev/root
 fi

 # If it's not empty or iscsi we don't continue
@@ -67,11 +69,9 @@ fi
 # If it's not iscsi we don't continue
 [ "${netroot%%:*}" = "iscsi" ] || return

-# Check required arguments. there's only one, but it's at the end
 if [ -z "$iscsi_firmware" ] ; then
-    case "${netroot##iscsi:*:*:*:*:}" in
-        $netroot|'') die "Argument targetname for iscsiroot is missing";;
-    esac
+    type parse_iscsi_root >/dev/null 2>&1 || . /lib/net-lib.sh
+    parse_iscsi_root "$netroot" || return
 fi

 # ISCSI actually supported?
--- a/modules.d/95nbd/module-setup.sh
+++ b/modules.d/95nbd/module-setup.sh
@@ -34,6 +34,6 @@ install() {
    inst nbd-client
    inst_hook cmdline 90 "$moddir/parse-nbdroot.sh"

-    inst "$moddir/nbdroot" "/sbin/nbdroot"
+    inst "$moddir/nbdroot.sh" "/sbin/nbdroot"
 }

--- a/modules.d/95nbd/nbdroot.sh
+++ b/modules.d/95nbd/nbdroot.sh
@@ -30,6 +30,11 @@ nbdfstype=${root%%:*}; root=${root#*:}
 nbdflags=${root%%:*}
 nbdopts=${root#*:}

+# If nbdport not an integer, then assume name based import
+if [ "${nbdport%[0-9]}" = "$nbdport" ]; then
+    nbdport="-N $nbdport"
+fi
+
 if [ "$nbdopts" = "$nbdflags" ]; then
    unset nbdopts
 fi
--- a/modules.d/95nbd/parse-nbdroot.sh
+++ b/modules.d/95nbd/parse-nbdroot.sh
@@ -24,15 +24,16 @@ netroot_to_var() {
    server=$2; port=$3;
 }

-# Don't continue if root is ok
-[ -n "$rootok" ] && return
-
 # This script is sourced, so root should be set. But let's be paranoid
 [ -z "$root" ] && root=$(getarg root=)
 [ -z "$netroot" ] && netroot=$(getarg netroot=)

 # Root takes precedence over netroot
 if [ "${root%%:*}" = "nbd" ] ; then
+
+    # Don't continue if root is ok
+    [ -n "$rootok" ] && return
+
    if [ -n "$netroot" ] ; then
        warn "root takes precedence over netroot. Ignoring netroot"

--- a/modules.d/95nfs/module-setup.sh
+++ b/modules.d/95nfs/module-setup.sh
@@ -40,7 +40,7 @@ install() {
    for i in /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/idmapd.conf; do
        inst_simple $i
    done
-    dracut_install rpc.idmapd 
+    dracut_install rpc.idmapd
    dracut_install sed

    for _i in {"$libdir","$usrlibdir"}/libnfsidmap_nsswitch.so* \
@@ -54,12 +54,12 @@ install() {
    _nsslibs=${_nsslibs#|}
    _nsslibs=${_nsslibs%|}

-    dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so 2>/dev/null); do echo $_i;done | egrep "$_nsslibs")
+    inst_libdir_file -n "$_nsslibs" "libnss*.so"

    inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
    inst_hook pre-udev 99 "$moddir/nfs-start-rpc.sh"
-    inst_hook pre-pivot 99 "$moddir/nfsroot-cleanup.sh"
-    inst "$moddir/nfsroot" "/sbin/nfsroot"
+    inst_hook cleanup 99 "$moddir/nfsroot-cleanup.sh"
+    inst "$moddir/nfsroot.sh" "/sbin/nfsroot"
    inst "$moddir/nfs-lib.sh" "/lib/nfs-lib.sh"
    mkdir -m 0755 -p "$initdir/var/lib/nfs/rpc_pipefs"
    mkdir -m 0755 -p "$initdir/var/lib/rpcbind"
--- a/modules.d/95nfs/nfs-lib.sh
+++ b/modules.d/95nfs/nfs-lib.sh
@@ -95,6 +95,7 @@ nfsroot_from_dhcp() {
    done
    [ -n "$new_root_path" ] && nfsroot_to_var "$nfs:$new_root_path"
    [ -z "$path" ] && [ "$(getarg root=)" == "/dev/nfs" ] && path=/tftpboot/%s
+    [ -z "$server" ] && server=$srv
    [ -z "$server" ] && server=$new_dhcp_server_identifier
    [ -z "$server" ] && server=$new_dhcp_next_server
    [ -z "$server" ] && server=${new_root_path%%:*}
--- a/modules.d/95nfs/nfsroot.sh
+++ b/modules.d/95nfs/nfsroot.sh
--- a/modules.d/95rootfs-block/block-genrules.sh
+++ b/modules.d/95rootfs-block/block-genrules.sh
@@ -13,5 +13,22 @@ if [ "${root%%:*}" = "block" ]; then
    printf '[ -e "%s" ] && { ln -s "%s" /dev/root 2>/dev/null; rm "$job"; }\n' \
        "${root#block:}" "${root#block:}" > $hookdir/initqueue/settled/blocksymlink.sh

+    if [ -d /lib/systemd/system/ ]; then
+        echo "${root#block:} $NEWROOT ${fstype:-auto} ${rflags:-defaults} 1 1" >> /etc/fstab
+        {
+           echo '[Unit]'
+           echo 'Description=New Root File System'
+           echo 'DefaultDependencies=no'
+           echo 'Before=switch-root.service'
+           echo '[Mount]'
+           echo "What=${root#block:}"
+           echo "Where=$NEWROOT"
+
+       } >/lib/systemd/system/${NEWROOT#/}.mount
+
+       mkdir -p /lib/systemd/system/switch-root.target.wants
+       ln -s ../${NEWROOT#/}.mount /lib/systemd/system/switch-root.target.wants/${NEWROOT#/}.mount
+    fi
+
    wait_for_dev "${root#block:}"
 fi
--- a/modules.d/95rootfs-block/mount-root.sh
+++ b/modules.d/95rootfs-block/mount-root.sh
@@ -98,20 +98,24 @@ mount_root() {
    # them; rflags is guaranteed to not be empty
    rflags="${rootopts:+"${rootopts},"}${rflags}"

-    umount "$NEWROOT"
-
    # backslashes are treated as escape character in fstab
    # esc_root=$(echo ${root#block:} | sed 's,\\,\\\\,g')
    # printf '%s %s %s %s 1 1 \n' "$esc_root" "$NEWROOT" "$rootfs" "$rflags" >/etc/fstab

+    ran_fsck=0
    if [ -z "$fastboot" -a "$READONLY" != "yes" ] && ! strstr "${rflags},${rootopts}" _netdev; then
-        fsck_single "${root#block:}" "$rootfs" "$fsckoptions"
+        umount "$NEWROOT"
+        fsck_single "${root#block:}" "$rootfs" "$rflags" "$fsckoptions"
        _ret=$?
        [ $_ret -ne 255 ] && echo $_ret >/run/initramfs/root-fsck
+        ran_fsck=1
    fi

-    info "Remounting ${root#block:} with -o ${rflags}"
-    mount -t "$rootfs" -o "$rflags" "${root#block:}" "$NEWROOT" 2>&1 | vinfo
+    if [ -n "$rootopts" -o "$ran_fsck" = "1" ]; then
+        info "Remounting ${root#block:} with -o ${rflags}"
+        umount "$NEWROOT" &>/dev/null
+        mount -t "$rootfs" -o "$rflags" "${root#block:}" "$NEWROOT" 2>&1 | vinfo
+    fi

    [ -f "$NEWROOT"/forcefsck ] && rm -f "$NEWROOT"/forcefsck 2>/dev/null
    [ -f "$NEWROOT"/.autofsck ] && rm -f "$NEWROOT"/.autofsck 2>/dev/null
--- a/modules.d/95ssh-client/module-setup.sh
+++ b/modules.d/95ssh-client/module-setup.sh
@@ -50,8 +50,8 @@ inst_sshenv()
 }

 install() {
-    [[ ! $cttyhack = yes ]] && {
-        derror "ssh interactive mode needs option --ctty!"
+    [[ ! $cttyhack = yes && ! $sshkey ]] && {
+        derror "ssh-client needs option --ctty or --sshkey!"
        return 1
    }

--- a/modules.d/95terminfo/module-setup.sh
+++ b/modules.d/95terminfo/module-setup.sh
@@ -10,7 +10,7 @@ install() {
    done

    if [ -d ${_terminfodir} ]; then
-        for f in $(find ${_terminfodir} -type f); do
+        for f in ${_terminfodir}/*/*; do
            inst_simple $f
        done
    fi
--- a/modules.d/95udev-rules/01-ignore.rules
+++ b/modules.d/95udev-rules/01-ignore.rules
@@ -1 +0,0 @@
-KERNEL=="ram[0-9]*", OPTIONS+="ignore_device", OPTIONS+="last_rule"
--- a/modules.d/95udev-rules/59-persistent-storage-volid.rules
+++ b/modules.d/95udev-rules/59-persistent-storage-volid.rules
@@ -1,7 +0,0 @@
-SUBSYSTEM!="block", GOTO="psv_end"
-ACTION!="add|change", GOTO="psv_end"
-ACTION=="change", KERNEL=="dm-[0-9]*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}!="1", IMPORT{program}="vol_id --export $tempnode"
-KERNEL=="cciss[0-9]*", IMPORT{program}="vol_id --export $tempnode"
-KERNEL=="nbd[0-9]*", IMPORT{program}="vol_id --export $tempnode"
-KERNEL=="md[0-9]*|md_d[0-9]*|md/*", IMPORT{program}="vol_id --export $tempnode"
-LABEL="psv_end"
--- a/modules.d/95udev-rules/module-setup.sh
+++ b/modules.d/95udev-rules/module-setup.sh
@@ -4,25 +4,46 @@

 install() {
    local _i
-    # FIXME: would be nice if we didn't have to know which rules to grab....
+
+    systemdutildir=$(pkg-config systemd --variable=systemdutildir)
+    if ! [[ -d "$systemdutildir" ]]; then
+        [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd
+        [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd
+    fi
+
+    udevdir=$(pkg-config udev --variable=udevdir)
+    if ! [[ -d "$udevdir" ]]; then
+        [[ -d /lib/udev ]] && udevdir=/lib/udev
+        [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev
+    fi
+
+    # Fixme: would be nice if we didn't have to know which rules to grab....
    # ultimately, /lib/initramfs/rules.d or somesuch which includes links/copies
    # of the rules we want so that we just copy those in would be best
    dracut_install udevadm
-    [ -x /sbin/udevd ] && dracut_install udevd
+    [ -d ${initdir}/lib/systemd ] || mkdir -p ${initdir}/lib/systemd
+    for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do
+        [ -x "$_i" ] || continue
+        inst "$_i"
+
+        if ! [[ -f  ${initdir}/lib/systemd/systemd-udevd ]]; then
+            ln -s "$_i" ${initdir}/lib/systemd/systemd-udevd
+        fi
+        break
+    done

    for i in /etc/udev/udev.conf /etc/group; do
        inst_simple $i
    done
+
    dracut_install basename
+
    inst_rules 50-udev-default.rules 60-persistent-storage.rules \
        61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \
        60-pcmcia.rules
    #Some debian udev rules are named differently
    inst_rules 50-udev.rules 95-late.rules

-    # ignore some devices in the initrd
-    inst_rules "$moddir/01-ignore.rules"
-
    # for firmware loading
    inst_rules 50-firmware.rules
    dracut_install cat uname
@@ -31,12 +52,8 @@ install() {
    inst_dir /run/udev
    inst_dir /run/udev/rules.d

-    if [ ! -x /lib/udev/vol_id ]; then
-        dracut_install blkid
-        inst_rules "$moddir/59-persistent-storage.rules"
-    else
-        inst_rules "$moddir/59-persistent-storage-volid.rules"
-    fi
+    dracut_install blkid
+    inst_rules "$moddir/59-persistent-storage.rules"
    inst_rules "$moddir/61-persistent-storage.rules"

    for _i in \
@@ -54,28 +71,15 @@ install() {
        input_id \
        scsi_id \
        usb_id \
-        vol_id \
        pcmcia-socket-startup \
        pcmcia-check-broken-cis \
-        udevd \
        ; do
-        [ -e /lib/udev/$_i ] && dracut_install /lib/udev/$_i
-        [ -e /usr/lib/udev/$_i ] && dracut_install /usr/lib/udev/$_i
+        [ -e ${udevdir}/$_i ] && dracut_install ${udevdir}/$_i
    done

-    if ! [ -e "$initdir/sbin/udevd" ]; then
-        if [ -x /usr/lib/udev/udevd ]; then
-            ln -s /usr/lib/udev/udevd "$initdir/sbin/udevd"
-        elif [ -x /lib/udev/udevd ]; then
-            ln -s /lib/udev/udevd "$initdir/sbin/udevd"
-        fi
-    fi
-
    [ -f /etc/arch-release ] && \
        inst "$moddir/load-modules.sh" /lib/udev/load-modules.sh

-    for _i in {"$libdir","$usrlibdir"}/libnss_files*; do
-        [ -e "$_i" ] && dracut_install "$_i"
-    done
+    inst_libdir_file "libnss_files*"
 }

--- a/modules.d/95virtfs/module-setup.sh
+++ b/modules.d/95virtfs/module-setup.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    [[ $hostonly ]] || [[ $mount_needs ]] && {
+        for fs in ${host_fs_types[@]}; do
+            strstr "$fs" "\|9p" && return 0
+        done
+        return 1
+    }
+
+    return 0
+}
+
+depends() {
+    return 0
+}
+
+installkernel() {
+    instmods 9p 9pnet_virtio
+}
+
+install() {
+    inst_hook cmdline 95 "$moddir/parse-virtfs.sh"
+    inst_hook mount 99 "$moddir/mount-virtfs.sh"
+}
--- a/modules.d/95virtfs/mount-virtfs.sh
+++ b/modules.d/95virtfs/mount-virtfs.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+filter_rootopts() {
+    rootopts=$1
+    # strip ro and rw options
+    local OLDIFS="$IFS"
+    IFS=,
+    set -- $rootopts
+    IFS="$OLDIFS"
+    local v
+    while [ $# -gt 0 ]; do
+        case $1 in
+            rw|ro);;
+            defaults);;
+            *)
+                v="$v,${1}";;
+        esac
+        shift
+    done
+    rootopts=${v#,}
+    echo $rootopts
+}
+
+mount_root() {
+    local _ret
+
+    rootfs="9p"
+    rflags="trans=virtio,version=9p2000.L"
+
+    modprobe 9pnet_virtio
+
+    mount -t ${rootfs} -o "$rflags",ro "${root#virtfs:}" "$NEWROOT"
+
+    rootopts=
+    if getargbool 1 rd.fstab -n rd_NO_FSTAB \
+        && ! getarg rootflags \
+        && [ -f "$NEWROOT/etc/fstab" ] \
+        && ! [ -L "$NEWROOT/etc/fstab" ]; then
+        # if $NEWROOT/etc/fstab contains special mount options for
+        # the root filesystem,
+        # remount it with the proper options
+        rootopts="defaults"
+        while read dev mp fs opts rest; do
+            # skip comments
+            [ "${dev%%#*}" != "$dev" ] && continue
+
+            if [ "$mp" = "/" ]; then
+                rootopts=$opts
+                break
+            fi
+        done < "$NEWROOT/etc/fstab"
+
+        rootopts=$(filter_rootopts $rootopts)
+    fi
+
+    # we want rootflags (rflags) to take precedence so prepend rootopts to
+    # them; rflags is guaranteed to not be empty
+    rflags="${rootopts:+"${rootopts},"}${rflags}"
+
+    umount "$NEWROOT"
+
+    info "Remounting ${root#virtfs:} with -o ${rflags}"
+    mount -t ${rootfs} -o "$rflags" "${root#virtfs:}" "$NEWROOT" 2>&1 | vinfo
+
+    [ -f "$NEWROOT"/forcefsck ] && rm -f "$NEWROOT"/forcefsck 2>/dev/null
+    [ -f "$NEWROOT"/.autofsck ] && rm -f "$NEWROOT"/.autofsck 2>/dev/null
+}
+
+if [ -n "$root" -a -z "${root%%virtfs:*}" ]; then
+    mount_root
+fi
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`KERNEL=="ram[0-9]*", OPTIONS+="ignore_device", OPTIONS+="last_rule"`