network: do not destroy the team interface on teamd shutdown

when doing switch-root teamd gets killed, which tears down the team interface, if teamd is not started with "-N". (cherry picked from commit 2a12e97475)
fips: add drbg kernel module
2015-02-19 12:33:33 +01:00 · 2015-02-19 11:05:59 +01:00 · 2015-01-21 13:39:28 +01:00 · 2015-01-15 10:37:56 +01:00 · 2015-01-14 11:46:39 +01:00 · 2015-01-14 11:41:21 +01:00
411 changed files with 22898 additions and 9931 deletions
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -0,0 +1,2 @@
+(setq sh-basic-offset: 4)
+(setq indent-tabs-mode nil)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/Makefile.inc
 /dracut.8
 /dracut-catimages.8
 /dracut.conf.5
@@ -8,3 +9,11 @@
 /modules.d/99base/switch_root
 /test/*/test.log
 test*.img
+/.buildpath
+/.project
+/dracut-version.sh
+/install/dracut-install
+/*.rpm
+/*.[0-9]
+/modules.d/98systemd/*.service.8
+/*.sign
--- a/.kateconfig
+++ b/.kateconfig
@@ -0,0 +1 @@
+kate: space-indent on; tab-width 4; indent-width 4; replace-tabs on; eol unix;
--- a/.kateproject
+++ b/.kateproject
@@ -0,0 +1,9 @@
+{
+  "name": "Kate"
+  , "files": [ { "git": 1 } ]
+  , "build": {
+    "directory": "build"
+  , "build": "make -j $(getconf _NPROCESSORS_ONLN) all"
+  , "clean": "make clean"
+  }
+}
--- a/.mailmap
+++ b/.mailmap
@@ -1,12 +1,15 @@
-Philippe Seewer <philippe.seewer@bfh.ch> <philippe.seewer-omB+W0Dpw2o@public.gmane.org>
-Seewer Philippe <philippe.seewer@bfh.ch> <philippe.seewer@bfh.ch>
-Philippe Seewer <philippe.seewer@bfh.ch> <philippe.seewer@bfh.ch>
-Victor Lowther <victor.lowther@gmail.com> <victor.lowther-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-Harald Hoyer <harald@redhat.com> <harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
-Harald Hoyer <harald@redhat.com> <harald@eeepc.(none)>
-Mike Snitzer <snitzer@redhat.com> <msnitzer@redhat.com> 
-Amerigo Wang <amwang@redhat.com> <xiyou.wangcong@gmail.com>
-Andrey Borzenkov <arvidjaar@gmail.com> <arvidjaar@mail.ru>
-Dan Horák <dhorak@redhat.com> <dan@danny.cz>
-John Reiser <jreiser@bitwagon.com> <jreiser@BitWagon.com>
-Luca Berra <bluca@vodka.it> <bluca@comedia.it>
+Philippe Seewer <philippe.seewer@bfh.ch> 	<philippe.seewer-omB+W0Dpw2o@public.gmane.org>
+Seewer Philippe <philippe.seewer@bfh.ch> 	<philippe.seewer@bfh.ch>
+Philippe Seewer <philippe.seewer@bfh.ch> 	<philippe.seewer@bfh.ch>
+Victor Lowther <victor.lowther@gmail.com> 	<victor.lowther-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+Harald Hoyer <harald@redhat.com> 		<harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+Harald Hoyer <harald@redhat.com> 		<harald@eeepc.(none)>
+Mike Snitzer <snitzer@redhat.com> 		<msnitzer@redhat.com>
+Amerigo Wang <amwang@redhat.com> 		<xiyou.wangcong@gmail.com>
+Andrey Borzenkov <arvidjaar@gmail.com> 		<arvidjaar@mail.ru>
+Dan Horák <dhorak@redhat.com> 			<dan@danny.cz>
+John Reiser <jreiser@bitwagon.com> 		<jreiser@BitWagon.com>
+Luca Berra <bluca@vodka.it> 			<bluca@comedia.it>
+Dave Young <dyoung@redhat.com>	 		dyoung@redhat.com
+Frederick Grose <fgrose@sugarlabs.org> 		<fgrose@gmail.com>
+Frederic Crozat <fcrozat@suse.com> 		<fcrozat@mandriva.com>
--- a/50-dracut.install
+++ b/50-dracut.install
@@ -0,0 +1,33 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+if [[ -f /etc/kernel/cmdline ]]; then
+    readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
+fi
+
+if ! [[ "${BOOT_OPTIONS[@]}" ]]; then
+    readarray -t BOOT_OPTIONS < /proc/cmdline
+fi
+
+unset noimageifnotneeded
+
+for ((i=0; i < "${#BOOT_OPTIONS[@]}"; i++)); do
+    if [[ ${BOOT_OPTIONS[$i]} == root\=PARTUUID\=* ]]; then
+        noimageifnotneeded="yes"
+        break
+    fi
+done
+
+ret=0
+case "$1" in
+    add)
+	dracut ${noimageifnotneeded:+--noimageifnotneeded} "$3"/initrd "$2"
+        ret=$?
+	;;
+    remove)
+        rm -f -- "$3"/initrd
+        ret=$?
+	;;
+esac
+exit $ret
--- a/51-dracut-rescue-postinst.sh
+++ b/51-dracut-rescue-postinst.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+export LANG=C
+
+KERNEL_VERSION="$1"
+KERNEL_IMAGE="$2"
+
+[[ -f /etc/os-release ]] && . /etc/os-release
+
+if [[ ! -f /etc/machine-id ]] || [[ ! -s /etc/machine-id ]]; then
+    systemd-machine-id-setup
+fi
+
+[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
+
+[[ $MACHINE_ID ]] || exit 1
+[[ -f $KERNEL_IMAGE ]] || exit 1
+
+INITRDFILE="/boot/initramfs-0-rescue-${MACHINE_ID}.img"
+NEW_KERNEL_IMAGE="${KERNEL_IMAGE%/*}/vmlinuz-0-rescue-${MACHINE_ID}"
+
+[[ -f $INITRDFILE ]] && [[ -f $NEW_KERNEL_IMAGE ]] && exit 0
+
+dropindirs_sort()
+{
+    suffix=$1; shift
+    args=("$@")
+    files=$(
+        while (( $# > 0 )); do
+            for i in ${1}/*${suffix}; do
+                [[ -f $i ]] && echo ${i##*/}
+            done
+            shift
+        done | sort -Vu
+    )
+
+    for f in $files; do
+        for d in "${args[@]}"; do
+            if [[ -f "$d/$f" ]]; then
+                echo "$d/$f"
+                continue 2
+            fi
+        done
+    done
+}
+
+# source our config dir
+for f in $(dropindirs_sort ".conf" "/etc/dracut.conf.d" "/usr/lib/dracut/dracut.conf.d"); do
+    [[ -e $f ]] && . "$f"
+done
+
+[[ $dracut_rescue_image != "yes" ]] && exit 0
+
+if [[ ! -f $INITRDFILE ]]; then
+    dracut --no-hostonly -a "rescue" "$INITRDFILE" "$KERNEL_VERSION"
+    ((ret+=$?))
+fi
+
+if [[ ! -f $NEW_KERNEL_IMAGE ]]; then
+    cp "$KERNEL_IMAGE" "$NEW_KERNEL_IMAGE"
+    ((ret+=$?))
+fi
+
+new-kernel-pkg --install "$KERNEL_VERSION" --kernel-image "$NEW_KERNEL_IMAGE" --initrdfile "$INITRDFILE" --banner "$NAME $VERSION_ID Rescue $MACHINE_ID"
+
+((ret+=$?))
+
+exit $ret
--- a/51-dracut-rescue.install
+++ b/51-dracut-rescue.install
@@ -0,0 +1,103 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+export LANG=C
+
+COMMAND="$1"
+KERNEL_VERSION="$2"
+BOOT_DIR_ABS="${3%/*}/0-rescue"
+KERNEL_IMAGE="$4"
+
+
+dropindirs_sort()
+{
+    suffix=$1; shift
+    args=("$@")
+    files=$(
+        while (( $# > 0 )); do
+            for i in ${1}/*${suffix}; do
+                [[ -f $i ]] && echo ${i##*/}
+            done
+            shift
+        done | sort -Vu
+    )
+
+    for f in $files; do
+        for d in "${args[@]}"; do
+            if [[ -f "$d/$f" ]]; then
+                echo "$d/$f"
+                continue 2
+            fi
+        done
+    done
+}
+
+[[ -f /etc/os-release ]] && . /etc/os-release
+
+if [[ ! -f /etc/machine-id ]] || [[ ! -s /etc/machine-id ]]; then
+    systemd-machine-id-setup
+fi
+
+[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
+
+if [[ -f /etc/kernel/cmdline ]]; then
+    readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
+fi
+if ! [[ "${BOOT_OPTIONS[@]}" ]]; then
+    readarray -t BOOT_OPTIONS < /proc/cmdline
+fi
+if ! [[ $BOOT_OPTIONS ]]; then
+    exit 1
+fi
+
+LOADER_ENTRY="/boot/loader/entries/${MACHINE_ID}-0-rescue.conf"
+BOOT_DIR="/${MACHINE_ID}/0-rescue"
+
+ret=0
+
+case "$COMMAND" in
+    add)
+        for i in "/boot/loader/entries/${MACHINE_ID}-0-rescue.conf"; do
+            [[ -f $i ]] && exit 0
+        done
+
+        # source our config dir
+        for f in $(dropindirs_sort ".conf" "/etc/dracut.conf.d" "/usr/lib/dracut/dracut.conf.d"); do
+            [[ -e $f ]] && . "$f"
+        done
+
+        [[ $dracut_rescue_image != "yes" ]] && exit 0
+
+        [[ -d "$BOOT_DIR_ABS" ]] || mkdir -p "$BOOT_DIR_ABS"
+
+        if ! cp "$KERNEL_IMAGE" "$BOOT_DIR_ABS"/linux; then
+            echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/linux'!" >&2
+        fi
+
+        dracut --no-hostonly  -a "rescue" "$BOOT_DIR_ABS"/initrd "$2"
+        ((ret+=$?))
+
+        {
+            echo "title      $PRETTY_NAME - Rescue Image"
+            echo "version    $KERNEL_VERSION"
+            echo "machine-id $MACHINE_ID"
+            echo "options    ${BOOT_OPTIONS[@]} rd.auto=1"
+            echo "linux      $BOOT_DIR/linux"
+            echo "initrd     $BOOT_DIR/initrd"
+        } > $LOADER_ENTRY
+        ((ret+=$?))
+        ;;
+
+    remove)
+        exit 0
+        ;;
+
+    *)
+        usage
+        ret=1;;
+esac
+
+((ret+=$?))
+
+exit $ret
--- a/67
+++ b/67
@@ -1,66 +1,103 @@
 Harald Hoyer <harald@redhat.com>
 Victor Lowther <victor.lowther@gmail.com>
+Amadeusz Żołnowski <aidecoe@aidecoe.name>
+Will Woods <wwoods@redhat.com>
 Philippe Seewer <philippe.seewer@bfh.ch>
 Warren Togami <wtogami@redhat.com>
-Amadeusz Żołnowski <aidecoe@aidecoe.name>
 Jeremy Katz <katzj@redhat.com>
+Dave Young <dyoung@redhat.com>
 David Dillow <dave@thedillows.org>
 Michal Soltys <soltys@ziu.info>
-Will Woods <wwoods@redhat.com>
-Andrey Borzenkov <arvidjaar@gmail.com>
-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>
+Andrey Borzenkov <arvidjaar@gmail.com>
+Peter Jones <pjones@redhat.com>
+Andreas Thienemann <andreas@bawue.net>
+Hans de Goede <hdegoede@redhat.com>
 John Reiser <jreiser@bitwagon.com>
 Luca Berra <bluca@vodka.it>
-Dave Young <dyoung@redhat.com>
+WANG Chao <chaowang@redhat.com>
 Daniel Drake <dsd@laptop.org>
+Dan Horák <dhorak@redhat.com>
+Baoquan He <bhe@redhat.com>
+Leho Kraav <leho@kraav.com>
+Brian C. Lane <bcl@redhat.com>
+Kamil Rytarowski <n54@gmx.com>
 Marc Grimme <grimme@atix.de>
+Chao Wang <chaowang@redhat.com>
+Frederic Crozat <fcrozat@suse.com>
+Jesse Keating <jkeating@redhat.com>
+Milan Broz <mbroz@redhat.com>
+Radek Vykydal <rvykydal@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>
+Colin Walters <walters@verbum.org>
 David Cantrell <dcantrell@redhat.com>
+Dennis Gilmore <dennis@ausil.us>
+Jon Ander Hernandez <jonan.h@gmail.com>
+Juan RP <xtraeme@gmail.com>
 Lance Albertson <lance@osuosl.org>
 Marian Ganisin <mganisin@redhat.com>
 Michael Ploujnikov <plouj@somanetworks.com>
+Peter Rajnoha <prajnoha@redhat.com>
+Wim Muskee <wimmuskee@gmail.com>
 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
 Alan Pevec <apevec@redhat.com>
+Frederick Grose <fgrose@sugarlabs.org>
 Ian Dall <ian@beware.dropbear.id.au>
 James Buren <ryuo@frugalware.org>
+James Lee <jlee@thestaticvoid.com>
 Joey Boggs <jboggs@redhat.com>
-Jon Ander Hernandez <jonan.h@gmail.com>
+Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 Mike Snitzer <snitzer@redhat.com>
-Peter Rajnoha <prajnoha@redhat.com>
 Przemysław Rudy <prudy1@o2.pl>
+Stefan Reimer <it@startux.de>
+Thomas Lange <lange@informatik.uni-koeln.de>
+Vivek Goyal <vgoyal@redhat.com>
 Vladislav Bogdanov <bubble@hoster-ok.com>
+Adam Williamson <awilliam@redhat.com>
 Alexander Todorov <atodorov@redhat.com>
 Andy Lutomirski <luto@mit.edu>
 Anssi Hannula <anssi@mageia.org>
+Brandon Philips <brandon@ifup.co>
+Canek Peláez Valdés <caneko@gmail.com>
+Chris Leech <cleech@redhat.com>
 Christian Heinz <christian.ch.heinz@gmail.com>
+Cong Wang <amwang@redhat.com>
+Daniel Schaal <farbing@web.de>
 Dave Jones <davej@redhat.com>
+Dave Young <dave@redhat.com>
+Dennis Schridde <devurandom@gmx.net>
 Duane Griffin <duaneg@dghda.com>
-Frederic Crozat <fcrozat@mandriva.com>
 Glen Gray <slaine@slaine.org>
 Hermann Gausterer <git-dracut-2012@mrq1.org>
 James Laska <jlaska@redhat.com>
-Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Leho Kraav <leho@kraav.com>
+Jan Stodola <jstodola@redhat.com>
+Jiri Pirko <jiri@resnulli.us>
+Joe Lawrence <Joe.Lawrence@stratus.com>
+Kevin Yung <Kevin.Yung@myob.com>
+Kyle McMartin <kyle@redhat.com>
+Lars R. Damerow <lars@pixar.com>
+Lennert Buytenhek <buytenh@wantstofly.org>
 Lubomir Rintel <lkundrak@v3.sk>
 Matt <smoothsailing72@hotmail.com>
 Matt Smith <shadowfax@gmx.com>
 Michal Schmidt <mschmidt@redhat.com>
+Mike Gorse <mgorse@suse.com>
 Munehiro Matsuda <haro@kgt.co.jp>
+Nicolas Chauvet <kwizart@gmail.com>
+Nikoli <nikoli@lavabit.com>
+Olivier Blin <dev@blino.org>
 Paolo Bonzini <pbonzini@redhat.com>
 Peter Robinson <pbrobinson@fedoraproject.org>
 Pádraig Brady <P@draigBrady.com>
 Quentin Armitage <quentin@armitage.org.uk>
+Robert Buchholz <rbu@goodpoint.de>
 Sergey Fionov <fionov@gmail.com>
+Srinivasa T N <seenutn@linux.vnet.ibm.com>
 Thilo Bangert <thilo.bangert@gmx.net>
-Thomas Lange <lange@informatik.uni-koeln.de>
+Thomas Backlund <tmb@mageia.org>
 Tomasz Torcz <tomek@pipebreaker.pl>
 Vadim Kuznetsov <vadimk@gentoo.org>
 Ville Skyttä <ville.skytta@iki.fi>
--- a/42
+++ b/42
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

-			    Preamble
+                            Preamble

  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.

 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.

-			    NO WARRANTY
+                            NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>

    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
@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
    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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 Also add information on how to contact you by electronic and paper mail.

 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:

-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@@ -335,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
--- a/223
+++ b/223
@@ -1,5 +1,9 @@
-VERSION=016
-GITVERSION=$(shell [ -d .git ] && git rev-list  --abbrev-commit  -n 1 HEAD  |cut -b 1-8)
+-include dracut-version.sh
+
+VERSION = $(shell [ -d .git ] && git describe --abbrev=0 --tags 2>/dev/null || echo $(DRACUT_VERSION))
+GITVERSION = $(shell [ -d .git ] && { v=$$(git describe --tags 2>/dev/null); [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
+
+-include Makefile.inc

 prefix ?= /usr
 libdir ?= ${prefix}/lib
@@ -8,109 +12,220 @@ pkglibdir ?= ${libdir}/dracut
 sysconfdir ?= ${prefix}/etc
 bindir ?= ${prefix}/bin
 mandir ?= ${prefix}/share/man
+CFLAGS ?= -O2 -g -Wall
+CFLAGS += -std=gnu99  -D_FILE_OFFSET_BITS=64
+bashcompletiondir ?= ${datadir}/bash-completion/completions

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

-.PHONY: install clean archive rpm testimage test all check AUTHORS doc
+man5pages = dracut.conf.5
+
+man7pages = dracut.cmdline.7 \
+            dracut.bootup.7 \
+            dracut.modules.7
+
+man8pages = dracut.8 \
+            dracut-catimages.8 \
+            mkinitrd.8 \
+            modules.d/98systemd/dracut-cmdline.service.8 \
+            modules.d/98systemd/dracut-initqueue.service.8 \
+            modules.d/98systemd/dracut-mount.service.8 \
+            modules.d/98systemd/dracut-shutdown.service.8 \
+            modules.d/98systemd/dracut-pre-mount.service.8 \
+            modules.d/98systemd/dracut-pre-pivot.service.8 \
+            modules.d/98systemd/dracut-pre-trigger.service.8 \
+            modules.d/98systemd/dracut-pre-udev.service.8
+
+manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
+
+.PHONY: install clean archive rpm testimage test all check AUTHORS doc dracut-version.sh
+
+all: dracut-version.sh dracut-install skipcpio/skipcpio
+
+DRACUT_INSTALL_OBJECTS = \
+        install/dracut-install.o \
+        install/hashmap.o\
+        install/log.o \
+        install/util.o
+
+# deps generated with gcc -MM
+install/dracut-install.o: install/dracut-install.c install/log.h install/macro.h \
+	install/hashmap.h install/util.h
+install/hashmap.o: install/hashmap.c install/util.h install/macro.h install/log.h \
+	install/hashmap.h
+install/log.o: install/log.c install/log.h install/macro.h install/util.h
+install/util.o: install/util.c install/util.h install/macro.h install/log.h
+
+install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
+
+dracut-install: install/dracut-install
+	ln -fs $< $@
+
+SKIPCPIO_OBJECTS= \
+	skipcpio/skipcpio.o
+
+skipcpio/skipcpio.o: skipcpio/skipcpio.c
+skipcpio/skipcpio: skipcpio/skipcpio.o
+
+indent:
+	indent -i8 -nut -br -linux -l120 install/dracut-install.c
+	indent -i8 -nut -br -linux -l120 skipcpio/skipcpio.c

 doc: $(manpages) dracut.html
-all: syncheck
+
+ifneq ($(enable_documentation),no)
+all: doc
+endif

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

-dracut.html: dracut.xml $(manpages)
-	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 \
-		http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml
+%.xml: %.asc
+	asciidoc -d manpage -b docbook -o $@ $<

-install: doc
+dracut.8: dracut.usage.asc dracut.8.asc
+
+dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
+	asciidoc -a numbered -d book -b docbook -o dracut.xml dracut.asc
+	xsltproc -o dracut.html --xinclude -nonet \
+		--stringparam custom.css.source dracut.css \
+		--stringparam generate.css.header 1 \
+		http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml
+	rm -f -- dracut.xml
+
+install: 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
+	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
+	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
+	mkdir -p $(DESTDIR)$(pkglibdir)/dracut.conf.d
+	install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh
+	install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh
+	ln -fs 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
+ifneq ($(enable_documentation),no)
+	for i in $(man1pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man1/$${i##*/}; done
+	for i in $(man5pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man5/$${i##*/}; done
+	for i in $(man7pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man7/$${i##*/}; done
+	for i in $(man8pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man8/$${i##*/}; done
+	ln -fs dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7
+endif
 	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; \
+		ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98systemd/dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir)/dracut-shutdown.service; \
+		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants; \
+		ln -s ../dracut-shutdown.service \
+		$(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants/dracut-shutdown.service; \
+		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants; \
+		for i in \
+		    dracut-cmdline.service \
+		    dracut-initqueue.service \
+		    dracut-mount.service \
+		    dracut-pre-mount.service \
+		    dracut-pre-pivot.service \
+		    dracut-pre-trigger.service \
+		    dracut-pre-udev.service \
+		    ; do \
+			ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98systemd/$$i $(DESTDIR)$(systemdsystemunitdir); \
+			ln -s ../$$i \
+			$(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants/$$i; \
+		done \
 	fi
+	if [ -f install/dracut-install ]; then \
+		install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
+	fi
+	if [ -f skipcpio/skipcpio ]; then \
+		install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
+	fi
+	mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d
+	install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
+	install -m 0755 51-dracut-rescue.install $(DESTDIR)${prefix}/lib/kernel/install.d/51-dracut-rescue.install
+	mkdir -p $(DESTDIR)${bashcompletiondir}
+	install -m 0644 dracut-bash-completion.sh $(DESTDIR)${bashcompletiondir}/dracut
+	install -m 0644 lsinitrd-bash-completion.sh $(DESTDIR)${bashcompletiondir}/lsinitrd
+
+dracut-version.sh:
+	@echo "DRACUT_VERSION=$(VERSION)$(GITVERSION)" > dracut-version.sh

 clean:
 	$(RM) *~
 	$(RM) */*~
 	$(RM) */*/*~
+	$(RM) $(manpages:%=%.xml) dracut.xml
 	$(RM) test-*.img
 	$(RM) dracut-*.rpm dracut-*.tar.bz2
+	$(RM) dracut-version.sh
+	$(RM) dracut-install install/dracut-install $(DRACUT_INSTALL_OBJECTS)
+	$(RM) skipcpio/skipcpio $(SKIPCPIO_OBJECTS)
 	$(RM) $(manpages) dracut.html
 	$(MAKE) -C test clean

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

-dist: dracut-$(VERSION).tar.gz
+dracut-$(VERSION).tar.bz2: doc syncheck
+	@echo "DRACUT_VERSION=$(VERSION)" > dracut-version.sh
+	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ > dracut-$(VERSION).tar
+	mkdir -p dracut-$(VERSION)
+	for i in $(manpages) dracut.html dracut-version.sh; do [ "$${i%/*}" != "$$i" ] && mkdir -p "dracut-$(VERSION)/$${i%/*}"; cp "$$i" "dracut-$(VERSION)/$$i"; done
+	tar --owner=root --group=root -rf dracut-$(VERSION).tar $$(find dracut-$(VERSION) -type f)
+	rm -fr -- dracut-$(VERSION).tar.bz2 dracut-$(VERSION)
+	bzip2 -9 dracut-$(VERSION).tar
+	rm -f -- dracut-$(VERSION).tar

-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
-
-rpm: dracut-$(VERSION).tar.bz2
+rpm: dracut-$(VERSION).tar.bz2 syncheck
 	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; \
+	LC_MESSAGES=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 )
+	( mv "$$rpmbuild"/$$(arch)/*.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 modules.d/*/*.sh; do \
                [ "$${i##*/}" = "module-setup.sh" ] && continue; \
-                [ "$${i##*/}" = "caps.sh" ] && continue; \
-		dash -n "$$i" ; ret=$$(($$ret+$$?)); \
+                read line < "$$i"; [ "$${line#*bash*}" != "$$line" ] && continue; \
+		[ $$V ] && echo "posix syntax check: $$i"; bash --posix -n "$$i" ; ret=$$(($$ret+$$?)); \
+		[ $$V ] && echo "checking for [[: $$i"; if grep -Fq '[[ ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains [["; fi \
 	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+$$?)); \
+		[ $$V ] && echo "bash syntax check: $$i"; bash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret

-check: all syncheck
-	$(MAKE) -C test check
+check: all syncheck rpm
+	@[ "$$EUID" == "0" ] || { echo "'check' must be run as root! Please use 'sudo'."; exit 1; }
+	@$(MAKE) -C test check

 testimage: all
-	./dracut -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
-	@echo wrote  test-$(shell uname -r).img 
+	./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)
-	@echo wrote  test-$(shell uname -r).img 
-	./dracut -l -a debug --no-kernel -f test-dracut.img $(shell uname -r)
-	@echo wrote  test-dracut.img 
+	./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.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)
-	@echo wrote  test-$(shell uname -r).img 
+	./dracut.sh -H -l -f test-$(shell uname -r).img $(shell uname -r)
+	@echo wrote  test-$(shell uname -r).img

 AUTHORS:
 	git shortlog  --numbered --summary -e |while read a rest; do echo $$rest;done > AUTHORS
+
+dracut.html.sign: dracut-$(VERSION).tar.bz2
+	gpg-sign-all dracut-$(VERSION).tar.bz2 dracut.html
+
+upload: dracut.html.sign
+	kup put dracut-$(VERSION).tar.bz2 dracut-$(VERSION).tar.sign /pub/linux/utils/boot/dracut/
+	kup put dracut.html dracut.html.sign /pub/linux/utils/boot/dracut/
--- a/389
+++ b/389
@@ -1,3 +1,392 @@
+dracut-033
+==========
+- improved hostonly device recognition
+- improved hostonly module recognition
+- add dracut.css for dracut.html
+- do not install udev rules from /etc in generic mode
+- fixed LABEL= parsing for swap devices
+- fixed iBFT network setup
+- url-lib.sh: handle 0-size files with curl
+- dracut.asc: document debugging dracut on shutdown
+- if rd.md=0, use dmraid for imsm and ddf
+- skip empty dracut modules
+- removed caching of kernel cmdline
+- fixed iso-scan, if the loop device driver is a kernel module
+- bcache: support new blkid
+- fixed ifup udev rules
+- ifup with dhcp, if no "ip=" specified for the interface
+
+dracut-032
+==========
+- add parameter --print-cmdline
+    This prints the kernel command line parameters for the current disk
+    layout.
+    $ dracut --print-cmdline
+    rd.luks.uuid=luks-e68c8906-6542-4a26-83c4-91b4dd9f0471
+    rd.lvm.lv=debian/root rd.lvm.lv=debian/usr root=/dev/mapper/debian-root
+    rootflags=rw,relatime,errors=remount-ro,user_xattr,barrier=1,data=ordered
+    rootfstype=ext4
+- dracut.sh: add --persistent-policy option and persistent_policy conf option
+    --persistent-policy <policy>:
+        Use <policy> to address disks and partitions.
+        <policy> can be any directory name found in /dev/disk.
+        E.g. "by-uuid", "by-label"
+- dracut now creates the initramfs without udevadm
+  that means the udev database does not have to populated
+  and the initramfs can be built in a chroot with
+  /sys /dev /proc mounted
+- renamed dracut_install() to inst_multiple() for consistent naming
+- if $libdirs is unset, fall back to ld.so.cache paths
+- always assemble /usr device in initramfs
+- bash module added (disable it, if you really want dash)
+- continue to boot, if the main loop times out, in systemd mode
+- removed inst*() shell pure versions, dracut-install binary is in charge now
+- fixed ifcfg file generation for vlan
+- do not include adjtime and localtime anymore
+- fixed generation of zfcp.conf of CMS setups
+- install vt102 terminfo
+  dracut_install() is still there for backwards compat
+- do not strip files in FIPS mode
+- fixed iBFT interface configuration
+- fs-lib: install fsck and fsck.ext*
+- shutdown: fixed killall_proc_mountpoint()
+- network: also wait for ethernet interfaces to setup
+- fixed checking for FIPS mode
+
+Contributions from:
+Harald Hoyer
+WANG Chao
+Baoquan He
+Daniel Schaal
+Dave Young
+James Lee
+Radek Vykydal
+
+
+dracut-031
+==========
+- do not include the resume dracut module in hostonly mode,
+  if no swap is present
+- don't warn twice about omitted modules
+- use systemd-cat for logging on systemd systems, if logfile is unset
+- fixed PARTUUID parsing
+- support kernel module signing keys
+- do not install the usrmount dracut module in hostonly mode,
+  if /sbin/init does not live in /usr
+- add debian udev rule files
+- add support for bcache
+- network: handle bootif style interfaces
+  e.g. ip=77-77-6f-6f-64-73:dhcp
+- add support for kmod static devnodes
+- add vlan support for iBFT
+
+Contributions from:
+Harald Hoyer
+Amadeusz Żołnowski
+Brandon Philips
+Colin Walters
+James Lee
+Kyle McMartin
+Peter Jones
+
+dracut-030
+==========
+- support new persistent network interface names
+- fix findmnt calls, prevents hang on stale NFS mounts
+- add systemd.slice and slice.target units
+- major shell cleanup
+- support root=PARTLABEL= and root=PARTUUID=
+- terminfo: only install l/linux v/vt100 and v/vt220
+- unset all LC_* and LANG, 10% faster
+- fixed dependency loop for dracut-cmdline.service
+- do not wait_for_dev for the root devices
+- do not wait_for_dev for devices, if dracut-initqueue is not needed
+- support early microcode loading with --early-microcode
+- dmraid, let dmraid setup its own partitions
+- sosreport renamed to rdsosreport
+
+Contributions from:
+Harald Hoyer
+Konrad Rzeszutek Wilk
+WANG Chao
+
+dracut-029
+==========
+- wait for IPv6 autoconfiguration
+- i18n: make the default font configurable
+  To set the default font for your distribution, add
+  i18n_default_font="latarcyrheb-sun16"
+  to your /lib/dracut/dracut.conf.d/01-dist.conf distribution config.
+- proper handle "rd.break" in systemd mode before switch-root
+- systemd: make unit files symlinks
+- build without dash requirement
+- add dracut-shutdown.service.8 manpage
+- handle MACs for "ip="
+  "ip=77-77-6f-6f-64-73:dhcp"
+- don't explode when mixing BOOTIF and ip=
+- 90lvm/module-setup.sh: redirect error message of lvs to /dev/null
+
+Contributions from:
+Harald Hoyer
+Will Woods
+Baoquan He
+
+dracut-028
+==========
+- full integration of crypto devs in systemd logic
+- support for bridge over team and vlan tagged team
+- support multiple bonding interfaces
+- new kernel command line param "rd.action_on_fail"
+  to control the emergency action
+- support for bridge over a vlan tagged interface
+- support for "iso-scan/filename" kernel parameter
+- lsinitrd got some love and does not use "file" anymore
+- fixed issue with noexec mounted tmp dirs
+- FIPS mode fixed
+- dracut_install got some love
+- fixed some /usr mounting problems
+- ifcfg dracut module got some love and fixes
+- default installed font is now latarcyrheb-sun16
+- new parameters rd.live.dir and rd.live.squashimg
+- lvm: add tools for thin provisioning
+- also install non-hwcap libs
+- setup correct system time and time zone in initrd
+- s390: fixed cms setup
+- add systemd-udevd persistent network interface naming
+
+Contributions from:
+Harald Hoyer
+Kamil Rytarowski
+WANG Chao
+Baoquan He
+Adam Williamson
+Colin Guthrie
+Dan Horák
+Dave Young
+Dennis Gilmore
+Dennis Schridde
+
+dracut-027
+==========
+- dracut now has bash-completion
+- require bash version 4
+- systemd module now requires systemd >= 199
+- dracut makes use of native systemd initrd units
+- added hooks for new-kernel-pkg and kernel-install
+- hostonly is now default for fedora
+- comply with the BootLoaderSpec paths
+  http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
+- added rescue module
+- host_fs_types is now a hashmap
+- new dracut argument "--regenerate-all"
+- new dracut argument "--noimageifnotneeded"
+- new man page dracut.bootup
+- install all host filesystem drivers
+- use -D_FILE_OFFSET_BITS=64 to build dracut-install
+
+dracut-026
+==========
+- introduce /usr/lib/dracut/dracut.conf.d/ drop-in directory
+
+  /usr/lib/dracut/dracut.conf.d/*.conf can be overwritten by the same
+  filenames in /etc/dracut.conf.d.
+
+  Packages should use /usr/lib/dracut/dracut.conf.d rather than
+  /etc/dracut.conf.d for drop-in configuration files.
+
+  /etc/dracut.conf and /etc/dracut.conf.d belong to the system administrator.
+
+- uses systemd-198 native initrd units
+- totally rely on the fstab-generator in systemd mode for block devices
+- dracut systemd now uses dracut.target rather than basic.target
+- dracut systemd services optimize themselves away
+- fixed hostonly parameter generation
+- turn off curl globbing (fixes IPv6)
+- modify the udev rules on install and not runtime time
+- enable initramfs building without kernel modules (fixed regression)
+- in the initqueue/timeout,
+  reset the main loop counter, as we see new udev events or initqueue/work
+- fixed udev rule installation
+
+dracut-025
+==========
+- do not strip signed kernel modules
+- add sosreport script and generate /run/initramfs/sosreport.txt
+- make short uuid specification for allow-discards work
+- turn off RateLimit for the systemd journal
+- fixed MAC address assignment
+- add systemd checkisomd5 service
+- splitout drm kernel modules from plymouth module
+- add 'swapoff' to initramfs to fix shutdown/reboot
+- add team device support
+- add pre-shutdown hook
+- kill all processes in shutdown and report remaining ones
+- "--device" changed to "--add-device" and "add_device=" added for conf files
+- add memory usage trace to different hook points
+- cope with optional field #7 in /proc/self/mountinfo
+- lots of small bugfixes
+
+dracut-024
+==========
+- new dracut option "--device"
+- new dracut kernel command line options "rd.auto"
+- new dracut kernel command line options "rd.noverifyssl"
+- new dracut option "--kernel-cmdline" and "kernel_cmdline" option for default parameters
+- fixes for systemd and crypto
+- fix for kexec in shutdown, if not included in initramfs
+- create the initramfs non-world readable
+- prelink/preunlink in the initramfs
+- strip binaries in the initramfs by default now
+- various FIPS fixes
+- various dracut-install fixes
+
+dracut-023
+==========
+- resume from hibernate fixes
+- -N option for --no-hostonly
+- support for systemd crypto handling
+- new dracut module "crypt-loop"
+- deprecate the old kernel command line options
+- more documentation
+- honor CFLAGS for dracut-install build
+- multipath fixes
+- / is mounted according to rootflags parameter but forced ro at first.
+  Later it is remounted according to /etc/fstab + rootflags parameter
+  and "ro"/"rw".
+- support for xfs / reiserfs separate journal device
+- new "ro_mnt" option to force ro mount of / and /usr
+- root on cifs support
+- dracut-install: fixed issue for /var/tmp containing a symlink
+- only lazy resolve with ldd, if the /var/tmp partition is not mounted with "noexec"
+- i18n: fixed inclusion of "include" keymaps
+
+dracut-022
+==========
+- fixed host-only kernel module bug
+
+dracut-021
+==========
+- fixed systemd in the initramfs (requires systemd >= 187)
+- dracut-install: massive speedup with /var on the same filesystem with COW copy
+- dracut-install: moved to /usr/lib/dracut until it becomes a general purpose tool
+- new options: "rd.usrmount.ro" and "rd.skipfsck"
+- less mount/umount
+- apply "ro" on the kernel command line also to /usr
+- mount according to fstab, if neither "ro" or "rw" is specified
+- skip fsck for xfs and btrfs. remount is enough
+- give emergency_shell if /usr mount failed
+- dracut now uses getopt:
+  * options can be position independent now!!
+  * we can now use --option=<arg>
+- added option "--kver=<kernel-version>", and the image location can be omitted
+  # dracut --kver 3.5.0-0.rc7.git1.2.fc18.x86_64
+- dracut.sh: for --include copy also the symbolic links
+- man pages: lsinitrd and mkinitrd added
+- network: We do not support renaming in the kernel namespace anymore (as udev does
+  that not anymore). So, if a user wants to use ifname, he has to rename
+  to a custom namespace. "eth[0-9]+" is not allowed anymore. !!!!!
+- resume: moved the resume process to the initqueue.
+  This should prevent accidently mounting the root file system.
+- testsuite: add support for: make V=1 TESTS="01 20 40" check
+    $ sudo make V=1 clean check
+    now runs the testsuite in verbose mode
+
+    $ sudo make TESTS="01 20 40" clean check
+    now only runs the 01, 20 and 40 tests.
+
+dracut-020
+==========
+- changed rd.dasd kernel parameter
+- arm kernel modules added to kernel-modules
+- make udevdir systemdutildir systemdsystemunitdir global vars
+  your distribution should ship those settings in
+  /etc/dracut.conf.d/01-distro.conf
+  see dracut.conf.d/fedora.conf.example
+- kernel modules are now only handled with /sys/modules and modules.dep
+- systemd fixups
+- mdraid: wait for md devices to be clean, before shutdown
+- ifup fixed for ipv6
+- add PARTUUID as root=PARTUUID=<partition uuid> parameter
+- fixed instmods() return code and set pipefail globally
+- add 04watchdog dracut module
+- dracut-shutdown.service: fixed ordering to be before shutdown.target
+- make use of "ln -r" instead of shell functions, if new coreutils is installed
+- network: support vlan tagged bonding
+- new dracut module qemu and qemu-net to install all kernel driver
+- fs-lib/fs-lib.sh: removed test mounting of btrfs and xfs
+- no more "mknod" in the initramfs!!
+- replaced all "tr" calls with "sed"
+- speedup with lazy kernel module dependency resolving
+- lots of speedup optimizations and last but not least
+- dracut-install:
+  - new binary to significanlty speedup the installation process
+  - dracut-functions.sh makes use of it, if installed
+
+
+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/12
+++ b/12
@@ -1,6 +1,6 @@
-Dracut
+dracut
 ------
-Dracut is a new initramfs infrastructure.
+dracut is a new initramfs infrastructure.

 Information about the initial goals and aims can be found at
 https://fedoraproject.org/wiki/Initrdrewrite
@@ -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
@@ -1,5 +1,5 @@
 Most of the functionality that dracut implements are actually implemented
-by dracut modules.  Dracut modules live in modules.d, and have the following
+by dracut modules.  dracut modules live in modules.d, and have the following
 structure:

 dracut_install_dir/modules.d/
@@ -38,7 +38,7 @@ installkernel():


 check():
-       Dracut calls this function to check and see if a module can be installed
+       dracut calls this function to check and see if a module can be installed
       on the initrd.

       When called without options, check should check to make sure that
@@ -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,30 @@
+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 (dhcp-server on openSUSE)
+iscsi-initiator-utils
+TEST-04-FULL-SYSTEMD: systemd >= 187
+
+How to run the testsuite:
+
+$ sudo make clean check
+
+in verbose mode:
+$ sudo make V=1 clean check
+
+only specific test:
+$ sudo make TESTS="01 20 40" clean check
+only runs the 01, 20 and 40 tests.
+
+debug a specific test case:
+$ cd TEST-01-BASIC
+$ sudo make clean setup run
+... change some kernel parameters ...
+$ sudo make run
+to run the test without doing the setup
--- a/38
+++ b/38
@@ -1,24 +1,44 @@
-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.
- automatic kexec fallback
+- use info and warn prefix
+- 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 / careful about resume!
+- the hard-coded list of udev rules that we care about is kind of lame.
 - panic fallback
- fsck for $NEWROOT/usr
+- bridging/bonding without "netroot=" https://bugzilla.redhat.com/show_bug.cgi?id=822750
+- progress indication for fsck https://bugzilla.redhat.com/show_bug.cgi?id=827118
+- domain, searchdomain https://bugzilla.redhat.com/show_bug.cgi?id=840778
+- disable write-ifcfg https://bugzilla.redhat.com/show_bug.cgi?id=840784
+- check for /var to be mounted in convertfs https://bugzilla.redhat.com/show_bug.cgi?id=848172
+- probably fix "--include" https://bugzilla.redhat.com/show_bug.cgi?id=849338

 GENERATOR TODO

- Default module specification could use some work
- udev rule copying, as mentioned above, is a bit too hard-coded
+- remove wait for swap devs, if no "resume=" is given on the kernel command line
+- add presets (predefined set of modules)
+- add interpreter/plugin-scripts to be sourced at the beginning or end (can use dracut-functions)
+- 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
+
+- dracut-install parse LD_SHOW_AUXV="" AT_PLATFORM for lib install

 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/78
+++ b/78
@@ -0,0 +1,78 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+# We don't support srcdir != builddir
+echo \#buildapi-variable-no-builddir >/dev/null
+
+prefix=/usr
+
+enable_documentation=yes
+
+# Little helper function for reading args from the commandline.
+# it automatically handles -a b and -a=b variants, and returns 1 if
+# we need to shift $3.
+read_arg() {
+    # $1 = arg name
+    # $2 = arg value
+    # $3 = arg parameter
+    local rematch='^[^=]*=(.*)$'
+    if [[ $2 =~ $rematch ]]; then
+        read "$1" <<< "${BASH_REMATCH[1]}"
+    else
+        read "$1" <<< "$3"
+        # There is no way to shift our callers args, so
+        # return 1 to indicate they should do it instead.
+        return 1
+    fi
+    return 0
+}
+
+while (($# > 0)); do
+    case "${1%%=*}" in
+        --prefix) read_arg prefix "$@" || shift;;
+        --libdir) read_arg libdir "$@" || shift;;
+        --datadir) read_arg datadir "$@" || shift;;
+        --sysconfdir) read_arg sysconfdir "$@" || shift;;
+        --sbindir) read_arg sbindir "$@" || shift;;
+        --mandir) read_arg mandir "$@" || shift;;
+        --disable-documentation) enable_documentation=no;;
+        --program-prefix) read_arg programprefix "$@" || shift;;
+        --exec-prefix) read_arg execprefix "$@" || shift;;
+        --bindir) read_arg bindir "$@" || shift;;
+        --includedir) read_arg includedir "$@" || shift;;
+        --libexecdir) read_arg libexecdir "$@" || shift;;
+        --localstatedir) read_arg localstatedir "$@" || shift;;
+        --sharedstatedir) read_arg sharedstatedir "$@" || shift;;
+        --infodir) read_arg infodir "$@" || shift;;
+        --systemdsystemunitdir) read_arg systemdsystemunitdir "$@" || shift;;
+        --bashcompletiondir) read_arg bashcompletiondir "$@" || shift;;
+        *) echo "Ignoring unknown option '$1'";;
+    esac
+    shift
+done
+
+cat > Makefile.inc.$$ <<EOF
+prefix ?= ${prefix}
+libdir ?= ${libdir:-${prefix}/lib}
+datadir ?= ${datadir:-${prefix}/share}
+sysconfdir ?= ${sysconfdir:-${prefix}/etc}
+sbindir ?= ${sbindir:-${prefix}/sbin}
+mandir ?= ${mandir:-${prefix}/share/man}
+enable_documentation ?= ${enable_documentation:-yes}
+bindir ?= ${bindir:-${prefix}/bin}
+EOF
+
+{
+    [[ $programprefix ]] && echo "programprefix ?= ${programprefix}"
+    [[ $execprefix ]] && echo "execprefix ?= ${execprefix}"
+    [[ $includedir ]] && echo "includedir ?= ${includedir}"
+    [[ $libexecdir ]] && echo "libexecdir ?= ${libexecdir}"
+    [[ $localstatedir ]] && echo "localstatedir ?= ${localstatedir}"
+    [[ $sharedstatedir ]] && echo "sharedstatedir ?= ${sharedstatedir}"
+    [[ $infodir ]] && echo "infodir ?= ${infodir}"
+    [[ $systemdsystemunitdir ]] && echo "systemdsystemunitdir ?= ${systemdsystemunitdir}"
+    [[ $bashcompletiondir ]] && echo "bashcompletiondir ?= ${bashcompletiondir}"
+} >> Makefile.inc.$$
+
+mv Makefile.inc.$$ Makefile.inc
--- a/813
+++ b/813
@@ -1,813 +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
-#
-# Generator script for a dracut initramfs
-# Tries to retain some degree of compatibility with the command line
-# of the various mkinitrd implementations out there
-#
-
-# Copyright 2005-2010 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/>.
-#
-
-# store for logging
-dracut_args="$@"
-
-usage() {
-#                                                       80x25 linebreak here ^
-    cat << EOF
-Usage: $0 [OPTION]... <initramfs> <kernel-version>
-Creates initial ramdisk images for preloading modules
-
-  -f, --force           Overwrite existing initramfs file.
-  -m, --modules [LIST]  Specify a space-separated list of dracut modules to
-                         call when building the initramfs. Modules are located
-                         in /usr/lib/dracut/modules.d.
-  -o, --omit [LIST]     Omit a space-separated list of dracut modules.
-  -a, --add [LIST]      Add a space-separated list of dracut modules.
-  -d, --drivers [LIST]  Specify a space-separated list of kernel modules to
-                        exclusively include in the initramfs.
-  --add-drivers [LIST] Specify a space-separated list of kernel
-                        modules to add to the initramfs.
-  --omit-drivers [LIST] Specify a space-separated list of kernel
-                        modules not to add to the initramfs.
-  --filesystems [LIST]  Specify a space-separated list of kernel filesystem
-                        modules to exclusively include in the generic
-                        initramfs.
-  -k, --kmoddir [DIR]   Specify the directory, where to look for kernel
-                        modules
-  --fwdir [DIR]         Specify additional directories, where to look for
-                        firmwares, separated by :
-  --kernel-only         Only install kernel drivers and firmware files
-  --no-kernel           Do not install kernel drivers and firmware files
-  --strip               Strip binaries in the initramfs
-  --nostrip             Do not strip binaries in the initramfs (default)
-  --prefix [DIR]        Prefix initramfs files with [DIR]
-  --noprefix            Do not prefix initramfs files (default)
-  --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 helpers.
-  --nofscks             Inhibit installation of any fsck helpers.
-  -h, --help            This message
-  --debug               Output debug information of the build process
-  --profile             Output profile information of the build process
-  -L, --stdlog [0-6]    Specify logging level (to standard error)
-                         0 - suppress any messages
-                         1 - only fatal errors
-                         2 - all errors
-                         3 - warnings
-                         4 - info (default)
-                         5 - debug info (here starts lots of output)
-                         6 - trace info (and even more)
-  -v, --verbose         Increase verbosity level (default is info(4))
-  -q, --quiet           Decrease verbosity level (default is info(4))
-  -c, --conf [FILE]     Specify configuration file to use.
-                         Default: /etc/dracut.conf
-  --confdir [DIR]       Specify configuration directory to use *.conf files
-                         from. Default: /etc/dracut.conf.d
-  -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.
-  --fstab               Use /etc/fstab to determine the root device.
-  --add-fstab [FILE]    Add file to the initramfs fstab
-  --mount "[DEV] [MP] [FSTYPE] [FSOPTS]"
-                        Mount device [DEV] on mountpoint [MP] with filesystem
-                        [FSTYPE] and options [FSOPTS] 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.
-  -I, --install [LIST]  Install the space separated list of files into the
-                         initramfs.
-  --gzip                Compress the generated initramfs using gzip.
-                         This will be done by default, unless another
-                         compression option or --no-compress is passed.
-  --bzip2               Compress the generated initramfs using bzip2.
-                         Make sure your kernel has bzip2 decompression support
-                         compiled in, otherwise you will not be able to boot.
-  --lzma                Compress the generated initramfs using lzma.
-                         Make sure your kernel has lzma support compiled in,
-                         otherwise you will not be able to boot.
-  --xz                  Compress the generated initramfs using xz.
-                         Make sure that your kernel has xz support compiled
-                         in, otherwise you will not be able to boot.
-  --compress [COMPRESSION] Compress the generated initramfs with the
-                         passed compression program.  Make sure your kernel
-                         knows how to decompress the generated initramfs,
-                         otherwise you will not be able to boot.
-  --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 temporary initramfs for debugging purposes
-  --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:
-# dracut --add-drivers "module1 module2"  ...
-EOF
-}
-
-# function push()
-# push values to a stack
-# $1 = stack variable
-# $2.. values
-# example:
-# push stack 1 2 "3 4"
-push() {
-    local __stack=$1; shift
-    for i in "$@"; do
-        eval ${__stack}'[${#'${__stack}'[@]}]="$i"'
-    done
-}
-
-# function pop()
-# pops the last value from a stack
-# assigns value to second argument variable
-# or echo to stdout, if no second argument
-# $1 = stack variable
-# $2 = optional variable to store the value
-# example:
-# pop stack val
-# val=$(pop stack)
-pop() {
-    local __stack=$1; shift
-    local __resultvar=$1
-    local myresult;
-    # check for empty stack
-    eval '[[ ${#'${__stack}'[@]} -eq 0 ]] && return 1'
-
-    eval myresult='${'${__stack}'[${#'${__stack}'[@]}-1]}'
-
-    if [[ "$__resultvar" ]]; then
-        eval $__resultvar="'$myresult'"
-    else
-        echo "$myresult"
-    fi
-    eval unset ${__stack}'[${#'${__stack}'[@]}-1]'
-    return 0
-}
-
-# Little helper function for reading args from the commandline.
-# it automatically handles -a b and -a=b variants, and returns 1 if
-# we need to shift $3.
-read_arg() {
-    # $1 = arg name
-    # $2 = arg value
-    # $3 = arg parameter
-    local rematch='^[^=]*=(.*)$'
-    if [[ $2 =~ $rematch ]]; then
-        read "$1" <<< "${BASH_REMATCH[1]}"
-    else
-        read "$1" <<< "$3"
-        # There is no way to shift our callers args, so
-        # return 1 to indicate they should do it instead.
-        return 1
-    fi
-}
-
-# Little helper function for reading args from the commandline to a stack.
-# it automatically handles -a b and -a=b variants, and returns 1 if
-# we need to shift $3.
-push_arg() {
-    # $1 = arg name
-    # $2 = arg value
-    # $3 = arg parameter
-    local rematch='^[^=]*=(.*)$'
-    if [[ $2 =~ $rematch ]]; then
-        push "$1" "${BASH_REMATCH[1]}"
-    else
-        push "$1" "$3"
-        # There is no way to shift our callers args, so
-        # return 1 to indicate they should do it instead.
-        return 1
-    fi
-}
-
-verbosity_mod_l=0
-
-while (($# > 0)); do
-    case ${1%%=*} in
-        -a|--add)      push_arg add_dracutmodules_l  "$@" || shift;;
-        --force-add)   push_arg force_add_dracutmodules_l  "$@" || shift;;
-        --add-drivers) push_arg add_drivers_l        "$@" || shift;;
-        --omit-drivers) push_arg omit_drivers_l      "$@" || shift;;
-        -m|--modules)  push_arg dracutmodules_l      "$@" || shift;;
-        -o|--omit)     push_arg omit_dracutmodules_l "$@" || shift;;
-        -d|--drivers)  push_arg drivers_l            "$@" || shift;;
-        --filesystems) push_arg filesystems_l        "$@" || shift;;
-        -I|--install)  push_arg install_items_l      "$@" || shift;;
-        --fwdir)       push_arg fw_dir_l             "$@" || shift;;
-        --fscks)       push_arg fscks_l              "$@" || shift;;
-        --add-fstab)   push_arg add_fstab_l          "$@" || shift;;
-        --mount)       push_arg fstab_lines          "$@" || shift;;
-        --nofscks)     nofscks_l="yes";;
-        -k|--kmoddir)  read_arg drivers_dir_l        "$@" || shift;;
-        -c|--conf)     read_arg conffile             "$@" || shift;;
-        --confdir)     read_arg confdir              "$@" || shift;;
-        -L|--stdlog)   read_arg stdloglvl_l          "$@" || shift;;
-        --compress)    read_arg compress_l           "$@" || shift;;
-        --prefix)      read_arg prefix_l             "$@" || shift;;
-        -f|--force)    force=yes;;
-        --kernel-only) kernel_only="yes"; no_kernel="no";;
-        --no-kernel)   kernel_only="no"; no_kernel="yes";;
-        --strip)       do_strip_l="yes";;
-        --nostrip)     do_strip_l="no";;
-        --noprefix)    prefix_l="/";;
-        --mdadmconf)   mdadmconf_l="yes";;
-        --nomdadmconf) mdadmconf_l="no";;
-        --lvmconf)     lvmconf_l="yes";;
-        --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" ;;
-        -H|--hostonly) hostonly_l="yes" ;;
-        --fstab)       use_fstab_l="yes" ;;
-        -h|--help)     usage; exit 1 ;;
-        -i|--include)  push include_src "$2"
-                       push include_target "$3"
-                       shift 2;;
-        --bzip2)       compress_l="bzip2";;
-        --lzma)        compress_l="lzma";;
-        --xz)          compress_l="xz";;
-        --no-compress) _no_compress_l="cat";;
-        --gzip)        compress_l="gzip";;
-        --list-modules)
-            do_list="yes";
-            ;;
-        -M|--show-modules)
-                       show_modules_l="yes"
-                       ;;
-        --keep)        keep="yes";;
-        -*) printf "\nUnknown option: %s\n\n" "$1" >&2; usage; exit 1;;
-        *)
-            if ! [[ ${outfile+x} ]]; then
-                outfile=$1
-            elif ! [[ ${kernel+x} ]]; then
-                kernel=$1
-            else
-                usage; exit 1;
-            fi
-            ;;
-    esac
-    shift
-done
-if ! [[ $kernel ]]; then
-    kernel=$(uname -r)
-fi
-[[ $outfile ]] || outfile="/boot/initramfs-$kernel.img"
-
-for i in /usr/sbin /sbin /usr/bin /bin; do
-    rl=$i
-    if [ -L "$i" ]; then
-        rl=$(readlink -f $i)
-    fi
-    NPATH+=":$rl"
-done
-export PATH="${NPATH#:}"
-unset NPATH
-unset LD_LIBRARY_PATH
-unset GREP_OPTIONS
-
-[[ $debug ]] && {
-    export PS4='${BASH_SOURCE}@${LINENO}(${FUNCNAME[0]}): ';
-    set -x
-}
-
-[[ $profile ]] && {
-    export PS4='+ $(date "+%s.%N") ${BASH_SOURCE}@${LINENO}: ';
-    set -x
-    debug=yes
-}
-
-[[ $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" || \
-        conffile="/etc/dracut.conf"
-fi
-
-if [[ ! -d $confdir ]]; then
-    [[ $allowlocal ]] && confdir="$dracutbasedir/dracut.conf.d" || \
-        confdir="/etc/dracut.conf.d"
-fi
-
-# source our config file
-[[ -f $conffile ]] && . "$conffile"
-
-# source our config dir
-if [[ $confdir && -d $confdir ]]; then
-    for f in "$confdir"/*.conf; do
-        [[ -e $f ]] && . "$f"
-    done
-fi
-
-# these optins add to the stuff in the config file
-if (( ${#add_dracutmodules_l[@]} )); then
-    while pop add_dracutmodules_l val; do
-        add_dracutmodules+=" $val "
-    done
-fi
-
-if (( ${#force_add_dracutmodules_l[@]} )); then
-    while pop force_add_dracutmodules_l val; do
-        force_add_dracutmodules+=" $val "
-    done
-fi
-
-if (( ${#fscks_l[@]} )); then
-    while pop fscks_l val; do
-        fscks+=" $val "
-    done
-fi
-
-if (( ${#add_fstab_l[@]} )); then
-    while pop add_fstab_l val; do
-        add_fstab+=" $val "
-    done
-fi
-
-if (( ${#fstab_lines_l[@]} )); then
-    while pop fstab_lines_l val; do
-        push fstab_lines $val
-    done
-fi
-
-if (( ${#install_items_l[@]} )); then
-    while pop install_items_l val; do
-        install_items+=" $val "
-    done
-fi
-
-# these options override the stuff in the config file
-if (( ${#dracutmodules_l[@]} )); then
-    dracutmodules=''
-    while pop dracutmodules_l val; do
-        dracutmodules+="$val "
-    done
-fi
-
-if (( ${#omit_dracutmodules_l[@]} )); then
-    omit_dracutmodules=''
-    while pop omit_dracutmodules_l val; do
-        omit_dracutmodules+="$val "
-    done
-fi
-
-if (( ${#filesystems_l[@]} )); then
-    filesystems=''
-    while pop filesystems_l val; do
-        filesystems+="$val "
-    done
-fi
-
-if (( ${#fw_dir_l[@]} )); then
-    fw_dir=''
-    while pop fw_dir_l val; do
-        fw_dir+="$val "
-    done
-fi
-
-[[ $stdloglvl_l ]] && stdloglvl=$stdloglvl_l
-[[ ! $stdloglvl ]] && stdloglvl=4
-stdloglvl=$((stdloglvl + verbosity_mod_l))
-((stdloglvl > 6)) && stdloglvl=6
-((stdloglvl < 0)) && stdloglvl=0
-
-[[ $drivers_dir_l ]] && drivers_dir=$drivers_dir_l
-[[ $do_strip_l ]] && do_strip=$do_strip_l
-[[ $prefix_l ]] && prefix=$prefix_l
-[[ $prefix = "/" ]] && unset prefix
-[[ $hostonly_l ]] && hostonly=$hostonly_l
-[[ $use_fstab_l ]] && use_fstab=$use_fstab_l
-[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
-[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
-[[ $do_strip ]] || do_strip=no
-[[ $compress_l ]] && compress=$compress_l
-[[ $show_modules_l ]] && show_modules=$show_modules_l
-[[ $nofscks_l ]] && nofscks="yes"
-# eliminate IFS hackery when messing with fw_dir
-fw_dir=${fw_dir//:/ }
-
-# handle compression options.
-[[ $compress ]] || compress="gzip"
-case $compress in
-    bzip2) compress="bzip2 -9";;
-    lzma)  compress="lzma -9";;
-    xz)    compress="xz --check=crc32 --lzma2=dict=1MiB";;
-    gzip)  command -v pigz > /dev/null 2>&1 && compress="pigz -9" || \
-                                         compress="gzip -9";;
-esac
-if [[ $_no_compress_l = "cat" ]]; then
-    compress="cat"
-fi
-
-[[ $hostonly = yes ]] && hostonly="-h"
-[[ $hostonly != "-h" ]] && unset hostonly
-
-if [[ -f $dracutbasedir/dracut-functions ]]; then
-    . $dracutbasedir/dracut-functions
-else
-    echo "Cannot find $dracutbasedir/dracut-functions." >&2
-    echo "Are you running from a git checkout?" >&2
-    echo "Try passing -l as an argument to $0" >&2
-    exit 1
-fi
-
-# Verify bash version, curret minimum is 3.1
-if (( ${BASH_VERSINFO[0]} < 3 ||
-    ( ${BASH_VERSINFO[0]} == 3 && ${BASH_VERSINFO[1]} < 1 ) )); then
-    dfatal 'You need at least Bash 3.1 to use dracut, sorry.'
-    exit 1
-fi
-
-dracutfunctions=$dracutbasedir/dracut-functions
-export dracutfunctions
-
-if (( ${#drivers_l[@]} )); then
-    drivers=''
-    while pop drivers_l val; do
-        drivers+="$val "
-    done
-fi
-drivers=${drivers/-/_}
-
-if (( ${#add_drivers_l[@]} )); then
-    while pop add_drivers_l val; do
-        add_drivers+=" $val "
-    done
-fi
-add_drivers=${add_drivers/-/_}
-
-if (( ${#omit_drivers_l[@]} )); then
-    while pop omit_drivers_l val; do
-        omit_drivers+=" $val "
-    done
-fi
-omit_drivers=${omit_drivers/-/_}
-
-unset omit_drivers_corrected
-for d in $omit_drivers; do
-    strstr " $drivers $add_drivers " " $d " && continue
-    omit_drivers_corrected+=" $d "
-done
-omit_drivers=$omit_drivers_corrected
-unset omit_drivers_corrected
-
-
-ddebug "Executing $0 $dracut_args"
-
-[[ $do_list = yes ]] && {
-    for mod in $dracutbasedir/modules.d/*; do
-        [[ -d $mod ]] || continue;
-        [[ -e $mod/install || -e $mod/installkernel || \
-            -e $mod/module-setup.sh ]] || continue
-        echo ${mod##*/??}
-    done
-    exit 0
-}
-
-# 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!'
-
-# This is kinda legacy -- eventually it should go away.
-case $dracutmodules in
-    ""|auto) dracutmodules="all" ;;
-esac
-
-abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
-
-srcmods="/lib/modules/$kernel/"
-[[ $drivers_dir ]] && {
-    if vercmp $(modprobe --version | cut -d' ' -f3) lt 3.7; then
-        dfatal 'To use --kmoddir option module-init-tools >= 3.7 is required.'
-        exit 1
-    fi
-    srcmods="$drivers_dir"
-}
-export srcmods
-
-if [[ -f $outfile && ! $force ]]; then
-    dfatal "Will not override existing initramfs ($outfile) without --force"
-    exit 1
-fi
-
-outdir=${outfile%/*}
-[[ $outdir ]] || outdir="/"
-
-if [[ ! -d "$outdir" ]]; then
-    dfatal "Can't write $outfile: Directory $outdir does not exist."
-    exit 1
-elif [[ ! -w "$outdir" ]]; then
-    dfatal "No permission to write $outdir."
-    exit 1
-elif [[ -f "$outfile" && ! -w "$outfile" ]]; then
-    dfatal "No permission to write $outfile."
-    exit 1
-fi
-
-readonly TMPDIR=/var/tmp
-readonly initdir=$(mktemp --tmpdir=/var/tmp/ -d -t initramfs.XXXXXX)
-[ -d "$initdir" ] || {
-    dfatal "mktemp failed."
-    exit 1
-}
-
-# clean up after ourselves no matter how we die.
-trap 'ret=$?;[[ $keep ]] && echo "Not removing $initdir." >&2 || rm -rf "$initdir";exit $ret;' EXIT
-# clean up after ourselves no matter how we die.
-trap 'exit 1;' SIGINT
-
-# Need to be able to have non-root users read stuff (rpcbind etc)
-chmod 755 "$initdir"
-
-for line in "${fstab_lines[@]}"; do
-    set -- $line
-    #dev mp fs fsopts
-    push host_devs "$1"
-    push host_fs_types "$1|$3"
-done
-
-for f in $add_fstab; do
-    [ -e $f ] || continue
-    while read dev rest; do
-        push host_devs $dev
-    done < $f
-done
-
-if [[ $hostonly ]]; then
-    # in hostonly mode, determine all devices, which have to be accessed
-    # and examine them for filesystem types
-
-    push host_mp \
-        "/" \
-        "/etc" \
-        "/usr" \
-        "/usr/bin" \
-        "/usr/sbin" \
-        "/usr/lib" \
-        "/usr/lib64" \
-        "/boot"
-
-    for mp in "${host_mp[@]}"; do
-        mountpoint "$mp" >/dev/null 2>&1 || continue
-        push host_devs $(readlink -f "/dev/block/$(find_block_device "$mp")")
-    done
-fi
-
-_get_fs_type() (
-    [[ $1 ]] || return
-    if [[ -b $1 ]] && get_fs_env $1; then
-        echo "$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"
-        return 1
-    fi
-    if fstype=$(find_dev_fstype $1); then
-        echo "$1|$fstype"
-        return 1
-    fi
-    return 1
-)
-
-for dev in "${host_devs[@]}"; do
-    unset fs_type
-    for fstype in $(_get_fs_type $dev) \
-        $(check_block_and_slaves _get_fs_type $(get_maj_min $dev)); do
-        if ! strstr " ${host_fs_types[*]} " " $fstype ";then
-            push host_fs_types "$fstype"
-        fi
-    done
-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 \
-    stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
-    debug host_fs_types host_devs sshkey
-
-# Create some directory structure first
-[[ $prefix ]] && mkdir -m 0755 -p "${initdir}${prefix}"
-
-[[ -h /lib ]] || mkdir -m 0755 -p "${initdir}${prefix}/lib"
-[[ $prefix ]] && ln -sfn "${prefix#/}/lib" "$initdir/lib"
-
-if [[ $prefix ]]; then
-    for d in bin etc lib "$libdir" sbin tmp usr var; do
-        ln -sfn "${prefix#/}/${d#/}" "$initdir/$d"
-    done
-fi
-
-if [[ $kernel_only != yes ]]; then
-    for d in bin etc lib "$libdir" sbin tmp usr var var/log usr/bin usr/sbin; do
-        [[ -e "${initdir}${prefix}/$d" ]] && continue
-        if [ -h "/$d" ]; then
-            inst "/$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"
-        else
-            mkdir -m 0755 -p "$initdir/$d"
-        fi
-    done
-
-    ln -sfn /run "$initdir/var/run"
-    ln -sfn /run/lock "$initdir/var/lock"
-else
-    for d in lib "$libdir"; do
-        [[ -e "${initdir}${prefix}/$d" ]] && continue
-        if [ -h "/$d" ]; then
-            inst "/$d" "${prefix}/$d"
-        else
-            mkdir -m 0755 -p "${initdir}${prefix}/$d"
-        fi
-    done
-fi
-
-mkdir -p "${initdir}/etc/cmdline.d"
-
-mods_to_load=""
-# check all our modules to see if they should be sourced.
-# This builds a list of modules that we will install next.
-for_each_module_dir check_module
-for_each_module_dir check_mount
-
-modules_loaded=" "
-# source our modules.
-for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
-    _d_mod=${moddir##*/}; _d_mod=${_d_mod#[0-9][0-9]}
-    if strstr "$mods_to_load" " $_d_mod "; then
-        [[ $show_modules = yes ]] && echo "$_d_mod" || \
-            dinfo "*** Including module: $_d_mod ***"
-        if [[ $kernel_only = yes ]]; then
-            module_installkernel $_d_mod
-        else
-            module_install $_d_mod
-            if [[ $no_kernel != yes ]]; then
-                module_installkernel $_d_mod
-            fi
-        fi
-        mods_to_load=${mods_to_load// $_d_mod /}
-        modules_loaded+="$_d_mod "
-    fi
-done
-unset moddir
-dinfo "*** Including modules done ***"
-
-## final stuff that has to happen
-
-# generate module dependencies for the initrd
-if [[ -d $initdir/lib/modules/$kernel ]] && \
-    ! depmod -a -b "$initdir" $kernel; then
-    dfatal "\"depmod -a $kernel\" failed."
-    exit 1
-fi
-
-while pop include_src src && pop include_target tgt; do
-    if [[ $src && $tgt ]]; then
-        if [[ -f $src ]]; then
-            inst $src $tgt
-        else
-            ddebug "Including directory: $src"
-            mkdir -p "${initdir}/${tgt}"
-            # check for preexisting symlinks, so we can cope with the
-            # symlinks to $prefix
-            for i in "$src"/*; do
-                [[ -e "$i" || -h "$i" ]] || continue
-                s=${initdir}/${tgt}/${i#$src/}
-                if [[ -d "$i" ]]; then
-                    if ! [[ -e "$s" ]]; then
-                        mkdir -m 0755 -p "$s"
-                        chmod --reference="$i" "$s"
-                    fi
-                    cp -a -t "$s" "$i"/*
-                else
-                    cp -a -t "$s" "$i"
-                fi
-            done
-        fi
-    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
-    # 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"
-    done
-    if ! ldconfig -r "$initdir"; then
-        if [[ $UID = 0 ]]; then
-            derror "ldconfig exited ungracefully"
-        else
-            derror "ldconfig might need uid=0 (root) for chroot()"
-        fi
-    fi
-fi
-
-if (($maxloglvl >= 5)); then
-    ddebug "Listing sizes of included files:"
-    du -c "$initdir" | sort -n | ddebug
-fi
-
-# strip binaries
-if [[ $do_strip = yes ]] ; then
-    for p in strip grep find; do
-        if ! type -P $p >/dev/null; then
-            derror "Could not find '$p'. You should run $0 with '--nostrip'."
-            do_strip=no
-        fi
-    done
-fi
-
-if [[ $do_strip = yes ]] ; then
-    for f in $(find "$initdir" -type f \
-        \( -perm -0100 -or -perm -0010 -or -perm -0001 \
-           -or -path '*/lib/modules/*.ko' \) ); do
-        dinfo "Stripping $f"
-        strip -g "$f" 2>/dev/null|| :
-    done
-fi
-
-type hardlink &>/dev/null && {
-    hardlink "$initdir" 2>&1
-}
-
-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
-    done
-fi
-
-if ! ( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet| \
-    $compress > "$outfile"; ); then
-    dfatal "dracut: creation of $outfile failed"
-    exit 1
-fi
-
-dinfo "Wrote $outfile:"
-dinfo "$(ls -l "$outfile")"
-
-exit 0
--- a/dracut-bash-completion.sh
+++ b/dracut-bash-completion.sh
@@ -0,0 +1,79 @@
+#
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Copyright 2013 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/>.
+#
+
+__contains_word () {
+        local word=$1; shift
+        for w in $*; do [[ $w = $word ]] && return 0; done
+        return 1
+}
+
+_dracut() {
+        local field_vals= cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+        local -A OPTS=(
+                [STANDALONE]='-f -v -q -l -H -h -M -N
+                              --ro-mnt --force --kernel-only --no-kernel --strip --nostrip
+                              --hardlink --nohardlink --noprefix --mdadmconf --nomdadmconf
+                              --lvmconf --nolvmconf --debug --profile --verbose --quiet
+                              --local --hostonly --no-hostonly --fstab --help --bzip2 --lzma
+                              --xz --no-compress --gzip --list-modules --show-modules --keep
+                              --printsize --regenerate-all --noimageifnotneeded --early-microcode
+                              --no-early-microcode --print-cmdline --prelink --noprelink'
+
+                       [ARG]='-a -m -o -d -I -k -c -L --kver --add --force-add --add-drivers
+                              --omit-drivers --modules --omit --drivers --filesystems --install
+                              --fwdir --libdirs --fscks --add-fstab --mount --device --nofscks
+                              --kmoddir --conf --confdir --tmpdir --stdlog --compress --prefix
+                              --kernel-cmdline --sshkey --persistent-policy'
+        )
+
+        if __contains_word "$prev" ${OPTS[ARG]}; then
+                case $prev in
+                        --kmoddir|-k|--fwdir|--confdir|--tmpdir)
+                                comps=$(compgen -d -- "$cur")
+                                compopt -o filenames
+                        ;;
+                        -c|--conf|--sshkey|--add-fstab|--add-device|-I|--install)
+                                comps=$(compgen -f -- "$cur")
+                                compopt -o filenames
+                        ;;
+                        -a|-m|-o|--add|--modules|--omit)
+                                comps=$(dracut --list-modules 2>/dev/null)
+                        ;;
+                        --persistent-policy)
+                                comps=$(cd /dev/disk/; echo *)
+                        ;;
+                        --kver)
+                                comps=$(cd /lib/modules; echo [0-9]*)
+                        ;;
+                        *)
+                                return 0
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+        fi
+
+        if [[ $cur = -* ]]; then
+                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+                return 0
+        fi
+}
+
+complete -F _dracut dracut
--- 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
@@ -118,11 +118,11 @@ fi
 images+=($@)

 dinfo "Using base image $baseimage"
-cat "$baseimage" > "$outfile"
+cat -- "$baseimage" > "$outfile"

 for i in "${images[@]}"; do
    dinfo "Appending $i"
-    cat "$i" >> "$outfile"
+    cat -- "$i" >> "$outfile"
 done

 dinfo "Created $outfile"
--- a/1114
+++ b/1114
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
--- 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
@@ -1,10 +1,36 @@
-#!/bin/sh
+#!/bin/bash
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh

 set -e
+
+KERNEL_VERSION="$(uname -r)"
+
+[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
+SKIP="$dracutbasedir/skipcpio"
+[[ -x $SKIP ]] || SKIP=cat
+
+[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
+
+if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
+    IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
+fi
+[[ -f $IMG ]] || IMG="/boot/initramfs-${KERNEL_VERSION}.img"
+
 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 $SKIP "$IMG" | zcat | cpio -id --no-absolute-filenames --quiet >/dev/null; then
+    rm -f -- .need_shutdown
+elif $SKIP "$IMG" | xzcat | cpio -id --no-absolute-filenames --quiet >/dev/null; then
+    rm -f -- .need_shutdown
+elif $SKIP "$IMG" | lz4 -d -c | cpio -id --no-absolute-filenames --quiet >/dev/null; then
+    rm -f -- .need_shutdown
+else
+    # something failed, so we clean up
+    echo "Unpacking of $IMG to /run/initramfs failed" >&2
+    rm -f -- /run/initramfs/shutdown
+    exit 1
+fi
+
+exit 0
--- a/dracut-logger.sh
+++ b/dracut-logger.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 et filetype=sh
 #
@@ -23,7 +23,7 @@
 __DRACUT_LOGGER__=1


-## @brief Logging facility module for Dracut both at build- and boot-time.
+## @brief Logging facility module for dracut both at build- and boot-time.
 #
 # @section intro Introduction
 #
@@ -89,7 +89,7 @@ __DRACUT_LOGGER__=1
 # @see dlog_init()


-## @brief Initializes Dracut Logger.
+## @brief Initializes dracut Logger.
 #
 # @retval 1 if something has gone wrong
 # @retval 0 on success.
@@ -116,39 +116,56 @@ dlog_init() {

    if [ -z "$fileloglvl" ]; then
        [ -w "$logfile" ] && fileloglvl=4 || fileloglvl=0
-    elif [ $fileloglvl -gt 0 ]; then
-        __oldumask=$(umask)
-        umask 0377
-        ! [ -e "$logfile" ] && >"$logfile"
-        umask $__oldumask
-        if [ -w "$logfile" -a -f "$logfile" ]; then
+    elif (( $fileloglvl > 0 )); then
+        if [[ $logfile ]]; then
+            __oldumask=$(umask)
+            umask 0377
+            ! [ -e "$logfile" ] && >"$logfile"
+            umask $__oldumask
+            if [ -w "$logfile" -a -f "$logfile" ]; then
            # Mark new run in the log file
-            echo >>"$logfile"
-            if command -v date >/dev/null; then
-                echo "=== $(date) ===" >>"$logfile"
+                echo >>"$logfile"
+                if command -v date >/dev/null; then
+                    echo "=== $(date) ===" >>"$logfile"
+                else
+                    echo "===============================================" >>"$logfile"
+                fi
+                echo >>"$logfile"
            else
-                echo "===============================================" >>"$logfile"
-            fi
-            echo >>"$logfile"
-        else
            # We cannot log to file, so turn this facility off.
-            fileloglvl=0
-            ret=1
-            errmsg="'$logfile' is not a writable file"
+                fileloglvl=0
+                ret=1
+                errmsg="'$logfile' is not a writable file"
+            fi
        fi
    fi

-    if [ $sysloglvl -gt 0 ]; then
-        if ! [ -S /dev/log -a -w /dev/log ] || ! command -v logger >/dev/null
-        then
+    if (( $UID  != 0 )); then
+        kmsgloglvl=0
+        sysloglvl=0
+    fi
+
+    if (( $sysloglvl > 0 )); then
+        if [[ -d /run/systemd/journal ]] \
+            && type -P systemd-cat &>/dev/null \
+            && systemctl --quiet is-active systemd-journald.socket &>/dev/null \
+            && { echo "dracut-$DRACUT_VERSION" | systemd-cat -t 'dracut' &>/dev/null; } ; then
+            readonly _dlogdir="$(mktemp --tmpdir="$TMPDIR/" -d -t dracut-log.XXXXXX)"
+            readonly _systemdcatfile="$_dlogdir/systemd-cat"
+            mkfifo "$_systemdcatfile"
+            readonly _dlogfd=15
+            systemd-cat -t 'dracut' --level-prefix=true <"$_systemdcatfile" &
+            exec 15>"$_systemdcatfile"
+        elif ! [ -S /dev/log -a -w /dev/log ] || ! command -v logger >/dev/null; then
            # We cannot log to syslog, so turn this facility off.
+            kmsgloglvl=$sysloglvl
            sysloglvl=0
            ret=1
            errmsg="No '/dev/log' or 'logger' included for syslog logging"
        fi
    fi

-    if [ $sysloglvl -gt 0 -o $kmsgloglvl -gt 0 ]; then
+    if (($sysloglvl > 0)) || (($kmsgloglvl > 0 )); then
        if [ -n "$dracutbasedir" ]; then
            readonly syslogfacility=user
        else
@@ -159,11 +176,44 @@ dlog_init() {

    local lvl; local maxloglvl_l=0
    for lvl in $stdloglvl $sysloglvl $fileloglvl $kmsgloglvl; do
-        [ $lvl -gt $maxloglvl_l ] && maxloglvl_l=$lvl
+        (( $lvl > $maxloglvl_l )) && maxloglvl_l=$lvl
    done
    readonly maxloglvl=$maxloglvl_l
    export maxloglvl

+
+    if (($stdloglvl < 6)) && (($kmsgloglvl < 6)) && (($fileloglvl < 6)) && (($sysloglvl < 6)); then
+        unset dtrace
+        dtrace() { :; };
+    fi
+
+    if (($stdloglvl < 5)) && (($kmsgloglvl < 5)) && (($fileloglvl < 5)) && (($sysloglvl < 5)); then
+        unset ddebug
+        ddebug() { :; };
+    fi
+
+    if (($stdloglvl < 4)) && (($kmsgloglvl < 4)) && (($fileloglvl < 4)) && (($sysloglvl < 4)); then
+        unset dinfo
+        dinfo() { :; };
+    fi
+
+    if (($stdloglvl < 3)) && (($kmsgloglvl < 3)) && (($fileloglvl < 3)) && (($sysloglvl < 3)); then
+        unset dwarn
+        dwarn() { :; };
+        unset dwarning
+        dwarning() { :; };
+    fi
+
+    if (($stdloglvl < 2)) && (($kmsgloglvl < 2)) && (($fileloglvl < 2)) && (($sysloglvl < 2)); then
+        unset derror
+        derror() { :; };
+    fi
+
+    if (($stdloglvl < 1)) && (($kmsgloglvl < 1)) && (($fileloglvl < 1)) && (($sysloglvl < 1)); then
+        unset dfatal
+        dfatal() { :; };
+    fi
+
    [ -n "$errmsg" ] && derror "$errmsg"

    return $ret
@@ -273,16 +323,24 @@ _dlvl2syslvl() {
 _do_dlog() {
    local lvl="$1"; shift
    local lvlc=$(_lvl2char "$lvl") || return 0
-    local msg="$lvlc: $*"
+    local msg="$*"
+    local lmsg="$lvlc: $*"

-    [ $lvl -le $stdloglvl ] && echo "$msg" >&2
-    if [ $lvl -le $sysloglvl ]; then
-        logger -t "dracut[$$]" -p $(_lvl2syspri $lvl) "$msg"
+    (( $lvl <= $stdloglvl )) && echo "$msg" >&2
+
+    if (( $lvl <= $sysloglvl )); then
+        if [[ "$_dlogfd" ]]; then
+            printf -- "<%s>%s\n" "$(($(_dlvl2syslvl $lvl) & 7))" "$msg" >&$_dlogfd
+        else
+            logger -t "dracut[$$]" -p $(_lvl2syspri $lvl) -- "$msg"
+        fi
    fi
-    if [ $lvl -le $fileloglvl -a -w "$logfile" -a -f "$logfile" ]; then
-        echo "$msg" >>"$logfile"
+
+    if (( $lvl <= $fileloglvl )) && [[ -w "$logfile" ]] && [[ -f "$logfile" ]]; then
+        echo "$lmsg" >>"$logfile"
    fi
-    [ $lvl -le $kmsgloglvl ] && \
+
+    (( $lvl <= $kmsgloglvl )) && \
        echo "<$(_dlvl2syslvl $lvl)>dracut[$$] $msg" >/dev/kmsg
 }

@@ -304,9 +362,9 @@ _do_dlog() {
 # echo "This is a warning" | dwarn
 dlog() {
    [ -z "$maxloglvl" ] && return 0
-    [ $1 -le $maxloglvl ] || return 0
+    (( $1 <= $maxloglvl )) || return 0

-    if [ $# -gt 1 ]; then
+    if (( $# > 1 )); then
        _do_dlog "$@"
    else
        while read line; do
--- a/dracut.8.asc
+++ b/dracut.8.asc
@@ -0,0 +1,503 @@
+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
+-----------
+
+Create an initramfs <image> for the kernel with the version <kernel version>.
+If <kernel version> is omitted, then the version of the actual running
+kernel is used. If <image> is omitted or empty, then the default location
+/boot/initramfs-<kernel version>.img is used.
+
+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).
+
+If you are dropped to an emergency shell, while booting your initramfs,
+the file _/run/initramfs/rdsosreport.txt_ is created, which can be safed to a
+(to be mounted by hand) partition (usually /boot) or a USB stick.
+Additional debugging info can be produced by adding **rd.debug** to the kernel
+command line. _/run/initramfs/rdsosreport.txt_ contains all logs and the output
+of some tools. It should be attached to any report about dracut problems.
+
+USAGE
+-----
+
+include::dracut.usage.asc[]
+
+OPTIONS
+-------
+**--kver** _<kernel version>_::
+    set the kernel version. This enables to specify the kernel version, without
+    specifying the location of the initramfs image. For example:
+----
+# dracut --kver 3.5.0-0.rc7.git1.2.fc18.x86_64
+----
+
+**-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-cmdline <parameters>**::
+    specify default kernel command line parameters
+
+
+**--kernel-only**::
+    only install kernel drivers and firmware files
+
+**--no-kernel**::
+    do not install kernel drivers and firmware files
+
+**--early-microcode**::
+    Combine early microcode with ramdisk
+
+**--no-early-microcode**::
+    Do not combine early microcode with ramdisk
+
+**--print-cmdline**::
+    print the kernel command line for the current disk layout
+
+**--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
+
+**--prelink**::
+    prelink binaries in the initramfs (default)
+
+**--noprelink**::
+    do not prelink binaries in the initramfs
+
+**--hardlink**::
+    hardlink files in the initramfs (default)
+
+**--nohardlink**::
+    do not hardlink files 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.
+
+**--logfile** _<logfile>_:: logfile to use; overrides any setting from
+    the configuration files.
+
+Default:
+    _/var/log/dracut.log_
+
+**-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 and generate host-specific configuration.
+
+[WARNING]
+====
+If chrooted to another root other than the real root device, use "--fstab" and
+provide a valid _/etc/fstab_.
+====
+
+**-N, --no-hostonly**::
+    Disable Host-Only mode
+
+**--hostonly-cmdline**:
+    Store kernel command line arguments needed in the initramfs
+
+**--no-hostonly-cmdline**:
+    Do not store kernel command line arguments needed in the initramfs
+
+**--persistent-policy** _<policy>_::
+    Use _<policy>_ to address disks and partitions.
+    _<policy>_ can be any directory name found in /dev/disk.
+    E.g. "by-uuid", "by-label"
+
+**--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>_ [_<dump frequency>_ [_<fsck order>_]]]"::
+    Mount _<device>_ on _<mountpoint>_ with _<filesystem type>_ in the
+    initramfs. _<filesystem options>_, _<dump options>_ and _<fsck order>_ can
+    be specified, see fstab manpage for the details.
+    The default _<filesystem options>_ is "defaults".
+    The default _<dump frequency>_ is "0".
+    the default _<fsck order>_ is "2".
+
+**--add-device** _<device>_ ::
+    Bring up _<device>_ in initramfs, _<device>_ should be the device name.
+    This can be useful in hostonly mode for resume support when your swap is on
+    LVM or an encrypted partition.
+    [NB --device can be used for compatibility with earlier releases]
+
+**-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 "lzma --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
+"lzma --compress=xz --check=crc32 --lzma2=dict=1MiB"
+====
+
+**--lzo**::
+    Compress the generated initramfs using lzop.
+[WARNING]
+====
+Make sure your kernel has lzo decompression support compiled in, otherwise you
+will not be able to boot.
+====
+
+**--lz4**::
+    Compress the generated initramfs using lz4.
+[WARNING]
+====
+Make sure your kernel has lz4 decompression support compiled in, otherwise you
+will not be able to boot.
+====
+
+**--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.
+
+**--printsize**::
+    Print out the module install size
+
+**--profile**:
+    Output profile information of the build process
+
+**--ro-mnt**:
+    Mount / and /usr read-only by default.
+
+**-L, --stdlog** _<level>_::
+    [0-6] Specify logging level (to standard error)
+----
+          0 - suppress any messages
+          1 - only fatal errors
+          2 - all errors
+          3 - warnings
+          4 - info
+          5 - debug info (here starts lots of output)
+          6 - trace info (and even more)
+----
+
+**--regenerate-all**::
+    Regenerate all initramfs images at the default location with the kernel
+    versions found on the system. Additional parameters are passed through.
+
+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
+
+_/usr/lib/dracut/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. Deprecated, better use
+    /etc/cmdline.d/*.conf.
+
+_/etc/cmdline.d/*.conf_::
+    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
+
+Victor Lowther
+
+Philippe Seewer
+
+Warren Togami
+
+Amadeusz Żołnowski
+
+Jeremy Katz
+
+David Dillow
+
+Will Woods
+
+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
@@ -0,0 +1,185 @@
+dracut
+======
+Harald Hoyer <harald@redhat.com>
+v3.0, October 2013
+
+:language: bash
+
+= Introduction
+This section is a modified version of
+http://en.wikipedia.org/wiki/Initrd which is licensed under the
+Creative Commons Attribution/Share-Alike License.
+
+== Definition
+An _initial ramdisk_ is a temporary file system used in the boot process of the
+Linux kernel. _initrd_ and _initramfs_ 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.
+
+== Rationale
+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.
+
+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).
+
+To further complicate matters, the root file system may be on a software RAID
+volume, LVM, NFS (on diskless workstations), or on an encrypted partition. All
+of these require special preparations to mount.
+
+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.
+
+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.
+
+== Implementation
+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:
+
+* The root file system itself
+* A boot image on an optical disc
+* A small ext2/ext3 or FAT-formatted partition on a local disk
+  (a _boot partition_)
+* A TFTP server (on systems that can boot from Ethernet)
+
+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.
+
+Depending on which algorithms were compiled statically into it, the kernel can
+currently unpack initrd/initramfs images compressed with gzip, bzip2 and LZMA.
+
+== Mount preparations
+dracut can generate a customized initrams image which contains only whatever is
+necessary to boot some particular computer, such as ATA, SCSI and filesystem
+kernel modules (host-only mode).
+
+dracut can also generate a more generic initramfs image (default mode).
+
+dracut's initramfs starts only with the device name of the root file system (or
+its UUID) and must discover everything else at boot time. A complex cascade of
+tasks must be performed to get the root file system mounted:
+
+* 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's detected hardware.
+
+* 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.
+
+* If the root file system is on NFS, dracut does then:
+** Bring up the primary network interface.
+** Invoke a DHCP client, with which it can obtain a DHCP lease.
+** Extract the name of the NFS share and the address of the NFS server from the
+lease.
+** Mount the NFS share.
+
+* If the root file system appears to be on a software RAID device, there is no
+way of knowing which devices the RAID volume spans; the standard MD utilities
+must be invoked to scan all available block devices with a raid signature and
+bring the required ones online.
+
+* If the root file system appears to be on a logical volume, the LVM utilities
+must be invoked to scan for and activate the volume group containing it.
+
+* If the root file system is on an encrypted block device:
+** 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 USB security dongle).
+
+* Create a decryption target with the device mapper.
+
+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 LVM, RAID or encryption to get at the root
+file system.
+
+When the root file system finally becomes visible:
+
+* Any maintenance tasks which cannot run on a mounted root file system
+are done.
+* The root file system is mounted read-only.
+* Any processes which must continue running (such as the rd.splash screen helper
+and its command FIFO) are hoisted into the newly-mounted root file system.
+
+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.
+
+If the systemd module is used in the initramfs, the ordering of the services
+started looks like <<dracutbootup7>>.
+
+== Dracut on shutdown
+
+On a systemd driven system, the dracut initramfs is also used for the shutdown
+procedure.
+
+The following steps are executed during a shutdown:
+
+* systemd switches to the shutdown.target
+* systemd starts
+  /lib/systemd/system/shutdown.target.wants/dracut-shutdown.service
+* dracut-shutdown.service executes /usr/lib/dracut/dracut-initramfs-restore
+  which unpacks the initramfs to /run/initramfs
+* systemd finishes shutdown.target
+* systemd kills all processes
+* systemd tries to unmount everything and mounts the remaining read-only
+* systemd checks, if there is a /run/initramfs/shutdown executable
+* if yes, it does a pivot_root to /run/initramfs and executes ./shutdown.
+  The old root is then mounted on /oldroot.
+  /usr/lib/dracut/modules.d/99shutdown/shutdown.sh is the shutdown executable.
+* shutdown will try to umount every /oldroot mount and calls the various
+  shutdown hooks from the dracut modules
+
+This ensures, that all devices are disassembled and unmounted cleanly.
+
+= User Manual
+
+:leveloffset: 1
+include::dracut.8.asc[]
+
+:leveloffset: 1
+[[dracutconf5]]
+include::dracut.conf.5.asc[]
+
+[[dracutcmdline7]]
+include::dracut.cmdline.7.asc[]
+
+[[lsinitrd1]]
+include::lsinitrd.1.asc[]
+
+[[mkinitrd8]]
+include::mkinitrd.8.asc[]
+
+= Developer Manual
+
+:leveloffset: 1
+[[dracutmodules7]]
+include::dracut.modules.7.asc[]
+
+[[dracutbootup7]]
+include::dracut.bootup.7.asc[]
+
+:leveloffset: 0
+[appendix]
+License
+-------
+This work is licensed under the Creative Commons Attribution/Share-Alike
+License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
+
--- a/dracut.bootup.7.asc
+++ b/dracut.bootup.7.asc
@@ -0,0 +1,123 @@
+DRACUT.BOOTUP(7)
+================
+:doctype: manpage
+:man source:   dracut
+:man manual:   dracut
+
+NAME
+----
+dracut.bootup - boot ordering in the initramfs
+
+DESCRIPTION
+-----------
+
+This flow chart illustrates the ordering of the services, if systemd is used in
+the dracut initramfs.
+----
+
+                                    systemd-journal.socket
+                                               |
+                                               v
+                                    dracut-cmdline.service
+                                               |
+                                               v
+                                    dracut-pre-udev.service
+                                               |
+                                               v
+                                     systemd-udevd.service
+                                               |
+                                               v
+local-fs-pre.target                dracut-pre-trigger.service
+         |                                     |
+         v                                     v
+ (various mounts)  (various swap  systemd-udev-trigger.service
+         |           devices...)               |             (various low-level   (various low-level
+         |               |                     |             services: seed,       API VFS mounts:
+         v               v                     v             tmpfiles, random     mqueue, configfs,
+  local-fs.target   swap.target     dracut-initqueue.service    sysctl, ...)        debugfs, ...)
+         |               |                     |                    |                    |
+         \_______________|____________________ | ___________________|____________________/
+                                              \|/
+                                               v
+                                        sysinit.target
+                                               |
+                             _________________/|\___________________
+                            /                  |                    \
+                            |                  |                    |
+                            v                  |                    v
+                        (various               |              rescue.service
+                       sockets...)             |                    |
+                            |                  |                    v
+                            v                  |              rescue.target
+                     sockets.target            |
+                            |                  |
+                            \_________________ |                                 emergency.service
+                                              \|                                         |
+                                               v                                         v
+                                         basic.target                             emergency.target
+                                               |
+                        ______________________/|
+                       /                       |
+                       |                       v
+                       |            dracut-pre-mount.service
+                       |                       |
+                       |                       v
+                       |                  sysroot.mount
+                       |                       |
+                       |                       v
+                       |             initrd-root-fs.target
+           (custom initrd services)            |
+                       |                       v
+                       |             dracut-mount.service
+                       |                       |
+                       |                       v
+                       |            initrd-parse-etc.service
+                       |                       |
+                       |                       v
+                       |            (sysroot-usr.mount and
+                       |             various mounts marked
+                       |               with fstab option
+                       |                x-initrd.mount)
+                       |                       |
+                       |                       v
+                       |                initrd-fs.target
+                       \______________________ |
+                                              \|
+                                               v
+                                          initrd.target
+                                               |
+                                               v
+                                    dracut-pre-pivot.service
+                                               |
+                                               v
+                                     initrd-cleanup.service
+                                          isolates to
+                                    initrd-switch-root.target
+                                               |
+                                               v
+                        ______________________/|
+                       /                       |
+                       |        initrd-udevadm-cleanup-db.service
+                       |                       |
+           (custom initrd services)            |
+                       |                       |
+                       \______________________ |
+                                              \|
+                                               v
+                                   initrd-switch-root.target
+                                               |
+                                               v
+                                   initrd-switch-root.service
+                                               |
+                                               v
+                                          switch-root
+----
+
+
+AUTHOR
+------
+Harald Hoyer
+
+SEE ALSO
+--------
+*dracut*(8) *bootup*(7)
--- a/dracut.cmdline.7.asc
+++ b/dracut.cmdline.7.asc
@@ -0,0 +1,927 @@
+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.
+
+[listing]
+.Example
+--
+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
+root=PARTUUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7
+--
+
+**rootfstype=**__<filesystem type>__:: "auto" if not specified.
+
+[listing]
+.Example
+--
+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.
+
+**ro**::
+    force mounting _/_ and _/usr_ (if it is a separate device) read-only.  If
+    none of ro and rw is present, both are mounted according to _/etc/fstab_.
+
+**rw**::
+    force mounting _/_ and _/usr_ (if it is a separate device) read-write.
+    See also ro option.
+
+**rootfallback=**__<path to blockdevice>__::
+    specify the block device to use as the root filesystem, if the normal root
+    cannot be found. This can only be a simple block device with a simple file
+    system, for which the filesystem driver is either compiled in, or added
+    manually to the initramfs. This parameter can be specified multiple times.
+
+**rd.auto** **rd.auto=1**::
+    enable autoassembly of special devices like cryptoLUKS, dmraid, mdraid or
+    lvm. Default is off as of dracut version >= 024.
+
+
+**rd.cmdline=ask**::
+    prompts the user for additional kernel command line parameters
+
+**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>__::
+    resume from a swap partition
+
+[listing]
+.Example
+--
+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
+--
+
+**rd.skipfsck**::
+    skip fsck for rootfs and _/usr_.  If you're mounting _/usr_ read-only and
+    the init system performs fsck before remount, you might want to use this
+    option to avoid duplication.
+
+
+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.
+
+**rd.retry=**__<seconds>__::
+    specify how long dracut should wait for devices to appear.
+    The default is 30 seconds. After 2/3 of the time, degraded raids are force
+    started. If you have hardware, which takes a very long time to announce its
+    drives, you might want to extend this value.
+
+**rd.noverifyssl**::
+    accept self-signed certificates for ssl downloads.
+
+**rd.ctty=**__<terminal device>__::
+   specify the controlling terminal for the console.
+   This is useful, if you have multiple "console=" arguments.
+
+[[dracutkerneldebug]]
+Debug
+~~~~~
+If you are dropped to an emergency shell, the file 
+_/run/initramfs/rdsosreport.txt_ is created, which can be safed to a (to be
+mounted by hand) partition (usually /boot) or a USB stick. Additional debugging
+info can be produced by adding **rd.debug** to the kernel command line.
+_/run/initramfs/rdsosreport.txt_ contains all logs and the output of some tools.
+It should be attached to any report about dracut problems.
+
+**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.
+    If systemd is active in the initramfs, all output is logged to the systemd
+    journal, which you can inspect with "journalctl -ab".
+    If systemd is not active, the logs are written to dmesg and
+    _/run/initramfs/init.log_.
+    If "quiet" is set, it also logs to the console.
+
+**rd.memdebug=[0-3]**::
+    Print memory usage info at various points, set the verbose level from 0 to 3.
+    
+    Higher level means more debugging output:
+
+----
+    0 - no output
+    1 - partial /proc/meminfo
+    2 - /proc/meminfo
+    3 - /proc/meminfo + /proc/slabinfo
+----
+
+**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
+~~~~
+**rd.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.
+
+[listing]
+.Example
+--
+rd.vconsole.keymap=de-latin1-nodeadkeys
+--
+
+**rd.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
+
+**rd.vconsole.unicode**::
+    boolean, indicating UTF-8 mode; will be written as UNICODE to
+    _/etc/vconsole.conf_ in the initramfs
+
+**rd.vconsole.font=**__<font base file name>__::
+    console font; taken from consolefonts directory; will be written as FONT to
+    _/etc/vconsole.conf_ in the initramfs.
+
+[listing]
+.Example
+--
+rd.vconsole.font=LatArCyrHeb-16
+--
+
+**rd.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
+
+**rd.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
+
+**rd.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.
+
+[listing]
+.Example
+--
+rd.locale.LANG=pl_PL.utf8
+--
+
+**rd.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:
+
+[listing]
+.Example
+--
+rd.luks.key=/foo/bar.key
+--
+
+As you see, you can skip colons in such a case.
+
+[NOTE]
+===============================
+dracut pipes key to cryptsetup with _-d -_ argument, therefore you need to pipe
+to crypsetup luksFormat with _-d -_, too!
+
+Here follows example for key encrypted with GPG:
+
+[listing]
+--
+gpg --quiet --decrypt rootkey.gpg | \
+cryptsetup -d - -v --cipher serpent-cbc-essiv:sha256 \
+--key-size 256 luksFormat /dev/sda3
+--
+
+If you use plain keys, just add path to _-d_ option:
+
+[listing]
+--
+cryptsetup -d rootkey.key -v --cipher serpent-cbc-essiv:sha256 \
+ --key-size 256 luksFormat /dev/sda3
+--
+===============================
+
+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.
+
+[listing]
+.Example
+--
+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
+~~~~~~~
+
+[IMPORTANT]
+=====================
+It is recommended to either bind an interface to a MAC with the **ifname**
+argument, or to use the systemd-udevd predictable network interface names.
+
+Predictable network interface device names based on:
+
+- firmware/bios-provided index numbers for on-board devices
+- firmware-provided pci-express hotplug slot index number
+- physical/geographical location of the hardware
+- the interface's MAC address
+
+See:
+http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames
+
+Two character prefixes based on the type of interface:
+
+en:: ethernet
+wl:: wlan
+ww:: wwan
+
+Type of names:
+
+o<index>:: on-board device index number
+s<slot>[f<function>][d<dev_id>]:: hotplug slot index number
+x<MAC>:: MAC address
+[P<domain>]p<bus>s<slot>[f<function>][d<dev_id>]:: PCI geographical location
+[P<domain>]p<bus>s<slot>[f<function>][u<port>][..][c<config>][i<interface>]:: USB port number chain
+
+All multi-function PCI devices will carry the [f<function>] number in the
+device name, including the function 0 device.
+
+When using PCI geography, The PCI domain is only prepended when it is not 0.
+
+For USB devices the full chain of port numbers of hubs is composed. If the
+name gets longer than the maximum number of 15 characters, the name is not
+exported.
+The usual USB configuration == 1 and interface == 0 values are suppressed.
+
+PCI ethernet card with firmware index "1"::
+* eno1
+
+PCI ethernet card in hotplug slot with firmware index number::
+* ens1
+
+PCI ethernet multi-function card with 2 ports::
+* enp2s0f0
+* enp2s0f1
+
+PCI wlan card::
+* wlp3s0
+
+USB built-in 3G modem::
+* wwp0s29u1u4i6
+
+USB Android phone::
+* enp0s29u1u2
+=====================
+
+**ip=**__{dhcp|on|any|dhcp6|auto6}__::
+    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
+
+**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>. This
+cannot be used in conjunction with the **ifname** argument for the
+same <interface>.
+=====================
+
+**ip=**__<client-IP>__:[__<peer>__]:__<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. __<peer>__ is optional and is the address of the remote endpoint
+    for pointopoint interfaces and it may be followed by a slash and a decimal
+    number, encoding the network prefix length.
+
+=====================
+<macaddr>::: optionally **set** <macaddr> on the <interface>. This
+cannot be used in conjunction with the **ifname** argument for the
+same <interface>.
+=====================
+
+**ip=**__<client-IP>__:[__<peer>__]:__<gateway-IP>__:__<netmask>__:__<client_hostname>__:__<interface>__:__{none|off|dhcp|on|any|dhcp6|auto6|ibft}__[:[__<dns1>__][:__<dns2>__]]::
+    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. __<peer>__ is optional and is the address of the remote endpoint
+    for pointopoint interfaces and it may be followed by a slash and a decimal
+    number, encoding the network prefix length.
+
+**ifname=**__<interface>__:__<MAC>__::
+    Assign network device name <interface> (ie "bootnet") to the NIC with
+    MAC <MAC>.
+
+WARNING: Do **not** use the default kernel naming scheme for the interface name,
+as it can conflict with the kernel names. So, don't use "eth[0-9]+" for the
+interface name. Better name it "bootnet" or "bluesocket".
+
+**rd.route=**__<net>__/__<netmask>__:__<gateway>__[:__<interface>__]::
+    Add a static route with route options, which are separated by a colon.
+    IPv6 addresses have to be put in brackets.
+
+[listing]
+.Example
+--
+    rd.route=192.168.200.0/24:192.168.100.222:ens10
+    rd.route=192.168.200.0/24:192.168.100.222
+    rd.route=192.168.200.0/24::ens10
+    rd.route=[2001:DB8:3::/8]:[2001:DB8:2::1]:ens10
+--
+
+**bootdev=**__<interface>__::
+    specify network interface to use routing and netroot information from.
+    Required if multiple ip= lines are used.
+
+**BOOTIF=**__<MAC>__::
+    specify network interface to use routing and netroot information from.
+
+**rd.bootif=0**::
+    Disable BOOTIF parsing, which is provided by PXE
+
+**nameserver=**__<IP>__ [**nameserver=**__<IP>__ ...]::
+    specify nameserver(s) to use
+
+**biosdevname=0**::
+    boolean, turn off biosdevname network interface renaming
+
+**rd.neednet=1**::
+    boolean, bring up network even without netroot set
+
+**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
+
+**team=**__<teammaster>__:__<teamslaves>__::
+    Setup team device <teammaster> on top of <teamslaves>.
+    <teamslaves> is a comma-separated list of physical (ethernet) interfaces.
+
+**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.
+
+[listing]
+.Example
+--
+    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_.
+
+CIFS
+~~~
+**root=**cifs://[__<username>__[:__<password>__]@]__<server-ip>__:__<root-dir>__::
+    mount cifs 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]. If a username or password are not specified
+as part of the root, then they must be passed on the command line through
+cifsuser/cifspass.
+
+WARNING: Passwords specified on the kernel command line are visible for all
+users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the
+network, when using DHCP with DHCP root-path.
+
+**cifsuser**=__<username>__::
+    Set the cifs username, if not specified as part of the root.
+
+**cifspass**=__<password>__::
+    Set the cifs password, if not specified as part of the root.
+
+WARNING: Passwords specified on the kernel command line are visible for all
+users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the
+network, when using DHCP with DHCP root-path.
+
+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].
+
+WARNING: Passwords specified on the kernel command line are visible for all
+users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the
+network, when using DHCP with DHCP root-path.
+
+[listing]
+.Example
+--
+root=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0
+--
+
+If servername is an IPv6 address, it has to be put in brackets:
+
+[listing]
+.Example
+--
+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:
+
+[listing]
+.Example
+--
+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:
+
+[listing]
+.Example
+--
+netroot=iscsi:[2001:DB8::1]::::iqn.2009-06.dracut:target0
+--
+
+WARNING: Passwords specified on the kernel command line are visible for all
+users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the
+network, when using DHCP with DHCP root-path.
+You may want to use rd.iscsi.firmware.
+
+**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+**)
+
+WARNING: Passwords specified on the kernel command line are visible for all
+users via the file _/proc/cmdline_ and via dmesg or can be sniffed on the
+network, when using DHCP with DHCP root-path.
+You may want to use rd.iscsi.firmware.
+
+**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.
+
+[listing]
+.Example
+--
+"netroot=iscsi rd.iscsi.firmware=1 rd.iscsi.param=node.session.timeo.replacement_timeout=30"
+--
+
+will result in
+
+[listing]
+--
+iscsistart -b --param node.session.timeo.replacement_timeout=30
+--
+
+**rd.iscsi.ibft** **rd.iscsi.ibft=1**:
+    Turn on iBFT autoconfiguration for the interfaces
+
+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=**....::
+    same syntax as the kernel module parameter (s390 only)
+
+ZFCP
+~~~~
+**rd.zfcp=**__<zfcp adaptor device bus ID>__,__<WWPN>__,__<FCPLUN>__::
+    rd.zfcp can be specified multiple times on the kernel command line.
+
+[listing]
+.Example
+--
+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.
+
+[listing]
+.Example
+--
+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,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.
+
+[listing]
+.Example
+--
+masterkey=/etc/keys/kmk-trusted.blob
+--
+
+**masterkeytype=**__<kernel master key type>__::
+    Set the type of the kernel master key.
+
+[listing]
+.Example
+--
+masterkeytype=trusted
+--
+
+**evmkey=**__<EVM key path name>__::
+    Set the path name of the EVM key.
+
+[listing]
+.Example
+--
+evmkey=/etc/keys/evm-trusted.blob
+--
+
+**ecryptfskey=**__<eCryptfs key path name>__::
+    Set the path name of the eCryptfs key.
+
+[listing]
+.Example
+--
+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
+
+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. Deprecated, better use
+    /etc/cmdline.d/*.conf.
+
+_/etc/cmdline.d/*.conf_::
+    Can contain additional command line options.
+
+AUTHOR
+------
+Harald Hoyer
+
+SEE ALSO
+--------
+*dracut*(8) *dracut.conf*(5)
--- a/dracut.cmdline.7.xml
+++ b/dracut.cmdline.7.xml
--- a/dracut.conf
+++ b/dracut.conf
@@ -1,17 +1,21 @@
+# PUT YOUR CONFIG HERE OR IN separate files named *.conf
+# in /etc/dracut.conf.d
+# SEE man dracut.conf(5)
+
 # Sample dracut config file

-logfile=/var/log/dracut.log
-fileloglvl=6
+#logfile=/var/log/dracut.log
+#fileloglvl=6

 # Exact list of dracut modules to use.  Modules not listed here are not going
 # to be included.  If you only want to add some optional modules use
 # add_dracutmodules option instead.
 #dracutmodules+=""

-# Dracut modules to omit
+# dracut modules to omit
 #omit_dracutmodules+=""

-# Dracut modules to add to the default
+# dracut modules to add to the default
 #add_dracutmodules+=""

 # additional kernel modules to the default
@@ -25,10 +29,10 @@ fileloglvl=6
 #

 # install local /etc/mdadm.conf
-mdadmconf="yes"
+#mdadmconf="no"

 # install local /etc/lvm/lvm.conf
-lvmconf="yes"
+#lvmconf="no"

 # A list of fsck tools to install. If it's not specified, module's hardcoded
 # default is used, currently: "umount mount /sbin/fsck* xfs_db xfs_check
@@ -38,3 +42,10 @@ lvmconf="yes"

 # inhibit installation of any fsck tools
 #nofscks="yes"
+
+# mount / and /usr read-only by default
+#ro_mnt="no"
+
+# set the directory for temporary files
+# default: /var/tmp
+#tmpdir=/tmp
--- a/dracut.conf.5.asc
+++ b/dracut.conf.5.asc
@@ -0,0 +1,196 @@
+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_
+_/usr/lib/dracut/dracut.conf.d/*.conf_
+
+Description
+-----------
+_dracut.conf_ is loaded during the initialisation phase of dracut. Command line
+parameter will overwrite any values set here.
+
+_*.conf_ files are read from /usr/lib/dracut/dracut.conf.d and
+/etc/dracut.conf.d. Files with the same name in /etc/dracut.conf.d will replace
+files in /usr/lib/dracut/dracut.conf.d.
+The files are then 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.
+
+dracut command line options will overwrite any values set here.
+
+Configuration files must have the extension .conf; other extensions are ignored.
+
+*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.
+
+*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)
+
+*do_prelink=*"__{yes|no}__"::
+    Prelink 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 and generate host-specific configuration.
+
+*hostonly_cmdline*"__{yes|no}__"::
+    If set, store the kernel command line arguments needed in the initramfs
+
+*persistent_policy=*"__<policy>__"::
+    Use _<policy>_ to address disks and partitions.
+    _<policy>_ can be any directory name found in /dev/disk.
+    E.g. "by-uuid", "by-label"
+
+*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.
+
+*add_device+=*" __<device>__ "::
+    Bring up _<device>_ in initramfs, _<device>_ should be the device name.
+    This can be useful in hostonly mode for resume support when your swap is on
+    LVM an encrypted partition.
+
+*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.
+
+*ro_mnt=*"__{yes|no}__"::
+    Mount _/_ and _/usr_ read-only by default.
+
+*kernel_cmdline=*"__parameters__"::
+    Specify default kernel command line parameters
+
+*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)
+
+*acpi_override=*"__{yes|no}__"::
+    [WARNING] ONLY USE THIS IF YOU KNOW WHAT YOU ARE DOING! +
+    Override BIOS provided ACPI tables. For further documentation read
+    Documentation/acpi/initrd_table_override.txt in the kernel sources.
+    Search for ACPI table files (must have .aml suffix) in acpi_table_dir=
+    directory (see below) and add them to a separate uncompressed cpio
+    archive. This cpio archive gets glued (concatenated, uncompressed one
+    must be the first one) to the compressed cpio archive. The first,
+    uncompressed cpio archive is for data which the kernel must be able
+    to access very early (and cannot make use of uncompress alogrithms yet)
+    like microcode or ACPI tables (default=no).
+
+*acpi_table_dir=*"__<dir>__"::
+    Directory to search for ACPI tables if acpi_override= is set to yes.
+
+*early_microcode=*"{yes|no}"::
+    Combine early microcode with ramdisk (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 the name of the included modules to standard output during build.
+
+*i18n_vars="__<variable mapping>__"::
+    Distribution specific variable mapping.
+    See dracut/modules.d/10i18n/README for a detailed description.
+
+*i18n_default_font=*"__<fontname>__"::
+    The font <fontname> to install, if not specified otherwise.
+    Default is "LatArCyrHeb-16".
+
+*i18n_install_all=*"__{yes|no}__"::
+    Install everything regardless of generic or hostonly mode.
+
+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
@@ -1,10 +1,17 @@
-# Dracut config file customized for RedHat/Fedora.
+# dracut config file customized for RedHat/Fedora.

 # 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 "
+i18n_default_font="latarcyrheb-sun16"
+i18n_install_all="yes"
 stdloglvl=3
-realinitpath="/usr/lib/systemd/systemd"
-install_items+=" vi /etc/virc ps grep cat rm openvt "
+sysloglvl=5
+install_items+=" vi /etc/virc ps grep cat rm "
+prefix="/"
+systemdutildir=/usr/lib/systemd
+systemdsystemunitdir=/usr/lib/systemd/system
+systemdsystemconfdir=/etc/systemd/system
+udevdir=/usr/lib/udev
+hostonly="yes"
+hostonly_cmdline="no"
+early_microcode="yes"
--- a/dracut.conf.d/gentoo-openrc.conf.example
+++ b/dracut.conf.d/gentoo-openrc.conf.example
@@ -1,9 +0,0 @@
-# /etc/dracut.conf.d/gentoo-openrc.conf
-# Dracut config file customized for Gentoo Base System release 2
-
-#
-# Modules
-#
-
-# i18n
-i18n_vars="/etc/conf.d/keymaps:keymap-KEYMAP,extended_keymaps-EXT_KEYMAPS /etc/conf.d/consolefont:consolefont-FONT,consoletranslation-FONT_MAP /etc/rc.conf:unicode-UNICODE"
--- a/dracut.conf.d/gentoo-systemd.conf.example
+++ b/dracut.conf.d/gentoo-systemd.conf.example
@@ -0,0 +1,5 @@
+# /etc/dracut.conf.d/gentoo-systemd.conf
+
+# Paths of systemd dirs on Gentoo
+systemdutildir=/usr/lib/systemd
+systemdsystemunitdir=/usr/lib/systemd/system
--- a/dracut.conf.d/gentoo.conf.example
+++ b/dracut.conf.d/gentoo.conf.example
@@ -1,9 +1,15 @@
 # /etc/dracut.conf.d/gentoo.conf
-# Dracut config file customized for Gentoo Base System release 1
+# dracut config file customized for Gentoo Base System release 2
+
+udevdir=/lib/udev
+ro_mnt=yes

 #
 # Modules
 #

 # i18n
-i18n_vars="/etc/conf.d/keymaps:KEYMAP,EXTENDED_KEYMAPS-EXT_KEYMAPS /etc/conf.d/consolefont:CONSOLEFONT-FONT,CONSOLETRANSLATION-FONT_MAP /etc/rc.conf:UNICODE"
+i18n_vars="/etc/conf.d/keymaps:keymap-KEYMAP,extended_keymaps-EXT_KEYMAPS /etc/conf.d/consolefont:consolefont-FONT,consoletranslation-FONT_MAP /etc/rc.conf:unicode-UNICODE"
+i18n_default_font="LatArCyrHeb-16"
+
+omit_drivers+=" i2o_scsi"
--- a/dracut.conf.d/suse.conf.example
+++ b/dracut.conf.d/suse.conf.example
@@ -1,2 +1,3 @@
 i18n_vars="/etc/sysconfig/language:RC_LANG-LANG,RC_LC_ALL-LC_ALL /etc/sysconfig/console:CONSOLE_UNICODEMAP-FONT_UNIMAP,CONSOLE_FONT-FONT,CONSOLE_SCREENMAP-FONT_MAP /etc/sysconfig/keyboard:KEYTABLE-KEYMAP"
+omit_drivers+=" i2o_scsi"

--- a/dracut.css
+++ b/dracut.css
--- a/dracut.modules.7.asc
+++ b/dracut.modules.7.asc
@@ -0,0 +1,299 @@
+DRACUT.MODULES(7)
+=================
+:doctype: manpage
+:man source:   dracut
+:man manual:   dracut
+
+NAME
+----
+dracut.modules - dracut modules
+
+DESCRIPTION
+-----------
+
+dracut uses a modular system to build and extend the initramfs image. All
+modules are located in _/usr/lib/dracut/modules.d_ or in _<git-src>/modules.d_.
+The most basic dracut module is _99base_. In _99base_ the initial shell script
+init is defined, which gets run by the kernel after initramfs loading. Although
+you can replace init with your own version of _99base_, 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 <<stages>>.
+
+The main script, which creates the initramfs is dracut itsself. It parses all
+arguments and sets up the directory, in which everything is installed. It then
+executes all check, install, installkernel 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 check, install and installkernel are found in in the file _dracut-functions_.
+These shell functions are available to all module installer (install,
+installkernel) scripts, without the need to source _dracut-functions_.
+
+A module can check the preconditions for install and installkernel with the
+check script. Also dependencies can be expressed with check. If a module passed
+check, install and installkernel 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 installkernel. All
+other files found in a module directory are module specific and mostly are hook
+scripts and udev rules.
+
+
+[[stages]]
+== Boot Process Stages
+
+dracut modules can insert custom script at various points, to control the boot
+process.
+These hooks are plain directories containing shell scripts ending with ".sh",
+which are sourced by init.
+Common used functions are in _dracut-lib.sh_, which can be sourced by any script.
+
+=== Hook: cmdline
+
+The _cmdline_ 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.
+
+In this hook the most important environment variable is defined: root. The
+second one is rootok, which indicates, that a module claimed to be able to parse
+the root defined. So for example, **root=**__iscsi:....__ will be claimed by the
+iscsi dracut module, which then sets rootok.
+
+=== Hook: pre-udev
+
+This hook is executed right after the cmdline hook and a check if root and
+rootok were set. Here modules can take action with the final root, and before
+udev has been run.
+
+=== Start Udev
+
+Now udev is started and the logging for udev is setup.
+
+=== Hook: pre-trigger
+
+In this hook, you can set udev environment variables with **udevadm control
+--property=KEY=_value_** or control the further execution of udev with
+udevadm.
+
+=== Trigger Udev
+
+udev is triggered by calling udevadm trigger, which sends add events for all
+devices and subsystems.
+
+=== Main Loop
+
+In the main loop of dracut loops until udev has settled and
+all scripts in _initqueue/finished_ returned true.
+In this loop there are three hooks, where scripts can be inserted
+by calling /sbin/initqueue.
+
+==== Initqueue
+
+This hook gets executed every time a script is inserted here, regardless of the
+udev state.
+
+==== Initqueue settled
+
+This hooks (initqueue/settled) gets executed every time udev has settled.
+
+==== Initqueue timeout
+
+This hooks (initqueue/timeout) gets executed, when the main loop counter becomes
+half of the rd.retry counter.
+
+==== Initqueue finished
+
+This hook (initqueue/finished) is called after udev has settled and
+if all scripts herein return 0 the main loop will be ended.
+Abritary scripts can be added here, to loop in the
+initqueue until something happens, which a dracut module wants to wait for.
+
+=== Hook: pre-mount
+
+Before the root device is mounted all scripts in the hook pre-mount are
+executed. In some cases (e.g. NFS) the real root device is already mounted,
+though.
+
+=== Hook: mount
+
+This hook is mainly to mount the real root device.
+
+=== Hook: pre-pivot
+
+This hook is called before cleanup hook, This is a good place for
+actions other than cleanups which need to be called before pivot.
+
+=== Hook: cleanup
+
+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.
+
+
+=== Cleanup and switch_root
+
+Init (or systemd) kills all udev processes, cleans up the environment,
+sets up the arguments for the real init process and finally calls switch_root.
+switch_root removes the whole filesystem hierarchy of the initramfs,
+chroot()s to the real root device and calls /sbin/init with the specified
+arguments.
+
+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.
+
+== Network Infrastructure
+
+FIXME
+
+== Writing a Module
+
+A simple example module is _96insmodpost_, which modprobes a kernel module after
+udev has settled and the basic device drivers have been loaded.
+
+All module installation information is in the file module-setup.sh.
+
+First we create a check() function, which just exits with 0 indicating that this
+module should be included by default.
+
+check():
+----
+return 0
+----
+
+The we create the install() function, which installs a cmdline hook with
+priority number 20 called _parse-insmodpost.sh_. It also installs the
+_insmodpost.sh_ script in _/sbin_.
+
+install():
+----
+inst_hook cmdline 20 "$moddir/parse-insmodpost.sh"
+inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
+----
+
+The _pase-instmodpost.sh_ parses the kernel command line for a argument
+rd.driver.post, blacklists the module from being autoloaded and installs the
+hook _insmodpost.sh_ in the _initqueue/settled_.
+
+_parse-insmodpost.sh_:
+----
+for p in $(getargs rd.driver.post=); do
+    echo "blacklist $p" >> /etc/modprobe.d/initramfsblacklist.conf
+    _do_insmodpost=1
+done
+
+[ -n "$_do_insmodpost" ] && /sbin/initqueue --settled --unique --onetime /sbin/insmodpost.sh
+unset _do_insmodpost
+
+----
+
+_insmodpost.sh_, which is called in the _initqueue/settled_ hook will just
+modprobe the kernel modules specified in all rd.driver.post kernel command line
+parameters. It runs after udev has settled and is only called once (--onetime).
+
+_insmodpost.sh_:
+----
+. /lib/dracut-lib.sh
+
+for p in $(getargs rd.driver.post=); do
+    modprobe $p
+done
+
+----
+
+
+=== module-setup.sh: check()
+
+_check()_ is called by dracut to evaluate the inclusion of a dracut module in
+the initramfs.
+
+$hostonly:: If the $hostonly variable is set, then the module check() function
+should be in "hostonly" mode, which means, that the check() should only return
+0, if the module is really needed to boot this specific host.
+
+check() should return with:
+
+0:: Include the dracut module in the initramfs.
+
+1:: Do not include the dracut module. The requirements are not fullfilled
+(missing tools, etc.)
+
+255:: Only include the dracut module, if another module requires it or if
+explicitly specified in the config file or on the argument list.
+
+
+=== module-setup.sh: depends()
+
+The function depends() should echo all other dracut module names the module
+depends on.
+
+=== module-setup.sh: cmdline()
+
+This function should print the kernel command line options needed to boot the
+current machine setup. It should start with a space and should not print a
+newline.
+
+=== module-setup.sh: install()
+
+The install() function is called to install everything non-kernel related.
+To install binaries, scripts, and other files, you can use the functions
+mentioned in <<creation>>.
+
+To address a file in the current module directory, use the variable "$moddir".
+
+=== module-setup.sh: installkernel()
+
+In installkernel() all kernel related files should be installed. You can use all
+of the functions mentioned in <<creation>> to install files.
+
+=== [[creation]]Creation Functions
+
+==== inst_multiple [-o] <file> [ <file> ...]
+
+installs multiple binaries and files. If executables are specified without a
+path, dracut will search the path PATH=/usr/sbin:/sbin:/usr/bin:/bin for the
+binary. If the option "-o" is given as the first parameter, a missing file does
+not lead to an error.
+
+==== inst <src> [<dst>]
+
+installs _one_ file <src> either to the same place in the initramfs or to an
+optional <dst>.
+
+==== inst_hook <hookdir> <prio> <src>
+
+installs an executable/script <src> in the dracut hook <hookdir> with priority
+<prio>.
+
+==== inst_rules <udevrule> [ <udevrule> ...]
+
+installs one ore more udev rules. Non-existant udev rules are reported, but do
+not let dracut fail.
+
+==== instmods <kernelmodule> [ <kernelmodule> ... ]
+
+instmods should be used only in the installkernel() function.
+
+instmods installs one or more kernel modules in the initramfs. <kernelmodule>
+can also be a whole subsystem, if prefixed with a "=", like "=drivers/net/team".
+
+instmods will not install the kernel module, if $hostonly is set and the kernel
+module is not currently needed by any /sys/*...*/uevent MODALIAS.
+To install a kernel module regardless of the hostonly mode use the form:
+----
+hostonly='' instmods <kernelmodule>
+----
+
+=== Initramfs Functions
+
+FIXME
+
+
+=== Network Modules
+
+FIXME
+
+AUTHOR
+------
+Harald Hoyer
+
+SEE ALSO
+--------
+*dracut*(8)
--- a/dracut.sh
+++ b/dracut.sh
--- a/dracut.spec
+++ b/dracut.spec
@@ -13,37 +13,49 @@ 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}
 Group: System/Base
 %endif
-License: GPLv2+
+
+# The entire source code is GPLv2+
+# except install/* which is LGPLv2+
+License: GPLv2+ and LGPLv2+
+
 URL: https://dracut.wiki.kernel.org/
+
 # Source can be generated by
 # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
 Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2

-BuildArch: noarch
-BuildRequires: dash bash git
+BuildRequires: bash git

-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: pkgconfig
 %endif
+%if 0%{?fedora}
+BuildRequires: bash-completion
+BuildRequires: pkgconfig
+%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
@@ -64,34 +76,52 @@ Provides: mkinitrd = 2.6.1
 Obsoletes: dracut-kernel < 005
 Provides:  dracut-kernel = %{version}-%{release}

-Requires: bash
-Requires: bzip2
+Obsoletes: dracut <= 029
+Obsoletes: dracut-norescue
+Provides:  dracut-norescue
+
+Requires: bash >= 4
 Requires: coreutils
 Requires: cpio
 Requires: filesystem >= 2.1.0
 Requires: findutils
 Requires: grep
-Requires: gzip
-Requires: module-init-tools >= 3.7-9
+Requires: hardlink
+Requires: gzip xz
+Requires: kmod
 Requires: sed
-Requires: udev
-Requires: util-linux >= 2.20
+Requires: kpartx
+
+%if 0%{?fedora} || 0%{?rhel} > 6
+Requires: util-linux >= 2.21
+Requires: systemd >= 199
+Requires: procps-ng
+Conflicts: grubby < 8.23
+%else
+Requires: udev > 166
+Requires: util-linux-ng >= 2.21
+%endif

 %if 0%{?fedora} || 0%{?rhel} > 6
 Conflicts: initscripts < 8.63-1
 Conflicts: plymouth < 0.8.0-0.2009.29.09.19.1
 %endif

+Conflicts: mdadm < 3.2.6-14
+
 %description
-Dracut contains tools to create a bootable initramfs for 2.6 Linux kernels.
+dracut contains tools to create a bootable initramfs for 2.6 Linux kernels.
 Unlike existing implementations, dracut does hard-code as little as possible
-into the initramfs. Dracut contains various modules which are driven by the
+into the initramfs. dracut contains various modules which are driven by the
 event-based udev. Having root on MD, DM, LVM2, LUKS is supported as well as
 NFS, iSCSI, NBD, FCoE with the dracut-network package.

 %package network
-Summary: Dracut modules to build a dracut initramfs with network support
+Summary: dracut modules to build a dracut initramfs with network support
 Requires: %{name} = %{version}-%{release}
+Requires: iputils
+Requires: iproute
+Requires: dhclient
 Obsoletes: dracut-generic < 008
 Provides:  dracut-generic = %{version}-%{release}

@@ -99,9 +129,9 @@ 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 || 0%{?suse_version}
 %package fips
-Summary: Dracut modules to build a dracut initramfs with an integrity check
+Summary: dracut modules to build a dracut initramfs with an integrity check
 Requires: %{name} = %{version}-%{release}
 Requires: hmaccalc
 %if 0%{?rhel} > 5
@@ -114,29 +144,47 @@ Requires: nss-softokn-freebl

 %description fips
 This package requires everything which is needed to build an
-all purpose initramfs with dracut, which does an integrity check.
+initramfs with dracut, which does an integrity check.
 %endif

 %package fips-aesni
-Summary: Dracut modules to build a dracut initramfs with an integrity check with aesni-intel
+Summary: dracut modules to build a dracut initramfs with an integrity check with aesni-intel
 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 
-and adds the aesni-intel kernel module.
+initramfs with dracut, which does an integrity check and adds the aesni-intel kernel module.

 %package caps
-Summary: Dracut modules to build a dracut initramfs which drops capabilities
+Summary: dracut modules to build a dracut initramfs which drops capabilities
 Requires: %{name} = %{version}-%{release}
 Requires: libcap

 %description caps
 This package requires everything which is needed to build an
-all purpose initramfs with dracut, which drops capabilities.
+initramfs with dracut, which drops capabilities.
+
+%package config-generic
+Summary: dracut configuration to turn off hostonly image generation
+Requires: %{name} = %{version}-%{release}
+Obsoletes: dracut-nohostonly
+Provides:  dracut-nohostonly
+
+%description config-generic
+This package provides the configuration to turn off the host specific initramfs
+generation with dracut and generates a generic image by default.
+
+%package config-rescue
+Summary: dracut configuration to turn on rescue image generation
+Requires: %{name} = %{version}-%{release}
+Obsoletes: dracut <= 029
+
+%description config-rescue
+This package provides the configuration to turn on the rescue initramfs
+generation with dracut.

 %package tools
-Summary: Dracut tools to build the local initramfs
+Summary: dracut tools to build the local initramfs
 Requires: %{name} = %{version}-%{release}

 %description tools
@@ -157,27 +205,42 @@ git am -p1 %{patches}
 %endif

 %build
-make
+%configure --systemdsystemunitdir=%{_unitdir} --bashcompletiondir=$(pkg-config --variable=completionsdir bash-completion) --libdir=%{_prefix}/lib
+
+make %{?_smp_mflags}

 %install
-%if 0%{?fedora} || 0%{?rhel} > 6
-rm -rf $RPM_BUILD_ROOT
+%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}
+make %{?_smp_mflags} install \
+     DESTDIR=$RPM_BUILD_ROOT \
+     libdir=%{_prefix}/lib

-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
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
+%if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} == 0
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
 %endif

+%if %{defined _unitdir}
+# for systemd, better use systemd-bootchart
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00bootchart
+%endif
+
+# we do not support dash in the initramfs
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
+
 # remove gentoo specific modules
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
+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
+%endif

 mkdir -p $RPM_BUILD_ROOT/boot/dracut
 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
@@ -185,62 +248,95 @@ 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
-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
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
+install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf
+install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/40-fips.conf
 %endif

 %if 0%{?suse_version}
-install -m 0644 dracut.conf.d/suse.conf.example   $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf
+install -m 0644 dracut.conf.d/suse.conf.example   $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf
 %endif

 %if 0%{?fedora} <= 12 && 0%{?rhel} < 6 && 0%{?suse_version} <= 9999
-rm $RPM_BUILD_ROOT%{_bindir}/mkinitrd
-rm $RPM_BUILD_ROOT%{_bindir}/lsinitrd
+rm -f -- $RPM_BUILD_ROOT%{_bindir}/mkinitrd
+rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd
 %endif

-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
+%if 0%{?fedora} || 0%{?rhel} > 6
+# FIXME: remove after F19
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d
+install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
+
+echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
+echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf
+%endif
+
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
+> $RPM_BUILD_ROOT/etc/system-fips
+%endif

 # create compat symlink
-mkdir -p $RPM_BUILD_ROOT/sbin
-ln -s /usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+ln -sr $RPM_BUILD_ROOT%{_bindir}/dracut $RPM_BUILD_ROOT%{_sbindir}/dracut

 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf -- $RPM_BUILD_ROOT

 %files
 %defattr(-,root,root,0755)
 %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
 %{_bindir}/dracut
 # compat symlink
-/sbin/dracut
+%{_sbindir}/dracut
+%{_datadir}/bash-completion/completions/dracut
+%{_datadir}/bash-completion/completions/lsinitrd
 %if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
 %{_bindir}/mkinitrd
 %{_bindir}/lsinitrd
 %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
-%config /etc/dracut.conf.d/01-dist.conf
+%{dracutlibdir}/dracut-install
+%{dracutlibdir}/skipcpio
+%config(noreplace) %{_sysconfdir}/dracut.conf
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+%{dracutlibdir}/dracut.conf.d/01-dist.conf
 %endif
-%dir /etc/dracut.conf.d
+%dir %{_sysconfdir}/dracut.conf.d
+%dir %{dracutlibdir}/dracut.conf.d
 %{_mandir}/man8/dracut.8*
+%{_mandir}/man8/*service.8*
+%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
+%{_mandir}/man8/mkinitrd.8*
+%{_mandir}/man1/lsinitrd.1*
+%endif
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.cmdline.7*
+%{_mandir}/man7/dracut.modules.7*
+%{_mandir}/man7/dracut.bootup.7*
 %{_mandir}/man5/dracut.conf.5*
+%if %{defined _unitdir}
+%{dracutlibdir}/modules.d/00systemd-bootchart
+%else
 %{dracutlibdir}/modules.d/00bootchart
-%{dracutlibdir}/modules.d/00dash
+%endif
+%{dracutlibdir}/modules.d/00bash
+%{dracutlibdir}/modules.d/03modsign
+%{dracutlibdir}/modules.d/03rescue
+%{dracutlibdir}/modules.d/04watchdog
 %{dracutlibdir}/modules.d/05busybox
 %{dracutlibdir}/modules.d/10i18n
-%{dracutlibdir}/modules.d/10rpmversion
 %{dracutlibdir}/modules.d/30convertfs
 %{dracutlibdir}/modules.d/45url-lib
+%{dracutlibdir}/modules.d/50drm
 %{dracutlibdir}/modules.d/50plymouth
+%{dracutlibdir}/modules.d/80cms
+%{dracutlibdir}/modules.d/90bcache
 %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90crypt
 %{dracutlibdir}/modules.d/90dm
@@ -250,7 +346,9 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/90lvm
 %{dracutlibdir}/modules.d/90mdraid
 %{dracutlibdir}/modules.d/90multipath
+%{dracutlibdir}/modules.d/90qemu
 %{dracutlibdir}/modules.d/91crypt-gpg
+%{dracutlibdir}/modules.d/91crypt-loop
 %{dracutlibdir}/modules.d/95debug
 %{dracutlibdir}/modules.d/95resume
 %{dracutlibdir}/modules.d/95rootfs-block
@@ -260,24 +358,46 @@ 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
+%endif
+%{dracutlibdir}/modules.d/97biosdevname
+%{dracutlibdir}/modules.d/98ecryptfs
+%{dracutlibdir}/modules.d/98pollcdrom
 %{dracutlibdir}/modules.d/98selinux
 %{dracutlibdir}/modules.d/98syslog
+%{dracutlibdir}/modules.d/98systemd
 %{dracutlibdir}/modules.d/98usrmount
 %{dracutlibdir}/modules.d/99base
 %{dracutlibdir}/modules.d/99fs-lib
 %{dracutlibdir}/modules.d/99img-lib
 %{dracutlibdir}/modules.d/99shutdown
-%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
-%{_unitdir}/*.service
-%{_unitdir}/*/*.service
+%if %{defined _unitdir}
+%{_unitdir}/dracut-shutdown.service
+%{_unitdir}/shutdown.target.wants/dracut-shutdown.service
+%{_unitdir}/dracut-cmdline.service
+%{_unitdir}/dracut-initqueue.service
+%{_unitdir}/dracut-mount.service
+%{_unitdir}/dracut-pre-mount.service
+%{_unitdir}/dracut-pre-pivot.service
+%{_unitdir}/dracut-pre-trigger.service
+%{_unitdir}/dracut-pre-udev.service
+%{_unitdir}/initrd.target.wants/dracut-cmdline.service
+%{_unitdir}/initrd.target.wants/dracut-initqueue.service
+%{_unitdir}/initrd.target.wants/dracut-mount.service
+%{_unitdir}/initrd.target.wants/dracut-pre-mount.service
+%{_unitdir}/initrd.target.wants/dracut-pre-pivot.service
+%{_unitdir}/initrd.target.wants/dracut-pre-trigger.service
+%{_unitdir}/initrd.target.wants/dracut-pre-udev.service
+
+%endif
+%if 0%{?fedora} || 0%{?rhel} > 6
+%{_prefix}/lib/kernel/install.d/50-dracut.install
 %endif

 %files network
@@ -286,17 +406,22 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/95fcoe
 %{dracutlibdir}/modules.d/95iscsi
 %{dracutlibdir}/modules.d/90livenet
+%{dracutlibdir}/modules.d/90qemu-net
+%{dracutlibdir}/modules.d/95cifs
 %{dracutlibdir}/modules.d/95nbd
 %{dracutlibdir}/modules.d/95nfs
 %{dracutlibdir}/modules.d/95ssh-client
 %{dracutlibdir}/modules.d/45ifcfg
 %{dracutlibdir}/modules.d/95znet
+%{dracutlibdir}/modules.d/95fcoe-uefi
+%{dracutlibdir}/modules.d/99uefi-lib

-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
 %files fips
 %defattr(-,root,root,0755)
 %{dracutlibdir}/modules.d/01fips
-%config(noreplace) /etc/dracut.conf.d/40-fips.conf
+%{dracutlibdir}/dracut.conf.d/40-fips.conf
+%config(missingok) /etc/system-fips
 %endif

 %files fips-aesni
@@ -310,12 +435,22 @@ 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
 %dir /var/lib/dracut/overlay

+%files config-generic
+%defattr(-,root,root,0755)
+%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
+
+%files config-rescue
+%defattr(-,root,root,0755)
+%{dracutlibdir}/dracut.conf.d/02-rescue.conf
+%if 0%{?fedora} || 0%{?rhel} > 6
+%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
+%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
+%endif
+
 %changelog
--- a/dracut.usage.asc
+++ b/dracut.usage.asc
@@ -0,0 +1,537 @@
+To create a initramfs image, the most simple command is:
+----
+# dracut
+----
+
+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-_++<kernel version>++_.img and
+contains the kernel modules of the currently active kernel with version
+_++<kernel version>++_.
+
+If the initramfs image already exists, dracut will display an error message, and
+to overwrite the existing image, you have to use the --force option.
+----
+# dracut --force
+----
+
+If you want to specify another filename for the resulting image you would issue
+a command like:
+----
+# dracut foobar.img
+----
+
+To generate an image for a specific kernel version, the command would be:
+----
+# dracut foobar.img 2.6.40-1.rc5.f20
+----
+
+A shortcut to generate the image at the default location for a specific kernel
+version is:
+----
+# dracut --kver 2.6.40-1.rc5.f20
+----
+
+If you want to create lighter, smaller initramfs images, you may want to specify
+the --hostonly or -H 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't put
+the disk on another controller or machine, and that you can't switch to another
+root filesystem, without recreating the initramfs image. The usage of the
+--hostonly 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.
+
+=== Inspecting the Contents
+To see the contents of the image created by dracut, you can use the lsinitrd
+tool.
+----
+# lsinitrd | less
+----
+
+To display the contents of a file in the initramfs also use the lsinitrd tool:
+----
+# lsinitrd -f /etc/ld.so.conf
+include ld.so.conf.d/*.conf
+----
+
+=== Adding dracut Modules
+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
+_/etc/dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_. See *dracut.conf*(5).
+You can also add dracut modules on the command line
+by using the -a or --add option:
+----
+# dracut --add bootchart initramfs-bootchart.img
+----
+
+To see a list of available dracut modules, use the --list-modules option:
+----
+# dracut --list-modules
+----
+
+=== Omitting dracut Modules
+Sometimes you don't want a dracut module to be included for reasons of speed,
+size or functionality. To do this, either specify the omit_dracutmodules
+variable in the _dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_ configuration
+file (see *dracut.conf*(5)), or use the -o or --omit option
+on the command line:
+----
+# dracut -o "multipath lvm" no-multipath-lvm.img
+----
+
+=== Adding Kernel Modules
+If you need a special kernel module in the initramfs, which is not
+automatically picked up by dracut, you have the use the --add-drivers option
+on the command line or  the drivers vaiable in  the _/etc/dracut.conf_
+or _/etc/dracut.conf.d/myconf.conf_ configuration file (see *dracut.conf*(5)):
+----
+# dracut --add-drivers mymod initramfs-with-mymod.img
+----
+
+=== Boot parameters
+An initramfs generated without the "hostonly" mode, 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 LABEL or UUID on the kernel command line for your root device, dracut
+will find it and boot from it.
+
+The kernel command line usually can be configured in _/boot/grub/grub.conf_, if
+grub is your bootloader and it also can be edited in the real boot process in
+the grub menu.
+
+The kernel command line can also be provided by the dhcp server with the
+root-path option. See <<NetworkBoot>>.
+
+For a full reference of all kernel command line parameters,
+see *dracut.cmdline*(5).
+
+To get a quick start for the suitable kernel command line on your system,
+use the __--print-cmdline__ option:
+----
+# dracut --print-cmdline
+ root=UUID=8b8b6f91-95c7-4da2-831b-171e12179081 rootflags=rw,relatime,discard,data=ordered rootfstype=ext4
+----
+
+==== Specifying the root Device
+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 root= option. The most basic one is root=_++<path to device
+node>++_:
+----
+root=/dev/sda2
+----
+
+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:
+----
+root=UUID=19e9dda3-5a38-484d-a9b0-fa6b067d0331
+----
+
+or
+
+----
+root=LABEL=myrootpartitionlabel
+----
+
+To see all UUIDs or LABELs on your system, do:
+----
+# ls -l /dev/disk/by-uuid
+----
+
+or
+
+----
+# ls -l /dev/disk/by-label
+----
+
+If your root partition is on the network see <<NetworkBoot>>.
+
+==== Keyboard Settings
+If you have to input passwords for encrypted disk volumes, you might want to set
+the keyboard layout and specify a display font.
+
+A typical german kernel command would contain:
+----
+rd.vconsole.font=latarcyrheb-sun16 rd.vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8
+----
+
+Setting these options can override the setting stored on your system, if you use
+a modern init system, like systemd.
+
+==== Blacklisting Kernel Modules
+Sometimes it is required to prevent the automatic kernel module loading of a
+specific kernel module. To do this, just add rd.blacklist=_++<kernel module
+name>++_, with _++<kernel module name>++_ not containing the _.ko_
+suffix, to the kernel command line. For example:
+----
+rd.driver.blacklist=mptsas rd.driver.blacklist=nouveau
+----
+
+The option can be specified multiple times on the kernel command line.
+
+==== Speeding up the Boot Process
+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 LVM volume or not on a raid partition, or
+that it lives inside a specific crypto LUKS encrypted volume. By default, dracut
+searches everywhere. A typical dracut kernel command line for a plain primary or
+logical partition would contain:
+----
+rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+----
+
+This turns off every automatic assembly of LVM, MD raids, DM raids and
+crypto LUKS.
+
+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.
+
+
+[[Injecting]]
+=== Injecting custom Files
+To add your own files to the initramfs image, you have several possibilities.
+
+The --include option let you specify a source path and a target path.
+For example
+----
+# dracut --include cmdline-preset /etc/cmdline.d/mycmdline.conf initramfs-cmdline-pre.img
+----
+will create an initramfs image, where the file cmdline-preset will be copied
+inside the initramfs to _/etc/cmdline.d/mycmdline.conf_. --include can only
+be specified once.
+
+
+----
+# mkdir -p rd.live.overlay/etc/cmdline.d
+# mkdir -p rd.live.overlay/etc/conf.d
+# echo "ip=dhcp" >> rd.live.overlay/etc/cmdline.d/mycmdline.conf
+# echo export FOO=testtest >> rd.live.overlay/etc/conf.d/testvar.conf
+# echo export BAR=testtest >> rd.live.overlay/etc/conf.d/testvar.conf
+# tree rd.live.overlay/
+rd.live.overlay/
+`-- etc
+    |-- cmdline.d
+    |   `-- mycmdline.conf
+    `-- conf.d
+        `-- testvar.conf
+
+# dracut --include rd.live.overlay / initramfs-rd.live.overlay.img
+----
+
+This will put the contents of the rd.live.overlay directory into the root of the
+initramfs image.
+
+The --install 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.
+
+
+----
+# dracut --install 'strace fsck.ext3 ssh' initramfs-dbg.img
+----
+
+This will create an initramfs with the strace, fsck.ext3 and ssh executables,
+together with the libraries needed to start those. The --install option can be
+specified multiple times.
+
+
+[[NetworkBoot]]
+=== Network Boot
+
+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.
+
+On a Red Hat Enterprise Linux or Fedora system, this means, you have to install
+the _dracut-network_ rpm package:
+
+
+----
+# yum install dracut-network
+----
+
+The resulting initramfs image can be served by a boot manager residing on your
+local hard drive or it can be served by a PXE/TFTP server.
+
+How to setup your PXE/TFTP server can be found in the
+http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/[Red
+Hat Enterprise Linux Storage Administration Guide].
+
+If you specify ip=dhcp 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 TFTP/DHCP server. If you can't pass a
+kernel command line, then you can inject _/etc/cmdline.d/mycmdline.conf_, with a
+method described in <<Injecting>>.
+
+==== Reducing the Image Size
+
+To reduce the size of the initramfs, you should create it with by ommitting all
+dracut modules, which you know, you don't need to boot the machine.
+
+You can also specify the exact dracut and kernel modules to produce a very tiny
+initramfs image.
+
+For example for a NFS image, you would do:
+
+
+----
+# dracut -m "nfs network  base" initramfs-nfs-only.img
+----
+
+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 --host-only option:
+
+
+----
+# dracut -m "nfs network base" --host-only initramfs-nfs-host-only.img
+----
+
+This will reduce the size of the initramfs image significantly.
+
+
+== Troubleshooting
+
+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:
+http://fedoraproject.org/wiki/How_to_debug_Dracut_problems
+
+
+[[identifying-your-problem-area]]
+=== Identifying your problem area
+. Remove ''rhgb'' and ''quiet'' from the kernel command line
+. Add ''rd.shell'' to the kernel command line. This will present a shell should
+dracut be unable to locate your root device
+. Add ''rd.shell rd.debug log_buf_len=1M'' to the kernel command line so that
+dracut shell commands are printed as they are executed
+. The file /run/initramfs/rdsosreport.txt is generated,
+which contains all the logs and the output of all significant tools, which are
+mentioned later.
+
+If you want to save that output, simply mount /boot by hand or insert an USB
+stick and mount that. Then you can store the output for later inspection.
+
+[[information-to-include-in-your-report]]
+=== Information to include in your report
+
+[[all-bug-reports]]
+==== All bug reports
+In all cases, the following should be mentioned and attached to your bug report:
+
+* The exact kernel command-line used. Typically from the bootloader
+configuration file (e.g. _/etc/grub.conf_) or from _/proc/cmdline_.
+* A copy of your disk partition information from _/etc/fstab_, which might be
+obtained booting an old working initramfs or a rescue medium.
+* Turn on dracut debugging (see _the 'debugging dracut' section_), and attach
+the file /run/initramfs/rdsosreport.txt.
+* If you use a dracut configuration file, please include _/etc/dracut.conf_ and
+all files in _/etc/dracut.conf.d/*.conf_
+
+[[network-root-device-related-problems]]
+==== Network root device related problems
+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 <<all-bug-reports>>, include the
+following information:
+
+
+* Please include the output of
+
+----
+# /sbin/ifup <interfacename>
+# ip addr show
+----
+
+[[debugging-dracut]]
+=== Debugging dracut
+
+
+[[configure-a-serial-console]]
+==== Configure a serial console
+
+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.
+
+. First, enable serial console output for both the kernel and the bootloader.
+. Open the file _/etc/grub.conf_ for editing. Below the line ''timeout=5'', add
+the following:
+
+----
+serial --unit=0 --speed=9600
+terminal --timeout=5 serial console
+----
+
+. Also in _/etc/grub.conf_, add the following boot arguemnts to the ''kernel''
+line:
+
+----
+console=tty0 console=ttyS0,9600
+----
+
+. When finished, the _/etc/grub.conf_ file should look similar to the example
+below.
+
+----
+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
+----
+
+. More detailed information on how to configure the kernel for console output
+can be found at
+http://www.faqs.org/docs/Linux-HOWTO/Remote-Serial-Console-HOWTO.html#CONFIGURE-KERNEL.
+. Redirecting non-interactive output
+
+--
+NOTE: You can redirect all non-interactive output to _/dev/kmsg_ and the kernel
+will put it out on the console when it reaches the kernel buffer by doing
+
+----
+# exec >/dev/kmsg 2>&1 </dev/console
+----
+--
+
+[[using-the-dracut-shell]]
+==== Using the dracut shell
+
+dracut offers a shell for interactive debugging in the event dracut fails to
+locate your root filesystem. To enable the shell:
+
+. Add the boot parameter ''rd.shell'' to your bootloader configuration file
+(e.g. _/etc/grub.conf_)
+. Remove the boot arguments ''rhgb'' and ''quiet''
+
+A sample _/etc/grub.conf_ bootloader configuration file is listed below.
+
+----
+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
+----
+
+. If system boot fails, you will be dropped into a shell as seen in the example
+below.
+
+----
+No root device found
+Dropping to debug shell.
+
+#
+----
+
+. Use this shell prompt to gather the information requested above
+(see <<all-bug-reports>>).
+
+[[accessing-the-root-volume-from-the-dracut-shell]]
+==== Accessing the root volume from the dracut shell
+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:
+
+* A block device (e.g. _/dev/sda7_)
+* A LVM logical volume (e.g. _/dev/VolGroup00/LogVol00_)
+* An encrypted device
+  (e.g. _/dev/mapper/luks-4d5972ea-901c-4584-bd75-1da802417d83_)
+* A network attached device
+  (e.g. _netroot=iscsi:@192.168.0.4::3260::iqn.2009-02.org.example:for.all_)
+
+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 _/dev/root_ 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.
+
+. Inspect your partitions using parted
+
+----
+# 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
+----
+
+. You recall that your root volume was a LVM logical volume. Scan and activate
+any logical volumes.
+
+----
+# lvm vgscan
+# lvm vgchange -ay
+----
+
+. You should see any logical volumes now using the command blkid:
+
+----
+# blkid
+/dev/sda1: UUID="3de247f3-5de4-4a44-afc5-1fe179750cf7" TYPE="ext4"
+/dev/sda2: UUID="Ek4dQw-cOtq-5MJu-OGRF-xz5k-O2l8-wdDj0I" TYPE="LVM2_member"
+/dev/mapper/linux-root: UUID="def0269e-424b-4752-acf3-1077bf96ad2c" TYPE="crypto_LUKS"
+/dev/mapper/linux-home: UUID="c69127c1-f153-4ea2-b58e-4cbfa9257c5e" TYPE="ext3"
+/dev/mapper/linux-swap: UUID="47b4d329-975c-4c08-b218-f9c9bf3635f1" TYPE="swap"
+----
+
+. 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.
+
+----
+# 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.
+----
+
+. Next, make a symbolic link to the unlocked root volume
+
+----
+# ln -s /dev/mapper/luks-$UUID /dev/root
+----
+
+. With the root volume available, you may continue booting the system by exiting
+the dracut shell
+
+----
+# exit
+----
+
+[[additional-dracut-boot-parameters]]
+==== Additional dracut boot parameters
+For more debugging options, see *dracut.cmdline*(7).
+
+
+[[debugging-dracut-on-shutdown]]
+==== Debugging dracut on shutdown
+
+To debug the shutdown sequence on systemd systems, you can _rd.break_
+on _pre-shutdown_ or _shutdown_.
+
+To do this from an already booted system:
+----
+# mkdir -p /run/initramfs/etc/cmdline.d
+# echo "rd.break=pre-shutdown" > /run/initramfs/etc/cmdline.d/debug.conf
+# touch /run/initramfs/.need_shutdown
+----
+
+This will give you a dracut shell after the system pivot'ed back in the
+initramfs.
+
--- 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
@@ -1,26 +1,10 @@
 #!/usr/bin/perl

-sub last_tag {
-    open( GIT, 'git log  --pretty=format:%H |');
-  LINE: while( <GIT> ) {
-      open( GIT2, "git tag --contains $_ |");
-      while( <GIT2> ) {
-	  chomp;
-	  last LINE if /..*/;
-      }
-      close GIT2;
-  }
-    $tag=$_;
-    close GIT2;
-    close GIT;         # be done
-    return $tag;
-};
-
 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;
@@ -31,12 +15,12 @@ my $datestr = strftime "%Y%m%d", gmtime;

 my $tag=shift;
 my $pdir=shift;
-$tag=&last_tag if not defined $tag;
+$tag=`git describe --abbrev=0 --tags` if not defined $tag;
+chomp($tag);
 my @patches=&create_patches($tag, $pdir);
 my $num=$#patches + 2;
 $tag=~s/[^0-9]+?([0-9]+)/$1/;
-my $release="$num.git$datestr";
-$release="1" if $num == 1;
+my $release="$num";

 while(<>) {
    if (/^Version:/) {
--- a/install/.kateconfig
+++ b/install/.kateconfig
@@ -0,0 +1 @@
+kate: space-indent on; tab-width 8; indent-width 8; replace-tabs on; eol unix;
--- a/install/Makefile
+++ b/install/Makefile
@@ -0,0 +1,7 @@
+all:
+	$(MAKE) -C ..
+
+clean:
+	$(MAKE) -C .. clean
+
+.PHONY: all clean
--- a/install/dracut-install.c
+++ b/install/dracut-install.c
--- a/install/hashmap.c
+++ b/install/hashmap.c
@@ -0,0 +1,731 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "util.h"
+#include "hashmap.h"
+#include "macro.h"
+
+#define NBUCKETS 127
+
+struct hashmap_entry {
+        const void *key;
+        void *value;
+        struct hashmap_entry *bucket_next, *bucket_previous;
+        struct hashmap_entry *iterate_next, *iterate_previous;
+};
+
+struct Hashmap {
+        hash_func_t hash_func;
+        compare_func_t compare_func;
+
+        struct hashmap_entry *iterate_list_head, *iterate_list_tail;
+        unsigned n_entries;
+
+        bool from_pool;
+};
+
+#define BY_HASH(h) ((struct hashmap_entry**) ((uint8_t*) (h) + ALIGN(sizeof(Hashmap))))
+
+struct pool {
+        struct pool *next;
+        unsigned n_tiles;
+        unsigned n_used;
+};
+
+static struct pool *first_hashmap_pool = NULL;
+static void *first_hashmap_tile = NULL;
+
+static struct pool *first_entry_pool = NULL;
+static void *first_entry_tile = NULL;
+
+static void* allocate_tile(struct pool **first_pool, void **first_tile, size_t tile_size) {
+        unsigned i;
+
+        if (*first_tile) {
+                void *r;
+
+                r = *first_tile;
+                *first_tile = * (void**) (*first_tile);
+                return r;
+        }
+
+        if (_unlikely_(!*first_pool) || _unlikely_((*first_pool)->n_used >= (*first_pool)->n_tiles)) {
+                unsigned n;
+                size_t size;
+                struct pool *p;
+
+                n = *first_pool ? (*first_pool)->n_tiles : 0;
+                n = MAX(512U, n * 2);
+                size = PAGE_ALIGN(ALIGN(sizeof(struct pool)) + n*tile_size);
+                n = (size - ALIGN(sizeof(struct pool))) / tile_size;
+
+                p = malloc(size);
+                if (!p)
+                        return NULL;
+
+                p->next = *first_pool;
+                p->n_tiles = n;
+                p->n_used = 0;
+
+                *first_pool = p;
+        }
+
+        i = (*first_pool)->n_used++;
+
+        return ((uint8_t*) (*first_pool)) + ALIGN(sizeof(struct pool)) + i*tile_size;
+}
+
+static void deallocate_tile(void **first_tile, void *p) {
+        * (void**) p = *first_tile;
+        *first_tile = p;
+}
+
+#ifndef __OPTIMIZE__
+
+static void drop_pool(struct pool *p) {
+        while (p) {
+                struct pool *n;
+                n = p->next;
+                free(p);
+                p = n;
+        }
+}
+
+__attribute__((destructor)) static void cleanup_pool(void) {
+        /* Be nice to valgrind */
+
+        drop_pool(first_hashmap_pool);
+        drop_pool(first_entry_pool);
+}
+
+#endif
+
+unsigned string_hash_func(const void *p) {
+        unsigned hash = 5381;
+        const signed char *c;
+
+        /* DJB's hash function */
+
+        for (c = p; *c; c++)
+                hash = (hash << 5) + hash + (unsigned) *c;
+
+        return hash;
+}
+
+int string_compare_func(const void *a, const void *b) {
+        return strcmp(a, b);
+}
+
+unsigned trivial_hash_func(const void *p) {
+        return PTR_TO_UINT(p);
+}
+
+int trivial_compare_func(const void *a, const void *b) {
+        return a < b ? -1 : (a > b ? 1 : 0);
+}
+
+Hashmap *hashmap_new(hash_func_t hash_func, compare_func_t compare_func) {
+        bool b;
+        Hashmap *h;
+        size_t size;
+
+        b = is_main_thread();
+
+        size = ALIGN(sizeof(Hashmap)) + NBUCKETS * sizeof(struct hashmap_entry*);
+
+        if (b) {
+                h = allocate_tile(&first_hashmap_pool, &first_hashmap_tile, size);
+                if (!h)
+                        return NULL;
+
+                memset(h, 0, size);
+        } else {
+                h = malloc0(size);
+
+                if (!h)
+                        return NULL;
+        }
+
+        h->hash_func = hash_func ? hash_func : trivial_hash_func;
+        h->compare_func = compare_func ? compare_func : trivial_compare_func;
+
+        h->n_entries = 0;
+        h->iterate_list_head = h->iterate_list_tail = NULL;
+
+        h->from_pool = b;
+
+        return h;
+}
+
+int hashmap_ensure_allocated(Hashmap **h, hash_func_t hash_func, compare_func_t compare_func) {
+        assert(h);
+
+        if (*h)
+                return 0;
+
+        if (!(*h = hashmap_new(hash_func, compare_func)))
+                return -ENOMEM;
+
+        return 0;
+}
+
+static void link_entry(Hashmap *h, struct hashmap_entry *e, unsigned hash) {
+        assert(h);
+        assert(e);
+
+        /* Insert into hash table */
+        e->bucket_next = BY_HASH(h)[hash];
+        e->bucket_previous = NULL;
+        if (BY_HASH(h)[hash])
+                BY_HASH(h)[hash]->bucket_previous = e;
+        BY_HASH(h)[hash] = e;
+
+        /* Insert into iteration list */
+        e->iterate_previous = h->iterate_list_tail;
+        e->iterate_next = NULL;
+        if (h->iterate_list_tail) {
+                assert(h->iterate_list_head);
+                h->iterate_list_tail->iterate_next = e;
+        } else {
+                assert(!h->iterate_list_head);
+                h->iterate_list_head = e;
+        }
+        h->iterate_list_tail = e;
+
+        h->n_entries++;
+        assert(h->n_entries >= 1);
+}
+
+static void unlink_entry(Hashmap *h, struct hashmap_entry *e, unsigned hash) {
+        assert(h);
+        assert(e);
+
+        /* Remove from iteration list */
+        if (e->iterate_next)
+                e->iterate_next->iterate_previous = e->iterate_previous;
+        else
+                h->iterate_list_tail = e->iterate_previous;
+
+        if (e->iterate_previous)
+                e->iterate_previous->iterate_next = e->iterate_next;
+        else
+                h->iterate_list_head = e->iterate_next;
+
+        /* Remove from hash table bucket list */
+        if (e->bucket_next)
+                e->bucket_next->bucket_previous = e->bucket_previous;
+
+        if (e->bucket_previous)
+                e->bucket_previous->bucket_next = e->bucket_next;
+        else
+                BY_HASH(h)[hash] = e->bucket_next;
+
+        assert(h->n_entries >= 1);
+        h->n_entries--;
+}
+
+static void remove_entry(Hashmap *h, struct hashmap_entry *e) {
+        unsigned hash;
+
+        assert(h);
+        assert(e);
+
+        hash = h->hash_func(e->key) % NBUCKETS;
+
+        unlink_entry(h, e, hash);
+
+        if (h->from_pool)
+                deallocate_tile(&first_entry_tile, e);
+        else
+                free(e);
+}
+
+void hashmap_free(Hashmap*h) {
+
+        if (!h)
+                return;
+
+        hashmap_clear(h);
+
+        if (h->from_pool)
+                deallocate_tile(&first_hashmap_tile, h);
+        else
+                free(h);
+}
+
+void hashmap_free_free(Hashmap *h) {
+        void *p;
+
+        while ((p = hashmap_steal_first(h)))
+                free(p);
+
+        hashmap_free(h);
+}
+
+void hashmap_clear(Hashmap *h) {
+        if (!h)
+                return;
+
+        while (h->iterate_list_head)
+                remove_entry(h, h->iterate_list_head);
+}
+
+static struct hashmap_entry *hash_scan(Hashmap *h, unsigned hash, const void *key) {
+        struct hashmap_entry *e;
+        assert(h);
+        assert(hash < NBUCKETS);
+
+        for (e = BY_HASH(h)[hash]; e; e = e->bucket_next)
+                if (h->compare_func(e->key, key) == 0)
+                        return e;
+
+        return NULL;
+}
+
+int hashmap_put(Hashmap *h, const void *key, void *value) {
+        struct hashmap_entry *e;
+        unsigned hash;
+
+        assert(h);
+
+        hash = h->hash_func(key) % NBUCKETS;
+
+        if ((e = hash_scan(h, hash, key))) {
+
+                if (e->value == value)
+                        return 0;
+
+                return -EEXIST;
+        }
+
+        if (h->from_pool)
+                e = allocate_tile(&first_entry_pool, &first_entry_tile, sizeof(struct hashmap_entry));
+        else
+                e = new(struct hashmap_entry, 1);
+
+        if (!e)
+                return -ENOMEM;
+
+        e->key = key;
+        e->value = value;
+
+        link_entry(h, e, hash);
+
+        return 1;
+}
+
+int hashmap_replace(Hashmap *h, const void *key, void *value) {
+        struct hashmap_entry *e;
+        unsigned hash;
+
+        assert(h);
+
+        hash = h->hash_func(key) % NBUCKETS;
+
+        if ((e = hash_scan(h, hash, key))) {
+                e->key = key;
+                e->value = value;
+                return 0;
+        }
+
+        return hashmap_put(h, key, value);
+}
+
+void* hashmap_get(Hashmap *h, const void *key) {
+        unsigned hash;
+        struct hashmap_entry *e;
+
+        if (!h)
+                return NULL;
+
+        hash = h->hash_func(key) % NBUCKETS;
+
+        if (!(e = hash_scan(h, hash, key)))
+                return NULL;
+
+        return e->value;
+}
+
+void* hashmap_remove(Hashmap *h, const void *key) {
+        struct hashmap_entry *e;
+        unsigned hash;
+        void *data;
+
+        if (!h)
+                return NULL;
+
+        hash = h->hash_func(key) % NBUCKETS;
+
+        if (!(e = hash_scan(h, hash, key)))
+                return NULL;
+
+        data = e->value;
+        remove_entry(h, e);
+
+        return data;
+}
+
+int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value) {
+        struct hashmap_entry *e;
+        unsigned old_hash, new_hash;
+
+        if (!h)
+                return -ENOENT;
+
+        old_hash = h->hash_func(old_key) % NBUCKETS;
+        if (!(e = hash_scan(h, old_hash, old_key)))
+                return -ENOENT;
+
+        new_hash = h->hash_func(new_key) % NBUCKETS;
+        if (hash_scan(h, new_hash, new_key))
+                return -EEXIST;
+
+        unlink_entry(h, e, old_hash);
+
+        e->key = new_key;
+        e->value = value;
+
+        link_entry(h, e, new_hash);
+
+        return 0;
+}
+
+int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value) {
+        struct hashmap_entry *e, *k;
+        unsigned old_hash, new_hash;
+
+        if (!h)
+                return -ENOENT;
+
+        old_hash = h->hash_func(old_key) % NBUCKETS;
+        if (!(e = hash_scan(h, old_hash, old_key)))
+                return -ENOENT;
+
+        new_hash = h->hash_func(new_key) % NBUCKETS;
+
+        if ((k = hash_scan(h, new_hash, new_key)))
+                if (e != k)
+                        remove_entry(h, k);
+
+        unlink_entry(h, e, old_hash);
+
+        e->key = new_key;
+        e->value = value;
+
+        link_entry(h, e, new_hash);
+
+        return 0;
+}
+
+void* hashmap_remove_value(Hashmap *h, const void *key, void *value) {
+        struct hashmap_entry *e;
+        unsigned hash;
+
+        if (!h)
+                return NULL;
+
+        hash = h->hash_func(key) % NBUCKETS;
+
+        if (!(e = hash_scan(h, hash, key)))
+                return NULL;
+
+        if (e->value != value)
+                return NULL;
+
+        remove_entry(h, e);
+
+        return value;
+}
+
+void *hashmap_iterate(Hashmap *h, Iterator *i, const void **key) {
+        struct hashmap_entry *e;
+
+        assert(i);
+
+        if (!h)
+                goto at_end;
+
+        if (*i == ITERATOR_LAST)
+                goto at_end;
+
+        if (*i == ITERATOR_FIRST && !h->iterate_list_head)
+                goto at_end;
+
+        e = *i == ITERATOR_FIRST ? h->iterate_list_head : (struct hashmap_entry*) *i;
+
+        if (e->iterate_next)
+                *i = (Iterator) e->iterate_next;
+        else
+                *i = ITERATOR_LAST;
+
+        if (key)
+                *key = e->key;
+
+        return e->value;
+
+at_end:
+        *i = ITERATOR_LAST;
+
+        if (key)
+                *key = NULL;
+
+        return NULL;
+}
+
+void *hashmap_iterate_backwards(Hashmap *h, Iterator *i, const void **key) {
+        struct hashmap_entry *e;
+
+        assert(i);
+
+        if (!h)
+                goto at_beginning;
+
+        if (*i == ITERATOR_FIRST)
+                goto at_beginning;
+
+        if (*i == ITERATOR_LAST && !h->iterate_list_tail)
+                goto at_beginning;
+
+        e = *i == ITERATOR_LAST ? h->iterate_list_tail : (struct hashmap_entry*) *i;
+
+        if (e->iterate_previous)
+                *i = (Iterator) e->iterate_previous;
+        else
+                *i = ITERATOR_FIRST;
+
+        if (key)
+                *key = e->key;
+
+        return e->value;
+
+at_beginning:
+        *i = ITERATOR_FIRST;
+
+        if (key)
+                *key = NULL;
+
+        return NULL;
+}
+
+void *hashmap_iterate_skip(Hashmap *h, const void *key, Iterator *i) {
+        unsigned hash;
+        struct hashmap_entry *e;
+
+        if (!h)
+                return NULL;
+
+        hash = h->hash_func(key) % NBUCKETS;
+
+        if (!(e = hash_scan(h, hash, key)))
+                return NULL;
+
+        *i = (Iterator) e;
+
+        return e->value;
+}
+
+void* hashmap_first(Hashmap *h) {
+
+        if (!h)
+                return NULL;
+
+        if (!h->iterate_list_head)
+                return NULL;
+
+        return h->iterate_list_head->value;
+}
+
+void* hashmap_first_key(Hashmap *h) {
+
+        if (!h)
+                return NULL;
+
+        if (!h->iterate_list_head)
+                return NULL;
+
+        return (void*) h->iterate_list_head->key;
+}
+
+void* hashmap_last(Hashmap *h) {
+
+        if (!h)
+                return NULL;
+
+        if (!h->iterate_list_tail)
+                return NULL;
+
+        return h->iterate_list_tail->value;
+}
+
+void* hashmap_steal_first(Hashmap *h) {
+        void *data;
+
+        if (!h)
+                return NULL;
+
+        if (!h->iterate_list_head)
+                return NULL;
+
+        data = h->iterate_list_head->value;
+        remove_entry(h, h->iterate_list_head);
+
+        return data;
+}
+
+void* hashmap_steal_first_key(Hashmap *h) {
+        void *key;
+
+        if (!h)
+                return NULL;
+
+        if (!h->iterate_list_head)
+                return NULL;
+
+        key = (void*) h->iterate_list_head->key;
+        remove_entry(h, h->iterate_list_head);
+
+        return key;
+}
+
+unsigned hashmap_size(Hashmap *h) {
+
+        if (!h)
+                return 0;
+
+        return h->n_entries;
+}
+
+bool hashmap_isempty(Hashmap *h) {
+
+        if (!h)
+                return true;
+
+        return h->n_entries == 0;
+}
+
+int hashmap_merge(Hashmap *h, Hashmap *other) {
+        struct hashmap_entry *e;
+
+        assert(h);
+
+        if (!other)
+                return 0;
+
+        for (e = other->iterate_list_head; e; e = e->iterate_next) {
+                int r;
+
+                if ((r = hashmap_put(h, e->key, e->value)) < 0)
+                        if (r != -EEXIST)
+                                return r;
+        }
+
+        return 0;
+}
+
+void hashmap_move(Hashmap *h, Hashmap *other) {
+        struct hashmap_entry *e, *n;
+
+        assert(h);
+
+        /* The same as hashmap_merge(), but every new item from other
+         * is moved to h. This function is guaranteed to succeed. */
+
+        if (!other)
+                return;
+
+        for (e = other->iterate_list_head; e; e = n) {
+                unsigned h_hash, other_hash;
+
+                n = e->iterate_next;
+
+                h_hash = h->hash_func(e->key) % NBUCKETS;
+
+                if (hash_scan(h, h_hash, e->key))
+                        continue;
+
+                other_hash = other->hash_func(e->key) % NBUCKETS;
+
+                unlink_entry(other, e, other_hash);
+                link_entry(h, e, h_hash);
+        }
+}
+
+int hashmap_move_one(Hashmap *h, Hashmap *other, const void *key) {
+        unsigned h_hash, other_hash;
+        struct hashmap_entry *e;
+
+        if (!other)
+                return 0;
+
+        assert(h);
+
+        h_hash = h->hash_func(key) % NBUCKETS;
+        if (hash_scan(h, h_hash, key))
+                return -EEXIST;
+
+        other_hash = other->hash_func(key) % NBUCKETS;
+        if (!(e = hash_scan(other, other_hash, key)))
+                return -ENOENT;
+
+        unlink_entry(other, e, other_hash);
+        link_entry(h, e, h_hash);
+
+        return 0;
+}
+
+Hashmap *hashmap_copy(Hashmap *h) {
+        Hashmap *copy;
+
+        assert(h);
+
+        if (!(copy = hashmap_new(h->hash_func, h->compare_func)))
+                return NULL;
+
+        if (hashmap_merge(copy, h) < 0) {
+                hashmap_free(copy);
+                return NULL;
+        }
+
+        return copy;
+}
+
+char **hashmap_get_strv(Hashmap *h) {
+        char **sv;
+        Iterator it;
+        char *item;
+        int n;
+
+        sv = new(char*, h->n_entries+1);
+        if (!sv)
+                return NULL;
+
+        n = 0;
+        HASHMAP_FOREACH(item, h, it)
+                sv[n++] = item;
+        sv[n] = NULL;
+
+        return sv;
+}
--- a/install/hashmap.h
+++ b/install/hashmap.h
@@ -0,0 +1,91 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef foohashmaphfoo
+#define foohashmaphfoo
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdbool.h>
+
+/* Pretty straightforward hash table implementation. As a minor
+ * optimization a NULL hashmap object will be treated as empty hashmap
+ * for all read operations. That way it is not necessary to
+ * instantiate an object for each Hashmap use. */
+
+typedef struct Hashmap Hashmap;
+typedef struct _IteratorStruct _IteratorStruct;
+typedef _IteratorStruct* Iterator;
+
+#define ITERATOR_FIRST ((Iterator) 0)
+#define ITERATOR_LAST ((Iterator) -1)
+
+typedef unsigned (*hash_func_t)(const void *p);
+typedef int (*compare_func_t)(const void *a, const void *b);
+
+unsigned string_hash_func(const void *p);
+int string_compare_func(const void *a, const void *b);
+
+unsigned trivial_hash_func(const void *p);
+int trivial_compare_func(const void *a, const void *b);
+
+Hashmap *hashmap_new(hash_func_t hash_func, compare_func_t compare_func);
+void hashmap_free(Hashmap *h);
+void hashmap_free_free(Hashmap *h);
+Hashmap *hashmap_copy(Hashmap *h);
+int hashmap_ensure_allocated(Hashmap **h, hash_func_t hash_func, compare_func_t compare_func);
+
+int hashmap_put(Hashmap *h, const void *key, void *value);
+int hashmap_replace(Hashmap *h, const void *key, void *value);
+void* hashmap_get(Hashmap *h, const void *key);
+void* hashmap_remove(Hashmap *h, const void *key);
+void* hashmap_remove_value(Hashmap *h, const void *key, void *value);
+int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value);
+int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value);
+
+int hashmap_merge(Hashmap *h, Hashmap *other);
+void hashmap_move(Hashmap *h, Hashmap *other);
+int hashmap_move_one(Hashmap *h, Hashmap *other, const void *key);
+
+unsigned hashmap_size(Hashmap *h);
+bool hashmap_isempty(Hashmap *h);
+
+void *hashmap_iterate(Hashmap *h, Iterator *i, const void **key);
+void *hashmap_iterate_backwards(Hashmap *h, Iterator *i, const void **key);
+void *hashmap_iterate_skip(Hashmap *h, const void *key, Iterator *i);
+
+void hashmap_clear(Hashmap *h);
+void *hashmap_steal_first(Hashmap *h);
+void *hashmap_steal_first_key(Hashmap *h);
+void* hashmap_first(Hashmap *h);
+void* hashmap_first_key(Hashmap *h);
+void* hashmap_last(Hashmap *h);
+
+char **hashmap_get_strv(Hashmap *h);
+
+#define HASHMAP_FOREACH(e, h, i) \
+        for ((i) = ITERATOR_FIRST, (e) = hashmap_iterate((h), &(i), NULL); (e); (e) = hashmap_iterate((h), &(i), NULL))
+
+#define HASHMAP_FOREACH_KEY(e, k, h, i) \
+        for ((i) = ITERATOR_FIRST, (e) = hashmap_iterate((h), &(i), (const void**) &(k)); (e); (e) = hashmap_iterate((h), &(i), (const void**) &(k)))
+
+#define HASHMAP_FOREACH_BACKWARDS(e, h, i) \
+        for ((i) = ITERATOR_LAST, (e) = hashmap_iterate_backwards((h), &(i), NULL); (e); (e) = hashmap_iterate_backwards((h), &(i), NULL))
+
+#endif
--- a/install/hashmap.lo
+++ b/install/hashmap.lo
@@ -0,0 +1,12 @@
+# src/shared/hashmap.lo - a libtool object file
+# Generated by libtool (GNU libtool) 2.4.2
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object='.libs/hashmap.o'
+
+# Name of the non-PIC object
+non_pic_object='hashmap.o'
+
--- a/install/log.c
+++ b/install/log.c
@@ -0,0 +1,294 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <stddef.h>
+
+#include "log.h"
+#include "util.h"
+#include "macro.h"
+
+#define SNDBUF_SIZE (8*1024*1024)
+
+static LogTarget log_target = LOG_TARGET_CONSOLE;
+static int log_max_level = LOG_WARNING;
+static int log_facility = LOG_DAEMON;
+
+static int console_fd = STDERR_FILENO;
+
+static bool show_location = false;
+
+/* Akin to glibc's __abort_msg; which is private and we hence cannot
+ * use here. */
+static char *log_abort_msg = NULL;
+
+void log_close_console(void) {
+
+        if (console_fd < 0)
+                return;
+
+        if (getpid() == 1) {
+                if (console_fd >= 3)
+                        close_nointr_nofail(console_fd);
+
+                console_fd = -1;
+        }
+}
+
+static int log_open_console(void) {
+
+        if (console_fd >= 0)
+                return 0;
+
+        if (getpid() == 1) {
+
+                console_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
+                if (console_fd < 0) {
+                        log_error("Failed to open /dev/console for logging: %s", strerror(-console_fd));
+                        return console_fd;
+                }
+
+                log_debug("Successfully opened /dev/console for logging.");
+        } else
+                console_fd = STDERR_FILENO;
+
+        return 0;
+}
+
+
+int log_open(void) {
+        return log_open_console();
+}
+
+
+void log_close(void) {
+        log_close_console();
+}
+
+
+void log_set_max_level(int level) {
+        assert((level & LOG_PRIMASK) == level);
+
+        log_max_level = level;
+}
+
+void log_set_facility(int facility) {
+        log_facility = facility;
+}
+
+static int write_to_console(
+                int level,
+                const char*file,
+                int line,
+                const char *func,
+                const char *buffer) {
+
+        char location[64];
+        struct iovec iovec[5];
+        unsigned n = 0;
+
+        if (console_fd < 0)
+                return 0;
+
+        zero(iovec);
+
+        IOVEC_SET_STRING(iovec[n++], "dracut-install: ");
+
+        if (show_location) {
+                snprintf(location, sizeof(location), "(%s:%u) ", file, line);
+                IOVEC_SET_STRING(iovec[n++], location);
+        }
+
+        IOVEC_SET_STRING(iovec[n++], buffer);
+        IOVEC_SET_STRING(iovec[n++], "\n");
+
+        if (writev(console_fd, iovec, n) < 0)
+                return -errno;
+
+        return 1;
+}
+
+static int log_dispatch(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        char *buffer) {
+
+        int r = 0;
+
+        if (log_target == LOG_TARGET_NULL)
+                return 0;
+
+        /* Patch in LOG_DAEMON facility if necessary */
+        if ((level & LOG_FACMASK) == 0)
+                level = log_facility | LOG_PRI(level);
+
+        do {
+                char *e;
+                int k = 0;
+
+                buffer += strspn(buffer, NEWLINE);
+
+                if (buffer[0] == 0)
+                        break;
+
+                if ((e = strpbrk(buffer, NEWLINE)))
+                        *(e++) = 0;
+
+                k = write_to_console(level, file, line, func, buffer);
+                if (k < 0)
+                        return k;
+                buffer = e;
+        } while (buffer);
+
+        return r;
+}
+
+int log_metav(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        const char *format,
+        va_list ap) {
+
+        char buffer[LINE_MAX];
+        int saved_errno, r;
+
+        if (_likely_(LOG_PRI(level) > log_max_level))
+                return 0;
+
+        saved_errno = errno;
+        vsnprintf(buffer, sizeof(buffer), format, ap);
+        char_array_0(buffer);
+
+        r = log_dispatch(level, file, line, func, buffer);
+        errno = saved_errno;
+
+        return r;
+}
+
+int log_meta(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        const char *format, ...) {
+
+        int r;
+        va_list ap;
+
+        va_start(ap, format);
+        r = log_metav(level, file, line, func, format, ap);
+        va_end(ap);
+
+        return r;
+}
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+_noreturn_ static void log_assert(const char *text, const char *file, int line, const char *func, const char *format) {
+        static char buffer[LINE_MAX];
+
+        snprintf(buffer, sizeof(buffer), format, text, file, line, func);
+
+        char_array_0(buffer);
+        log_abort_msg = buffer;
+
+        log_dispatch(LOG_CRIT, file, line, func, buffer);
+        abort();
+}
+#pragma GCC diagnostic pop
+
+_noreturn_ void log_assert_failed(const char *text, const char *file, int line, const char *func) {
+        log_assert(text, file, line, func, "Assertion '%s' failed at %s:%u, function %s(). Aborting.");
+}
+
+_noreturn_ void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func) {
+        log_assert(text, file, line, func, "Code should not be reached '%s' at %s:%u, function %s(). Aborting.");
+}
+
+void log_set_target(LogTarget target) {
+        assert(target >= 0);
+        assert(target < _LOG_TARGET_MAX);
+
+        log_target = target;
+}
+
+int log_set_target_from_string(const char *e) {
+        LogTarget t;
+
+        t = log_target_from_string(e);
+        if (t < 0)
+                return -EINVAL;
+
+        log_set_target(t);
+        return 0;
+}
+
+int log_set_max_level_from_string(const char *e) {
+        int t;
+
+        t = log_level_from_string(e);
+        if (t < 0)
+                return t;
+
+        log_set_max_level(t);
+        return 0;
+}
+
+void log_parse_environment(void) {
+        const char *e;
+
+        if ((e = getenv("DRACUT_LOG_TARGET")))
+                if (log_set_target_from_string(e) < 0)
+                        log_warning("Failed to parse log target %s. Ignoring.", e);
+
+        if ((e = getenv("DRACUT_LOG_LEVEL")))
+                if (log_set_max_level_from_string(e) < 0)
+                        log_warning("Failed to parse log level %s. Ignoring.", e);
+
+}
+
+LogTarget log_get_target(void) {
+        return log_target;
+}
+
+int log_get_max_level(void) {
+        return log_max_level;
+}
+
+
+static const char *const log_target_table[] = {
+        [LOG_TARGET_CONSOLE] = "console",
+        [LOG_TARGET_AUTO] = "auto",
+        [LOG_TARGET_SAFE] = "safe",
+        [LOG_TARGET_NULL] = "null"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(log_target, LogTarget);
--- a/install/log.h
+++ b/install/log.h
@@ -0,0 +1,115 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef foologhfoo
+#define foologhfoo
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <syslog.h>
+#include <stdbool.h>
+#include <stdarg.h>
+
+#include "macro.h"
+
+typedef enum LogTarget{
+        LOG_TARGET_CONSOLE,
+        LOG_TARGET_KMSG,
+        LOG_TARGET_JOURNAL,
+        LOG_TARGET_JOURNAL_OR_KMSG,
+        LOG_TARGET_SYSLOG,
+        LOG_TARGET_SYSLOG_OR_KMSG,
+        LOG_TARGET_AUTO, /* console if stderr is tty, JOURNAL_OR_KMSG otherwise */
+        LOG_TARGET_SAFE, /* console if stderr is tty, KMSG otherwise */
+        LOG_TARGET_NULL,
+        _LOG_TARGET_MAX,
+        _LOG_TARGET_INVALID = -1
+}  LogTarget;
+
+void log_set_target(LogTarget target);
+void log_set_max_level(int level);
+void log_set_facility(int facility);
+
+int log_set_target_from_string(const char *e);
+int log_set_max_level_from_string(const char *e);
+
+void log_show_color(bool b);
+void log_show_location(bool b);
+
+int log_show_color_from_string(const char *e);
+int log_show_location_from_string(const char *e);
+
+LogTarget log_get_target(void);
+int log_get_max_level(void);
+
+int log_open(void);
+void log_close(void);
+void log_forget_fds(void);
+
+void log_close_syslog(void);
+void log_close_journal(void);
+void log_close_kmsg(void);
+void log_close_console(void);
+
+void log_parse_environment(void);
+
+int log_meta(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        const char *format, ...) _printf_attr_(5,6);
+
+int log_metav(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        const char *format,
+        va_list ap);
+
+_noreturn_ void log_assert_failed(const char *text, const char *file, int line, const char *func);
+_noreturn_ void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func);
+
+/* This modifies the buffer passed! */
+int log_dump_internal(
+        int level,
+        const char*file,
+        int line,
+        const char *func,
+        char *buffer);
+
+#define log_full(level, ...) log_meta(level,   __FILE__, __LINE__, __func__, __VA_ARGS__)
+
+#define log_debug(...)   log_meta(LOG_DEBUG,   __FILE__, __LINE__, __func__, __VA_ARGS__)
+#define log_info(...)    log_meta(LOG_INFO,    __FILE__, __LINE__, __func__, __VA_ARGS__)
+#define log_notice(...)  log_meta(LOG_NOTICE,  __FILE__, __LINE__, __func__, __VA_ARGS__)
+#define log_warning(...) log_meta(LOG_WARNING, __FILE__, __LINE__, __func__, __VA_ARGS__)
+#define log_error(...)   log_meta(LOG_ERR,     __FILE__, __LINE__, __func__, __VA_ARGS__)
+
+/* This modifies the buffer passed! */
+#define log_dump(level, buffer) log_dump_internal(level, __FILE__, __LINE__, __func__, buffer)
+
+const char *log_target_to_string(LogTarget target);
+LogTarget log_target_from_string(const char *s);
+
+const char *log_level_to_string(int i);
+int log_level_from_string(const char *s);
+
+#endif
--- a/install/macro.h
+++ b/install/macro.h
@@ -0,0 +1,284 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <assert.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <inttypes.h>
+
+#define _printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
+#define _sentinel_ __attribute__ ((sentinel))
+#define _noreturn_ __attribute__((noreturn))
+#define _unused_ __attribute__ ((unused))
+#define _destructor_ __attribute__ ((destructor))
+#define _pure_ __attribute__ ((pure))
+#define _const_ __attribute__ ((const))
+#define _deprecated_ __attribute__ ((deprecated))
+#define _packed_ __attribute__ ((packed))
+#define _malloc_ __attribute__ ((malloc))
+#define _weak_ __attribute__ ((weak))
+#define _likely_(x) (__builtin_expect(!!(x),1))
+#define _unlikely_(x) (__builtin_expect(!!(x),0))
+#define _public_ __attribute__ ((visibility("default")))
+#define _hidden_ __attribute__ ((visibility("hidden")))
+#define _weakref_(x) __attribute__((weakref(#x)))
+#define _introspect_(x) __attribute__((section("introspect." x)))
+#define _alignas_(x) __attribute__((aligned(__alignof(x))))
+#define _cleanup_(x) __attribute__((cleanup(x)))
+
+/* automake test harness */
+#define EXIT_TEST_SKIP 77
+
+#define XSTRINGIFY(x) #x
+#define STRINGIFY(x) XSTRINGIFY(x)
+
+/* Rounds up */
+
+#define ALIGN4(l) (((l) + 3) & ~3)
+#define ALIGN8(l) (((l) + 7) & ~7)
+
+#if __SIZEOF_POINTER__ == 8
+#define ALIGN(l) ALIGN8(l)
+#elif __SIZEOF_POINTER__ == 4
+#define ALIGN(l) ALIGN4(l)
+#else
+#error "Wut? Pointers are neither 4 nor 8 bytes long?"
+#endif
+
+#define ALIGN_PTR(p) ((void*) ALIGN((unsigned long) p))
+#define ALIGN4_PTR(p) ((void*) ALIGN4((unsigned long) p))
+#define ALIGN8_PTR(p) ((void*) ALIGN8((unsigned long) p))
+
+static inline size_t ALIGN_TO(size_t l, size_t ali) {
+        return ((l + ali - 1) & ~(ali - 1));
+}
+
+#define ALIGN_TO_PTR(p, ali) ((void*) ALIGN_TO((unsigned long) p))
+
+#define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
+
+/*
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr: the pointer to the member.
+ * @type: the type of the container struct this is embedded in.
+ * @member: the name of the member within the struct.
+ *
+ */
+#define container_of(ptr, type, member)                                 \
+        __extension__ ({                                                \
+                        const typeof( ((type *)0)->member ) *__mptr = (ptr); \
+                        (type *)( (char *)__mptr - offsetof(type,member) ); \
+                })
+
+#undef MAX
+#define MAX(a,b)                                 \
+        __extension__ ({                         \
+                        typeof(a) _a = (a);      \
+                        typeof(b) _b = (b);      \
+                        _a > _b ? _a : _b;       \
+                })
+
+#define MAX3(x,y,z)                              \
+        __extension__ ({                         \
+                        typeof(x) _c = MAX(x,y); \
+                        MAX(_c, z);              \
+                })
+
+#undef MIN
+#define MIN(a,b)                                \
+        __extension__ ({                        \
+                        typeof(a) _a = (a);     \
+                        typeof(b) _b = (b);     \
+                        _a < _b ? _a : _b;      \
+                })
+
+#ifndef CLAMP
+#define CLAMP(x, low, high)                                             \
+        __extension__ ({                                                \
+                        typeof(x) _x = (x);                             \
+                        typeof(low) _low = (low);                       \
+                        typeof(high) _high = (high);                    \
+                        ((_x > _high) ? _high : ((_x < _low) ? _low : _x)); \
+                })
+#endif
+
+#define assert_se(expr)                                                 \
+        do {                                                            \
+                if (_unlikely_(!(expr)))                                \
+                        log_assert_failed(#expr, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+        } while (false)                                                 \
+
+/* We override the glibc assert() here. */
+#undef assert
+#ifdef NDEBUG
+#define assert(expr) do {} while(false)
+#else
+#define assert(expr) assert_se(expr)
+#endif
+
+#define assert_not_reached(t)                                           \
+        do {                                                            \
+                log_assert_failed_unreachable(t, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+        } while (false)
+
+#if defined(static_assert)
+#define assert_cc(expr)                         \
+        do {                                    \
+                static_assert(expr, #expr);     \
+        } while (false)
+#else
+#define assert_cc(expr)                         \
+        do {                                    \
+                switch (0) {                    \
+                case 0:                         \
+                case !!(expr):                  \
+                        ;                       \
+                }                               \
+        } while (false)
+#endif
+
+#define PTR_TO_UINT(p) ((unsigned int) ((uintptr_t) (p)))
+#define UINT_TO_PTR(u) ((void*) ((uintptr_t) (u)))
+
+#define PTR_TO_UINT32(p) ((uint32_t) ((uintptr_t) (p)))
+#define UINT32_TO_PTR(u) ((void*) ((uintptr_t) (u)))
+
+#define PTR_TO_ULONG(p) ((unsigned long) ((uintptr_t) (p)))
+#define ULONG_TO_PTR(u) ((void*) ((uintptr_t) (u)))
+
+#define PTR_TO_INT(p) ((int) ((intptr_t) (p)))
+#define INT_TO_PTR(u) ((void*) ((intptr_t) (u)))
+
+#define TO_INT32(p) ((int32_t) ((intptr_t) (p)))
+#define INT32_TO_PTR(u) ((void*) ((intptr_t) (u)))
+
+#define PTR_TO_LONG(p) ((long) ((intptr_t) (p)))
+#define LONG_TO_PTR(u) ((void*) ((intptr_t) (u)))
+
+#define memzero(x,l) (memset((x), 0, (l)))
+#define zero(x) (memzero(&(x), sizeof(x)))
+
+#define CHAR_TO_STR(x) ((char[2]) { x, 0 })
+
+#define char_array_0(x) x[sizeof(x)-1] = 0;
+
+#define IOVEC_SET_STRING(i, s)                  \
+        do {                                    \
+                struct iovec *_i = &(i);        \
+                char *_s = (char *)(s);         \
+                _i->iov_base = _s;              \
+                _i->iov_len = strlen(_s);       \
+        } while(false)
+
+static inline size_t IOVEC_TOTAL_SIZE(const struct iovec *i, unsigned n) {
+        unsigned j;
+        size_t r = 0;
+
+        for (j = 0; j < n; j++)
+                r += i[j].iov_len;
+
+        return r;
+}
+
+static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) {
+        unsigned j;
+
+        for (j = 0; j < n; j++) {
+                size_t sub;
+
+                if (_unlikely_(k <= 0))
+                        break;
+
+                sub = MIN(i[j].iov_len, k);
+                i[j].iov_len -= sub;
+                i[j].iov_base = (uint8_t*) i[j].iov_base + sub;
+                k -= sub;
+        }
+
+        return k;
+}
+
+#define VA_FORMAT_ADVANCE(format, ap)                                   \
+do {                                                                    \
+        int _argtypes[128];                                             \
+        size_t _i, _k;                                                  \
+        _k = parse_printf_format((format), ELEMENTSOF(_argtypes), _argtypes); \
+        assert(_k < ELEMENTSOF(_argtypes));                             \
+        for (_i = 0; _i < _k; _i++) {                                   \
+                if (_argtypes[_i] & PA_FLAG_PTR)  {                     \
+                        (void) va_arg(ap, void*);                       \
+                        continue;                                       \
+                }                                                       \
+                                                                        \
+                switch (_argtypes[_i]) {                                \
+                case PA_INT:                                            \
+                case PA_INT|PA_FLAG_SHORT:                              \
+                case PA_CHAR:                                           \
+                        (void) va_arg(ap, int);                         \
+                        break;                                          \
+                case PA_INT|PA_FLAG_LONG:                               \
+                        (void) va_arg(ap, long int);                    \
+                        break;                                          \
+                case PA_INT|PA_FLAG_LONG_LONG:                          \
+                        (void) va_arg(ap, long long int);               \
+                        break;                                          \
+                case PA_WCHAR:                                          \
+                        (void) va_arg(ap, wchar_t);                     \
+                        break;                                          \
+                case PA_WSTRING:                                        \
+                case PA_STRING:                                         \
+                case PA_POINTER:                                        \
+                        (void) va_arg(ap, void*);                       \
+                        break;                                          \
+                case PA_FLOAT:                                          \
+                case PA_DOUBLE:                                         \
+                        (void) va_arg(ap, double);                      \
+                        break;                                          \
+                case PA_DOUBLE|PA_FLAG_LONG_DOUBLE:                     \
+                        (void) va_arg(ap, long double);                 \
+                        break;                                          \
+                default:                                                \
+                        assert_not_reached("Unknown format string argument."); \
+                }                                                       \
+        }                                                               \
+} while(false)
+
+ /* Because statfs.t_type can be int on some architecures, we have to cast
+  * the const magic to the type, otherwise the compiler warns about
+  * signed/unsigned comparison, because the magic can be 32 bit unsigned.
+ */
+#define F_TYPE_CMP(a, b) (a == (typeof(a)) b)
+
+
+/* Returns the number of chars needed to format variables of the
+ * specified type as a decimal string. Adds in extra space for a
+ * negative '-' prefix. */
+
+#define DECIMAL_STR_MAX(type)                                           \
+        (1+(sizeof(type) <= 1 ? 3 :                                     \
+            sizeof(type) <= 2 ? 5 :                                     \
+            sizeof(type) <= 4 ? 10 :                                    \
+            sizeof(type) <= 8 ? 20 : sizeof(int[-2*(sizeof(type) > 8)])))
+
+#include "log.h"
--- a/install/util.c
+++ b/install/util.c
@@ -0,0 +1,279 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/syscall.h>
+
+#include "util.h"
+
+static inline pid_t gettid(void) {
+        return (pid_t) syscall(SYS_gettid);
+}
+
+size_t page_size(void) {
+        static __thread size_t pgsz = 0;
+        long r;
+
+        if (_likely_(pgsz > 0))
+                return pgsz;
+
+        assert_se((r = sysconf(_SC_PAGESIZE)) > 0);
+
+        pgsz = (size_t) r;
+
+        return pgsz;
+}
+
+bool endswith(const char *s, const char *postfix) {
+        size_t sl, pl;
+
+        assert(s);
+        assert(postfix);
+
+        sl = strlen(s);
+        pl = strlen(postfix);
+
+        if (pl == 0)
+                return true;
+
+        if (sl < pl)
+                return false;
+
+        return memcmp(s + sl - pl, postfix, pl) == 0;
+}
+int close_nointr(int fd) {
+        assert(fd >= 0);
+
+        for (;;) {
+                int r;
+
+                r = close(fd);
+                if (r >= 0)
+                        return r;
+
+                if (errno != EINTR)
+                        return -errno;
+        }
+}
+
+void close_nointr_nofail(int fd) {
+        int saved_errno = errno;
+
+        /* like close_nointr() but cannot fail, and guarantees errno
+         * is unchanged */
+
+        assert_se(close_nointr(fd) == 0);
+
+        errno = saved_errno;
+}
+
+int open_terminal(const char *name, int mode) {
+        int fd, r;
+        unsigned c = 0;
+
+        /*
+         * If a TTY is in the process of being closed opening it might
+         * cause EIO. This is horribly awful, but unlikely to be
+         * changed in the kernel. Hence we work around this problem by
+         * retrying a couple of times.
+         *
+         * https://bugs.launchpad.net/ubuntu/+source/linux/+bug/554172/comments/245
+         */
+
+        for (;;) {
+                if ((fd = open(name, mode)) >= 0)
+                        break;
+
+                if (errno != EIO)
+                        return -errno;
+
+                if (c >= 20)
+                        return -errno;
+
+                usleep(50 * USEC_PER_MSEC);
+                c++;
+        }
+
+        if (fd < 0)
+                return -errno;
+
+        if ((r = isatty(fd)) < 0) {
+                close_nointr_nofail(fd);
+                return -errno;
+        }
+
+        if (!r) {
+                close_nointr_nofail(fd);
+                return -ENOTTY;
+        }
+
+        return fd;
+}
+
+bool streq_ptr(const char *a, const char *b) {
+
+        /* Like streq(), but tries to make sense of NULL pointers */
+
+        if (a && b)
+                return streq(a, b);
+
+        if (!a && !b)
+                return true;
+
+        return false;
+}
+bool is_main_thread(void) {
+        static __thread int cached = 0;
+
+        if (_unlikely_(cached == 0))
+                cached = getpid() == gettid() ? 1 : -1;
+
+        return cached > 0;
+}
+
+int safe_atou(const char *s, unsigned *ret_u) {
+        char *x = NULL;
+        unsigned long l;
+
+        assert(s);
+        assert(ret_u);
+
+        errno = 0;
+        l = strtoul(s, &x, 0);
+
+        if (!x || *x || errno)
+                return errno ? -errno : -EINVAL;
+
+        if ((unsigned long) (unsigned) l != l)
+                return -ERANGE;
+
+        *ret_u = (unsigned) l;
+        return 0;
+}
+
+static const char *const log_level_table[] = {
+        [LOG_EMERG] = "emerg",
+        [LOG_ALERT] = "alert",
+        [LOG_CRIT] = "crit",
+        [LOG_ERR] = "err",
+        [LOG_WARNING] = "warning",
+        [LOG_NOTICE] = "notice",
+        [LOG_INFO] = "info",
+        [LOG_DEBUG] = "debug"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(log_level, int);
+
+char *strnappend(const char *s, const char *suffix, size_t b) {
+        size_t a;
+        char *r;
+
+        if (!s && !suffix)
+                return strdup("");
+
+        if (!s)
+                return strndup(suffix, b);
+
+        if (!suffix)
+                return strdup(s);
+
+        assert(s);
+        assert(suffix);
+
+        a = strlen(s);
+        if (b > ((size_t) -1) - a)
+                return NULL;
+
+        r = new(char, a+b+1);
+        if (!r)
+                return NULL;
+
+        memcpy(r, s, a);
+        memcpy(r+a, suffix, b);
+        r[a+b] = 0;
+
+        return r;
+}
+
+char *strappend(const char *s, const char *suffix) {
+        return strnappend(s, suffix, suffix ? strlen(suffix) : 0);
+}
+
+char *strjoin(const char *x, ...) {
+        va_list ap;
+        size_t l;
+        char *r, *p;
+
+        va_start(ap, x);
+
+        if (x) {
+                l = strlen(x);
+
+                for (;;) {
+                        const char *t;
+                        size_t n;
+
+                        t = va_arg(ap, const char *);
+                        if (!t)
+                                break;
+
+                        n = strlen(t);
+                        if (n > ((size_t) -1) - l) {
+                                va_end(ap);
+                                return NULL;
+                        }
+
+                        l += n;
+                }
+        } else
+                l = 0;
+
+        va_end(ap);
+
+        r = new(char, l+1);
+        if (!r)
+                return NULL;
+
+        if (x) {
+                p = stpcpy(r, x);
+
+                va_start(ap, x);
+
+                for (;;) {
+                        const char *t;
+
+                        t = va_arg(ap, const char *);
+                        if (!t)
+                                break;
+
+                        p = stpcpy(p, t);
+                }
+
+                va_end(ap);
+        } else
+                r[0] = 0;
+
+        return r;
+}
--- a/install/util.h
+++ b/install/util.h
@@ -0,0 +1,565 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef fooutilhfoo
+#define fooutilhfoo
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <inttypes.h>
+#include <time.h>
+#include <sys/time.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <signal.h>
+#include <sched.h>
+#include <limits.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <sys/resource.h>
+
+#include "macro.h"
+
+typedef uint64_t usec_t;
+typedef uint64_t nsec_t;
+
+typedef struct dual_timestamp {
+        usec_t realtime;
+        usec_t monotonic;
+} dual_timestamp;
+
+#define MSEC_PER_SEC  1000ULL
+#define USEC_PER_SEC  1000000ULL
+#define USEC_PER_MSEC 1000ULL
+#define NSEC_PER_SEC  1000000000ULL
+#define NSEC_PER_MSEC 1000000ULL
+#define NSEC_PER_USEC 1000ULL
+
+#define USEC_PER_MINUTE (60ULL*USEC_PER_SEC)
+#define NSEC_PER_MINUTE (60ULL*NSEC_PER_SEC)
+#define USEC_PER_HOUR (60ULL*USEC_PER_MINUTE)
+#define NSEC_PER_HOUR (60ULL*NSEC_PER_MINUTE)
+#define USEC_PER_DAY (24ULL*USEC_PER_HOUR)
+#define NSEC_PER_DAY (24ULL*NSEC_PER_HOUR)
+#define USEC_PER_WEEK (7ULL*USEC_PER_DAY)
+#define NSEC_PER_WEEK (7ULL*NSEC_PER_DAY)
+#define USEC_PER_MONTH (2629800ULL*USEC_PER_SEC)
+#define NSEC_PER_MONTH (2629800ULL*NSEC_PER_SEC)
+#define USEC_PER_YEAR (31557600ULL*USEC_PER_SEC)
+#define NSEC_PER_YEAR (31557600ULL*NSEC_PER_SEC)
+
+/* What is interpreted as whitespace? */
+#define WHITESPACE " \t\n\r"
+#define NEWLINE "\n\r"
+#define QUOTES "\"\'"
+#define COMMENTS "#;\n"
+
+#define FORMAT_TIMESTAMP_MAX 64
+#define FORMAT_TIMESTAMP_PRETTY_MAX 256
+#define FORMAT_TIMESPAN_MAX 64
+#define FORMAT_BYTES_MAX 8
+
+#define ANSI_HIGHLIGHT_ON "\x1B[1;39m"
+#define ANSI_HIGHLIGHT_RED_ON "\x1B[1;31m"
+#define ANSI_HIGHLIGHT_GREEN_ON "\x1B[1;32m"
+#define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m"
+#define ANSI_HIGHLIGHT_OFF "\x1B[0m"
+
+usec_t now(clockid_t clock);
+
+dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
+dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u);
+
+#define dual_timestamp_is_set(ts) ((ts)->realtime > 0)
+
+usec_t timespec_load(const struct timespec *ts);
+struct timespec *timespec_store(struct timespec *ts, usec_t u);
+
+usec_t timeval_load(const struct timeval *tv);
+struct timeval *timeval_store(struct timeval *tv, usec_t u);
+
+size_t page_size(void);
+#define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
+
+#define streq(a,b) (strcmp((a),(b)) == 0)
+#define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)
+
+bool streq_ptr(const char *a, const char *b);
+
+#define new(t, n) ((t*) malloc(sizeof(t)*(n)))
+
+#define new0(t, n) ((t*) calloc((n), sizeof(t)))
+
+#define newa(t, n) ((t*) alloca(sizeof(t)*(n)))
+
+#define newdup(t, p, n) ((t*) memdup(p, sizeof(t)*(n)))
+
+#define malloc0(n) (calloc((n), 1))
+
+static inline const char* yes_no(bool b) {
+        return b ? "yes" : "no";
+}
+
+static inline const char* strempty(const char *s) {
+        return s ? s : "";
+}
+
+static inline const char* strnull(const char *s) {
+        return s ? s : "(null)";
+}
+
+static inline const char *strna(const char *s) {
+        return s ? s : "n/a";
+}
+
+static inline bool isempty(const char *p) {
+        return !p || !p[0];
+}
+
+bool endswith(const char *s, const char *postfix);
+bool startswith(const char *s, const char *prefix);
+bool startswith_no_case(const char *s, const char *prefix);
+
+bool first_word(const char *s, const char *word);
+
+int close_nointr(int fd);
+void close_nointr_nofail(int fd);
+void close_many(const int fds[], unsigned n_fd);
+
+int parse_boolean(const char *v);
+int parse_usec(const char *t, usec_t *usec);
+int parse_nsec(const char *t, nsec_t *nsec);
+int parse_bytes(const char *t, off_t *bytes);
+int parse_pid(const char *s, pid_t* ret_pid);
+int parse_uid(const char *s, uid_t* ret_uid);
+#define parse_gid(s, ret_uid) parse_uid(s, ret_uid)
+
+int safe_atou(const char *s, unsigned *ret_u);
+int safe_atoi(const char *s, int *ret_i);
+
+int safe_atollu(const char *s, unsigned long long *ret_u);
+int safe_atolli(const char *s, long long int *ret_i);
+
+#if __WORDSIZE == 32
+static inline int safe_atolu(const char *s, unsigned long *ret_u) {
+        assert_cc(sizeof(unsigned long) == sizeof(unsigned));
+        return safe_atou(s, (unsigned*) ret_u);
+}
+static inline int safe_atoli(const char *s, long int *ret_u) {
+        assert_cc(sizeof(long int) == sizeof(int));
+        return safe_atoi(s, (int*) ret_u);
+}
+#else
+static inline int safe_atolu(const char *s, unsigned long *ret_u) {
+        assert_cc(sizeof(unsigned long) == sizeof(unsigned long long));
+        return safe_atollu(s, (unsigned long long*) ret_u);
+}
+static inline int safe_atoli(const char *s, long int *ret_u) {
+        assert_cc(sizeof(long int) == sizeof(long long int));
+        return safe_atolli(s, (long long int*) ret_u);
+}
+#endif
+
+static inline int safe_atou32(const char *s, uint32_t *ret_u) {
+        assert_cc(sizeof(uint32_t) == sizeof(unsigned));
+        return safe_atou(s, (unsigned*) ret_u);
+}
+
+static inline int safe_atoi32(const char *s, int32_t *ret_i) {
+        assert_cc(sizeof(int32_t) == sizeof(int));
+        return safe_atoi(s, (int*) ret_i);
+}
+
+static inline int safe_atou64(const char *s, uint64_t *ret_u) {
+        assert_cc(sizeof(uint64_t) == sizeof(unsigned long long));
+        return safe_atollu(s, (unsigned long long*) ret_u);
+}
+
+static inline int safe_atoi64(const char *s, int64_t *ret_i) {
+        assert_cc(sizeof(int64_t) == sizeof(long long int));
+        return safe_atolli(s, (long long int*) ret_i);
+}
+
+char *split(const char *c, size_t *l, const char *separator, char **state);
+char *split_quoted(const char *c, size_t *l, char **state);
+
+#define FOREACH_WORD(word, length, s, state)                            \
+        for ((state) = NULL, (word) = split((s), &(length), WHITESPACE, &(state)); (word); (word) = split((s), &(length), WHITESPACE, &(state)))
+
+#define FOREACH_WORD_SEPARATOR(word, length, s, separator, state)       \
+        for ((state) = NULL, (word) = split((s), &(length), (separator), &(state)); (word); (word) = split((s), &(length), (separator), &(state)))
+
+#define FOREACH_WORD_QUOTED(word, length, s, state)                     \
+        for ((state) = NULL, (word) = split_quoted((s), &(length), &(state)); (word); (word) = split_quoted((s), &(length), &(state)))
+
+pid_t get_parent_of_pid(pid_t pid, pid_t *ppid);
+int get_starttime_of_pid(pid_t pid, unsigned long long *st);
+
+int write_one_line_file(const char *fn, const char *line);
+int write_one_line_file_atomic(const char *fn, const char *line);
+int read_one_line_file(const char *fn, char **line);
+int read_full_file(const char *fn, char **contents, size_t *size);
+
+int parse_env_file(const char *fname, const char *separator, ...) _sentinel_;
+int load_env_file(const char *fname, char ***l);
+int write_env_file(const char *fname, char **l);
+
+char *strappend(const char *s, const char *suffix);
+char *strnappend(const char *s, const char *suffix, size_t length);
+
+char *replace_env(const char *format, char **env);
+char **replace_env_argv(char **argv, char **env);
+
+int readlink_malloc(const char *p, char **r);
+int readlink_and_make_absolute(const char *p, char **r);
+int readlink_and_canonicalize(const char *p, char **r);
+
+int reset_all_signal_handlers(void);
+
+char *strstrip(char *s);
+char *delete_chars(char *s, const char *bad);
+char *truncate_nl(char *s);
+
+char *file_in_same_dir(const char *path, const char *filename);
+
+int rmdir_parents(const char *path, const char *stop);
+
+int get_process_comm(pid_t pid, char **name);
+int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line);
+int get_process_exe(pid_t pid, char **name);
+int get_process_uid(pid_t pid, uid_t *uid);
+
+char hexchar(int x);
+int unhexchar(char c);
+char octchar(int x);
+int unoctchar(char c);
+char decchar(int x);
+int undecchar(char c);
+
+char *cescape(const char *s);
+char *cunescape(const char *s);
+char *cunescape_length(const char *s, size_t length);
+
+char *xescape(const char *s, const char *bad);
+
+char *bus_path_escape(const char *s);
+char *bus_path_unescape(const char *s);
+
+char *ascii_strlower(char *path);
+
+bool dirent_is_file(const struct dirent *de);
+bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix);
+
+bool ignore_file(const char *filename);
+
+bool chars_intersect(const char *a, const char *b);
+
+char *format_timestamp(char *buf, size_t l, usec_t t);
+char *format_timestamp_pretty(char *buf, size_t l, usec_t t);
+char *format_timespan(char *buf, size_t l, usec_t t);
+
+int make_stdio(int fd);
+int make_null_stdio(void);
+
+unsigned long long random_ull(void);
+
+#define __DEFINE_STRING_TABLE_LOOKUP(name,type,scope)                   \
+        scope const char *name##_to_string(type i) {                    \
+                if (i < 0 || i >= (type) ELEMENTSOF(name##_table))      \
+                        return NULL;                                    \
+                return name##_table[i];                                 \
+        }                                                               \
+        scope type name##_from_string(const char *s) {                  \
+                type i;                                                 \
+                unsigned u = 0;                                         \
+                assert(s);                                              \
+                for (i = 0; i < (type)ELEMENTSOF(name##_table); i++)    \
+                        if (name##_table[i] &&                          \
+                            streq(name##_table[i], s))                  \
+                                return i;                               \
+                if (safe_atou(s, &u) >= 0 &&                            \
+                    u < ELEMENTSOF(name##_table))                       \
+                        return (type) u;                                \
+                return (type) -1;                                       \
+        }                                                               \
+        struct __useless_struct_to_allow_trailing_semicolon__
+
+#define DEFINE_STRING_TABLE_LOOKUP(name,type) __DEFINE_STRING_TABLE_LOOKUP(name,type,)
+#define DEFINE_PRIVATE_STRING_TABLE_LOOKUP(name,type) __DEFINE_STRING_TABLE_LOOKUP(name,type,static)
+
+int fd_nonblock(int fd, bool nonblock);
+int fd_cloexec(int fd, bool cloexec);
+
+int close_all_fds(const int except[], unsigned n_except);
+
+bool fstype_is_network(const char *fstype);
+
+int chvt(int vt);
+
+int read_one_char(FILE *f, char *ret, usec_t timeout, bool *need_nl);
+int ask(char *ret, const char *replies, const char *text, ...);
+
+int reset_terminal_fd(int fd, bool switch_to_text);
+int reset_terminal(const char *name);
+
+int open_terminal(const char *name, int mode);
+int acquire_terminal(const char *name, bool fail, bool force, bool ignore_tiocstty_eperm);
+int release_terminal(void);
+
+int flush_fd(int fd);
+
+int ignore_signals(int sig, ...);
+int default_signals(int sig, ...);
+int sigaction_many(const struct sigaction *sa, ...);
+
+int close_pipe(int p[]);
+int fopen_temporary(const char *path, FILE **_f, char **_temp_path);
+
+ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll);
+ssize_t loop_write(int fd, const void *buf, size_t nbytes, bool do_poll);
+
+bool is_device_path(const char *path);
+
+int dir_is_empty(const char *path);
+
+void rename_process(const char name[8]);
+
+void sigset_add_many(sigset_t *ss, ...);
+
+char* gethostname_malloc(void);
+bool hostname_is_set(void);
+char* getlogname_malloc(void);
+
+int getttyname_malloc(int fd, char **r);
+int getttyname_harder(int fd, char **r);
+
+int get_ctty_devnr(pid_t pid, dev_t *d);
+int get_ctty(pid_t, dev_t *_devnr, char **r);
+
+int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
+int fchmod_and_fchown(int fd, mode_t mode, uid_t uid, gid_t gid);
+
+int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev);
+int rm_rf(const char *path, bool only_dirs, bool delete_root, bool honour_sticky);
+
+int pipe_eof(int fd);
+
+cpu_set_t* cpu_set_malloc(unsigned *ncpus);
+
+void status_vprintf(const char *status, bool ellipse, const char *format, va_list ap);
+void status_printf(const char *status, bool ellipse, const char *format, ...);
+void status_welcome(void);
+
+int fd_columns(int fd);
+unsigned columns(void);
+
+int fd_lines(int fd);
+unsigned lines(void);
+
+int running_in_chroot(void);
+
+char *ellipsize(const char *s, size_t length, unsigned percent);
+char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent);
+
+int touch(const char *path);
+
+char *unquote(const char *s, const char *quotes);
+char *normalize_env_assignment(const char *s);
+
+int wait_for_terminate(pid_t pid, siginfo_t *status);
+int wait_for_terminate_and_warn(const char *name, pid_t pid);
+
+_noreturn_ void freeze(void);
+
+bool null_or_empty(struct stat *st);
+int null_or_empty_path(const char *fn);
+
+DIR *xopendirat(int dirfd, const char *name, int flags);
+
+void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t);
+void dual_timestamp_deserialize(const char *value, dual_timestamp *t);
+
+char *fstab_node_to_udev_node(const char *p);
+
+bool tty_is_vc(const char *tty);
+bool tty_is_vc_resolve(const char *tty);
+bool tty_is_console(const char *tty);
+int vtnr_from_tty(const char *tty);
+const char *default_term_for_tty(const char *tty);
+
+void execute_directory(const char *directory, DIR *_d, char *argv[]);
+
+int kill_and_sigcont(pid_t pid, int sig);
+
+bool nulstr_contains(const char*nulstr, const char *needle);
+
+bool plymouth_running(void);
+
+void parse_syslog_priority(char **p, int *priority);
+void skip_syslog_pid(char **buf);
+void skip_syslog_date(char **buf);
+
+bool hostname_is_valid(const char *s);
+char* hostname_cleanup(char *s);
+
+char* strshorten(char *s, size_t l);
+
+int terminal_vhangup_fd(int fd);
+int terminal_vhangup(const char *name);
+
+int vt_disallocate(const char *name);
+
+int copy_file(const char *from, const char *to);
+int symlink_or_copy(const char *from, const char *to);
+int symlink_or_copy_atomic(const char *from, const char *to);
+
+int fchmod_umask(int fd, mode_t mode);
+
+bool display_is_local(const char *display);
+int socket_from_display(const char *display, char **path);
+
+int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const char **home);
+int get_group_creds(const char **groupname, gid_t *gid);
+
+int in_group(const char *name);
+
+int glob_exists(const char *path);
+
+int dirent_ensure_type(DIR *d, struct dirent *de);
+
+int in_search_path(const char *path, char **search);
+int get_files_in_directory(const char *path, char ***list);
+
+char *join(const char *x, ...) _sentinel_;
+
+bool is_main_thread(void);
+
+bool in_charset(const char *s, const char* charset);
+
+int block_get_whole_disk(dev_t d, dev_t *ret);
+
+int file_is_priv_sticky(const char *p);
+
+int strdup_or_null(const char *a, char **b);
+
+#define NULSTR_FOREACH(i, l)                                    \
+        for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)
+
+#define NULSTR_FOREACH_PAIR(i, j, l)                             \
+        for ((i) = (l), (j) = strchr((i), 0)+1; (i) && *(i); (i) = strchr((j), 0)+1, (j) = *(i) ? strchr((i), 0)+1 : (i))
+
+const char *ioprio_class_to_string(int i);
+int ioprio_class_from_string(const char *s);
+
+const char *sigchld_code_to_string(int i);
+int sigchld_code_from_string(const char *s);
+
+const char *log_facility_unshifted_to_string(int i);
+int log_facility_unshifted_from_string(const char *s);
+
+const char *log_level_to_string(int i);
+int log_level_from_string(const char *s);
+
+const char *sched_policy_to_string(int i);
+int sched_policy_from_string(const char *s);
+
+const char *rlimit_to_string(int i);
+int rlimit_from_string(const char *s);
+
+const char *ip_tos_to_string(int i);
+int ip_tos_from_string(const char *s);
+
+const char *signal_to_string(int i);
+int signal_from_string(const char *s);
+
+int signal_from_string_try_harder(const char *s);
+
+extern int saved_argc;
+extern char **saved_argv;
+
+bool kexec_loaded(void);
+
+int prot_from_flags(int flags);
+
+char *format_bytes(char *buf, size_t l, off_t t);
+
+int fd_wait_for_event(int fd, int event, usec_t timeout);
+
+void* memdup(const void *p, size_t l);
+
+int is_kernel_thread(pid_t pid);
+
+static inline void freep(void *p) {
+        free(*(void**) p);
+}
+
+static inline void fclosep(FILE **f) {
+        if (*f)
+                fclose(*f);
+}
+
+static inline void pclosep(FILE **f) {
+        if (*f)
+                pclose(*f);
+}
+
+static inline void closep(int *fd) {
+        if (*fd >= 0)
+                close_nointr_nofail(*fd);
+}
+
+static inline void closedirp(DIR **d) {
+        if (*d)
+                closedir(*d);
+}
+
+static inline void umaskp(mode_t *u) {
+        umask(*u);
+}
+
+#define _cleanup_free_ _cleanup_(freep)
+#define _cleanup_fclose_ _cleanup_(fclosep)
+#define _cleanup_pclose_ _cleanup_(pclosep)
+#define _cleanup_close_ _cleanup_(closep)
+#define _cleanup_closedir_ _cleanup_(closedirp)
+#define _cleanup_umask_ _cleanup_(umaskp)
+#define _cleanup_globfree_ _cleanup_(globfree)
+
+int fd_inc_sndbuf(int fd, size_t n);
+int fd_inc_rcvbuf(int fd, size_t n);
+
+int fork_agent(pid_t *pid, const int except[], unsigned n_except, const char *path, ...);
+
+int setrlimit_closest(int resource, const struct rlimit *rlim);
+
+int getenv_for_pid(pid_t pid, const char *field, char **_value);
+
+int can_sleep(const char *type);
+
+bool is_valid_documentation_url(const char *url);
+
+bool in_initrd(void);
+
+void warn_melody(void);
+
+char *strjoin(const char *x, ...) _sentinel_;
+
+#endif
--- a/67
+++ b/67
@@ -1,67 +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
-#
-# Copyright 2005-2010 Harald Hoyer <harald@redhat.com>
-# Copyright 2005-2010 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/>.
-#
-
-[[ $# -le 2 ]] || { echo "Usage: $(basename $0) [-s] [<initramfs file> [<filename>]]" ; exit 1 ; }
-
-sorted=0
-while getopts "s" opt; do
-    case $opt in
-        s)  sorted=1;;
-        \?) exit 1;;
-    esac
-done
-shift $((OPTIND-1))
-
-image="${1:-/boot/initramfs-$(uname -r).img}"
-[[ -f "$image" ]]    || { echo "$image does not exist" ; exit 1 ; }
-
-CAT=zcat
-FILE_T=$(file "$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
-    CAT=zcat
-elif [[ "$FILE_T" =~ ": xz compressed data" ]]; then
-    CAT="xzcat $XZ_SINGLE_STREAM"
-elif [[ "$FILE_T" =~ ": XZ compressed data" ]]; then
-    CAT="xzcat $XZ_SINGLE_STREAM"
-elif [[ "$FILE_T" =~ ": data" ]]; then
-    CAT=lzcat
-fi
-
-if [[ $# -eq 2 ]]; then
-    $CAT $image | cpio --extract --verbose --quiet --to-stdout ${2#/} 2>/dev/null
-    exit $?
-fi
-
-echo "$image: $(du -h $image | awk '{print $1}')"
-echo "========================================================================"
-$CAT "$image" | cpio --extract --verbose --quiet --to-stdout 'lib/dracut/dracut-*' 2>/dev/null
-echo "========================================================================"
-if [ "$sorted" -eq 1 ]; then
-    $CAT "$image" | cpio --extract --verbose --quiet --list | sort -n -k5
-else
-    $CAT "$image" | cpio --extract --verbose --quiet --list
-fi
-echo "========================================================================"
--- a/lsinitrd-bash-completion.sh
+++ b/lsinitrd-bash-completion.sh
@@ -0,0 +1,63 @@
+#
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Copyright 2013 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/>.
+#
+
+__contains_word () {
+        local word=$1; shift
+        for w in $*; do [[ $w = $word ]] && return 0; done
+        return 1
+}
+
+_lsinitrd() {
+        local field_vals= cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+        local -A OPTS=(
+                [STANDALONE]='-s --size -h --help'
+
+                       [ARG]='-f --file -k --kver'
+        )
+
+        if __contains_word "$prev" ${OPTS[ARG]}; then
+                case $prev in
+                        --file|-f)
+                                comps=$(compgen -f -- "$cur")
+                                compopt -o filenames
+                        ;;
+                        --kver|-k)
+                                comps=$(cd /lib/modules; echo [0-9]*)
+                        ;;
+                        *)
+                                return 0
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+        fi
+
+        if [[ $cur = -* ]]; then
+                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+                return 0
+        fi
+
+        comps=$(compgen -f -- "$cur")
+        compopt -o filenames
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+}
+
+complete -F _lsinitrd lsinitrd
--- a/lsinitrd.1.asc
+++ b/lsinitrd.1.asc
@@ -0,0 +1,52 @@
+LSINITRD(1)
+=========
+:doctype: manpage
+:man source:   dracut
+:man manual:   dracut
+
+NAME
+----
+lsinitrd - tool to show the contents of an initramfs image
+
+SYNOPSIS
+--------
+*lsinitrd* ['OPTION...'] [<image> [<filename> [<filename> [...] ]]]
+
+*lsinitrd* ['OPTION...'] -k <kernel-version>
+
+DESCRIPTION
+-----------
+lsinitrd shows the contents of an initramfs image. if <image> is omitted, then
+lsinitrd uses the default image _/boot/<machine-id>/<kernel-version>/initrd_ or
+_/boot/initramfs-<kernel-version>.img_.
+
+OPTIONS
+-------
+**-h, --help**::
+    print a help message and exit.
+
+**-s, --size**::
+    sort the contents of the initramfs by size.
+
+**-f, --file** _<filename>_::
+    print the contents of <filename>.
+
+**-k, --kver** _<kernel version>_::
+    inspect the initramfs of <kernel version>.
+
+AVAILABILITY
+------------
+The lsinitrd 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
+
+Amerigo Wang
+
+Nikoli
+
+SEE ALSO
+--------
+*dracut*(8)
--- a/lsinitrd.sh
+++ b/lsinitrd.sh
@@ -0,0 +1,239 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Copyright 2005-2010 Harald Hoyer <harald@redhat.com>
+# Copyright 2005-2010 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/>.
+#
+
+usage()
+{
+    {
+        echo "Usage: ${0##*/} [options] [<initramfs file> [<filename> [<filename> [...] ]]]"
+        echo "Usage: ${0##*/} [options] -k <kernel version>"
+        echo
+        echo "-h, --help                  print a help message and exit."
+        echo "-s, --size                  sort the contents of the initramfs by size."
+        echo "-m, --mod                   list modules."
+        echo "-f, --file <filename>       print the contents of <filename>."
+        echo "-k, --kver <kernel version> inspect the initramfs of <kernel version>."
+        echo
+    } >&2
+}
+
+
+[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
+
+sorted=0
+modules=0
+declare -A filenames
+
+unset POSIXLY_CORRECT
+TEMP=$(getopt \
+    -o "shmf:k:" \
+    --long kver: \
+    --long file: \
+    --long mod \
+    --long help \
+    --long size \
+    -- "$@")
+
+if (( $? != 0 )); then
+    usage
+    exit 1
+fi
+
+eval set -- "$TEMP"
+
+while (($# > 0)); do
+    case $1 in
+        -k|--kver)  KERNEL_VERSION="$2"; shift;;
+        -f|--file)  filenames[${2#/}]=1; shift;;
+        -s|--size)  sorted=1;;
+        -h|--help)  usage; exit 0;;
+        -m|--mod)   modules=1;;
+        --)         shift;break;;
+        *)          usage; exit 1;;
+    esac
+    shift
+done
+
+[[ $KERNEL_VERSION ]] || KERNEL_VERSION="$(uname -r)"
+
+if [[ $1 ]]; then
+    image="$1"
+    if ! [[ -f "$image" ]]; then
+        {
+            echo "$image does not exist"
+            echo
+        } >&2
+        usage
+        exit 1
+    fi
+else
+    [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
+
+    if [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \
+        && [[ $MACHINE_ID ]] \
+        && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
+        image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
+    else
+        image="/boot/initramfs-${KERNEL_VERSION}.img"
+    fi
+fi
+
+shift
+while (($# > 0)); do
+    filenames[${1#/}]=1;
+    shift
+done
+
+if ! [[ -f "$image" ]]; then
+    {
+        echo "No <initramfs file> specified and the default image '$image' cannot be accessed!"
+        echo
+    } >&2
+    usage
+    exit 1
+fi
+
+extract_files()
+{
+    (( ${#filenames[@]} == 1 )) && nofileinfo=1
+    for f in ${!filenames[@]}; do
+        [[ $nofileinfo ]] || echo "initramfs:/$f"
+        [[ $nofileinfo ]] || echo "========================================================================"
+        $CAT $image | cpio --extract --verbose --quiet --to-stdout $f 2>/dev/null
+        ((ret+=$?))
+        [[ $nofileinfo ]] || echo "========================================================================"
+        [[ $nofileinfo ]] || echo
+    done
+}
+
+list_modules()
+{
+    echo "dracut modules:"
+    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
+    ((ret+=$?))
+}
+
+list_files()
+{
+    echo "========================================================================"
+    if [ "$sorted" -eq 1 ]; then
+        $CAT "$image" | cpio --extract --verbose --quiet --list | sort -n -k5
+    else
+        $CAT "$image" | cpio --extract --verbose --quiet --list | sort -k9
+    fi
+    ((ret+=$?))
+    echo "========================================================================"
+}
+
+
+if (( ${#filenames[@]} <= 0 )); then
+    echo "Image: $image: $(du -h $image | while read a b; do echo $a;done)"
+    echo "========================================================================"
+fi
+
+read -N 6 bin < "$image"
+case $bin in
+    $'\x71\xc7'*|070701)
+        CAT="cat --"
+        is_early=$(cpio --extract --verbose --quiet --to-stdout -- 'early_cpio' < "$image" 2>/dev/null)
+        if [[ "$is_early" ]]; then
+            if (( ${#filenames[@]} > 0 )); then
+                extract_files
+            else
+                echo "Early CPIO image"
+                list_files
+            fi
+            SKIP="$dracutbasedir/skipcpio"
+            if ! [[ -x $SKIP ]]; then
+                echo
+                echo "'$SKIP' not found, cannot display remaining contents!" >&2
+                echo
+                exit 0
+            fi
+        fi
+        ;;
+esac
+
+
+CAT=$({
+        if [[ $SKIP ]]; then
+            $SKIP "$image"
+        else
+            cat "$image"
+        fi } | {
+        read -N 6 bin
+        case $bin in
+            $'\x1f\x8b'*)
+                echo "zcat --"
+                ;;
+            BZh*)
+                echo "bzcat --"
+                ;;
+            $'\x71\xc7'*|070701)
+                echo "cat --"
+                ;;
+            $'\x02\x21'*)
+                echo "lz4 -d -c"
+                ;;
+            $'\x89'LZO$'\0'*)
+                echo "lzop -d -c"
+                ;;
+            *)
+                if echo "test"|xz|xzcat --single-stream >/dev/null 2>&1; then
+                    echo "xzcat --single-stream --"
+                else
+                    echo "xzcat --"
+                fi
+                ;;
+        esac
+    })
+
+skipcpio()
+{
+    $SKIP "$@" | $ORIG_CAT
+}
+
+if [[ $SKIP ]]; then
+    ORIG_CAT="$CAT"
+    CAT=skipcpio
+fi
+
+ret=0
+
+if (( ${#filenames[@]} > 0 )); then
+    extract_files
+else
+    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
+    ((ret+=$?))
+    echo "Version: $version"
+    echo
+    if [ "$modules" -eq 1 ]; then
+        list_modules
+        echo "========================================================================"
+    else
+        echo -n "Arguments: "
+        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null
+        echo
+        list_modules
+        list_files
+    fi
+fi
+
+exit $ret
--- a/mkinitrd.8.asc
+++ b/mkinitrd.8.asc
@@ -0,0 +1,65 @@
+MKINITRD(8)
+=========
+:doctype: manpage
+:man source:   dracut
+:man manual:   dracut
+
+NAME
+----
+mkinitrd - is a compat wrapper, which calls dracut to generate an initramfs
+
+SYNOPSIS
+--------
+*mkinitrd* ['OPTION...'] [<initrd-image>]  <kernel-version>
+
+DESCRIPTION
+-----------
+mkinitrd creates an initramfs image <initrd-image> for the kernel with
+version <kernel-version> by calling "dracut".
+
+[IMPORTANT]
+If a more fine grained control over the resulting image is needed,
+"dracut" should be called directly.
+
+OPTIONS
+-------
+**--version**::
+    print info about the version
+
+**-v, --verbose**::
+    increase verbosity level
+
+**-f, --force**::
+    overwrite existing initramfs file.
+
+**--image-version*::
+    append the kernel version to the target image
+    <initrd-image>-<kernel-version>.
+
+**--with=<module>**::
+     add the kernel module <module> to the initramfs.
+
+**--preload=<module>**::
+     preload the kernel module <module> in the initramfs before any other kernel
+     modules are loaded. This can be used to ensure a certain device naming,
+     which should in theory be avoided and the use of symbolic links in /dev is
+     encouraged.
+
+**--nocompress**::
+     do not compress the resulting image.
+
+**--help**::
+    print a help message and exit.
+
+AVAILABILITY
+------------
+The mkinitrd 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
+
+SEE ALSO
+--------
+*dracut*(8)
--- a/modules.d/00bash/module-setup.sh
+++ b/modules.d/00bash/module-setup.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    [ -x /bin/bash ]
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    # If another shell is already installed, do not use bash
+    [[ -x $initdir/bin/sh ]] && return
+
+    # Prefer bash as /bin/sh if it is available.
+    inst /bin/bash && ln -sf bash "${initdir}/bin/sh"
+}
+
--- a/modules.d/00bootchart/module-setup.sh
+++ b/modules.d/00bootchart/module-setup.sh
@@ -13,19 +13,17 @@ depends() {
 }

 install() {
-    inst /sbin/bootchartd
-    inst /bin/bash
    inst_symlink /init /sbin/init
    inst_dir /lib/bootchart/tmpfs
-    inst /lib/bootchart/bootchart-collector
-    inst /etc/bootchartd.conf
-    inst /sbin/accton
-    inst /usr/bin/pkill /bin/pkill
-    inst /bin/echo
-    inst /bin/grep
-    inst /bin/usleep
-    inst /usr/bin/[  /bin/[

-    mknod -m 0666 "${initdir}/dev/null" c 1 3
+    inst_multiple bootchartd bash \
+        /lib/bootchart/bootchart-collector /etc/bootchartd.conf \
+        accton \
+        echo \
+        grep \
+        usleep
+
+    inst /usr/bin/pkill /bin/pkill
+    inst /usr/bin/[  /bin/[
 }

--- a/modules.d/00systemd-bootchart/module-setup.sh
+++ b/modules.d/00systemd-bootchart/module-setup.sh
@@ -0,0 +1,18 @@
+#!/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
+    [ -x $systemdutildir/systemd-bootchart ] || return 1
+    return 255
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    inst_symlink /init /sbin/init
+    inst_multiple $systemdutildir/systemd-bootchart
+}
--- a/modules.d/01fips/fips-boot.sh
+++ b/modules.d/01fips/fips-boot.sh
@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh

 if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
-    rm -f /etc/modprobe.d/fips.conf >/dev/null 2>&1
+    rm -f -- /etc/modprobe.d/fips.conf >/dev/null 2>&1
 elif getarg boot= >/dev/null; then
    . /sbin/fips.sh
    if mount_boot; then
--- a/modules.d/01fips/fips-noboot.sh
+++ b/modules.d/01fips/fips-noboot.sh
@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh

 if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
-    rm -f /etc/modprobe.d/fips.conf >/dev/null 2>&1
+    rm -f -- /etc/modprobe.d/fips.conf >/dev/null 2>&1
 elif ! [ -f /tmp/fipsdone ]; then
    . /sbin/fips.sh
    mount_boot
--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
@@ -15,6 +15,12 @@ mount_boot()
        UUID=*)
            boot="/dev/disk/by-uuid/${boot#UUID=}"
            ;;
+        PARTUUID=*)
+            boot="/dev/disk/by-partuuid/${boot#PARTUUID=}"
+            ;;
+        PARTLABEL=*)
+            boot="/dev/disk/by-partlabel/${boot#PARTLABEL=}"
+            ;;
        /dev/*)
            ;;
        *)
@@ -32,8 +38,6 @@ mount_boot()
                    udevadm settle --timeout=30
                fi
                [ -e $boot ] && break
-                modprobe scsi_wait_scan && rmmod scsi_wait_scan
-                [ -e $boot ] && break
                sleep 0.5
                i=$(($i+1))
                [ $i -gt 40 ] && break
@@ -45,35 +49,76 @@ mount_boot()
        mkdir /boot
        info "Mounting $boot as /boot"
        mount -oro "$boot" /boot || return 1
+    elif [ -d "$NEWROOT/boot" ]; then
+        rm -fr -- /boot
+        ln -sf "$NEWROOT/boot" /boot
    fi
 }

+do_rhevh_check()
+{
+    KERNEL=$(uname -r)
+    kpath=${1}
+
+    # If we're on RHEV-H, the kernel is in /run/initramfs/live/vmlinuz0
+    HMAC_SUM_ORIG=$(cat $NEWROOT/boot/.vmlinuz-${KERNEL}.hmac | while read a b; do printf "%s\n" $a; done)
+    HMAC_SUM_CALC=$(sha512hmac $kpath | while read a b; do printf "%s\n" $a; done || return 1)
+    if [ -z "$HMAC_SUM_ORIG" ] || [ -z "$HMAC_SUM_CALC" ] || [ "${HMAC_SUM_ORIG}" != "${HMAC_SUM_CALC}" ]; then
+        warn "HMAC sum mismatch"
+        return 1
+    fi
+    info "rhevh_check OK"
+    return 0
+}
+
 do_fips()
 {
-    info "Checking integrity of kernel"
-    newroot=$NEWROOT
+    local _v
+    local _s
+    local _v
+    local _module
+
    KERNEL=$(uname -r)

-    [ -e "$newroot/boot/.vmlinuz-${KERNEL}.hmac" ] || unset newroot
-
-    if ! [ -e "$newroot/boot/.vmlinuz-${KERNEL}.hmac" ]; then
-        warn "$newroot/boot/.vmlinuz-${KERNEL}.hmac does not exist"
+    if ! [ -e "/boot/.vmlinuz-${KERNEL}.hmac" ]; then
+        warn "/boot/.vmlinuz-${KERNEL}.hmac does not exist"
        return 1
    fi

-    sha512hmac -c "$newroot/boot/.vmlinuz-${KERNEL}.hmac" || return 1
-
    FIPSMODULES=$(cat /etc/fipsmodules)

    info "Loading and integrity checking all crypto modules"
-    for module in $FIPSMODULES; do
-        if [ "$module" != "tcrypt" ]; then
-            modprobe ${module} || return 1
+    mv /etc/modprobe.d/fips.conf /etc/modprobe.d/fips.conf.bak
+    for _module in $FIPSMODULES; do
+        if [ "$_module" != "tcrypt" ]; then
+            if ! modprobe "${_module}"; then
+                # check if kernel provides generic algo
+                _found=0
+                while read _k _s _v; do
+                    [ "$_k" != "name" -a "$_k" != "driver" ] && continue
+                    [ "$_v" != "$_module" ] && continue
+                    _found=1
+                    break
+                done </proc/crypto
+                [ "$_found" = "0" ] && return 1
+            fi
        fi
    done
+    mv /etc/modprobe.d/fips.conf.bak /etc/modprobe.d/fips.conf
+
    info "Self testing crypto algorithms"
    modprobe tcrypt || return 1
    rmmod tcrypt
+
+    info "Checking integrity of kernel"
+    if [ -e "/run/initramfs/live/vmlinuz0" ]; then
+        do_rhevh_check /run/initramfs/live/vmlinuz0 || return 1
+    elif [ -e "/run/initramfs/live/isolinux/vmlinuz0" ]; then
+        do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1
+    else
+        sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1
+    fi
+
    info "All initrd crypto checks done"

    > /tmp/fipsdone
--- a/modules.d/01fips/module-setup.sh
+++ b/modules.d/01fips/module-setup.sh
@@ -12,14 +12,16 @@ depends() {

 installkernel() {
    local _fipsmodules _mod
-    _fipsmodules="aead aes_generici 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"
+    _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm "
+    _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg "
+    _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
+    _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
+    _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"

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

    for _mod in $_fipsmodules; do
-        if instmods $_mod; then
+        if hostonly='' instmods -c -s $_mod; then
            echo $_mod >> "${initdir}/etc/fipsmodules"
            echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
        fi
@@ -30,20 +32,16 @@ install() {
    local _dir
    inst_hook pre-trigger 01 "$moddir/fips-boot.sh"
    inst_hook pre-pivot 01 "$moddir/fips-noboot.sh"
-    inst "$moddir/fips.sh" /sbin/fips.sh
+    inst_script "$moddir/fips.sh" /sbin/fips.sh

-    dracut_install sha512hmac rmmod insmod mount uname umount
+    inst_multiple sha512hmac rmmod insmod mount uname umount fipscheck

-    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 libsoftokn3.so \
+        libsoftokn3.chk libfreebl3.so libfreebl3.chk \
+        libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \
+        libfreeblpriv3.so libfreeblpriv3.chk

-    dracut_install $usrlibdir/hmaccalc/sha512hmac.hmac
-    if command -v prelink >/dev/null; then
-        dracut_install prelink
-    fi
+    inst_multiple -o prelink
+    inst_simple /etc/system-fips
 }

--- a/modules.d/02caps/module-setup.sh
+++ b/modules.d/02caps/module-setup.sh
@@ -14,6 +14,6 @@ install() {
    inst_hook pre-pivot 00 "$moddir/caps.sh"
    inst $(type -P capsh 2>/dev/null) /usr/sbin/capsh
    # capsh wants bash and we need bash also
-    inst /bin/bash && ln -sf bash "${initdir}/bin/sh"
+    inst /bin/bash
 }

--- a/modules.d/02fips-aesni/module-setup.sh
+++ b/modules.d/02fips-aesni/module-setup.sh
@@ -12,7 +12,7 @@ depends() {

 installkernel() {
    local _fipsmodules _mod
-    _fipsmodules="aesni-intel"
+    _fipsmodules="aesni-intel ghash_clmulni_intel"

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

--- a/modules.d/03modsign/load-modsign-keys.sh
+++ b/modules.d/03modsign/load-modsign-keys.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Licensed under the GPLv2
+#
+# Copyright 2013 Red Hat, Inc.
+# Peter Jones <pjones@redhat.com>
+
+for x in /lib/modules/keys/* ; do
+    [ "${x}" = "/lib/modules/keys/*" ] && break
+    keyctl padd asymmetric "" @s < ${x}
+done
--- a/modules.d/03modsign/module-setup.sh
+++ b/modules.d/03modsign/module-setup.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Licensed under the GPLv2
+#
+# Copyright 2013 Red Hat, Inc.
+# Peter Jones <pjones@redhat.com>
+
+check() {
+    [[ -x /usr/bin/keyctl ]] || return 1
+
+    # do not include module in hostonly mode,
+    # if no keys are present
+    if [[ $hostonly ]]; then
+        x=$(echo /lib/modules/keys/*)
+        [[ "${x}" = "/lib/modules/keys/*" ]] && return 255
+    fi
+
+    return 0
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    inst_dir /lib/modules/keys
+    inst_binary /usr/bin/keyctl
+
+    inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh"
+
+    for x in /lib/modules/keys/* ; do
+        [[ "${x}" = "/lib/modules/keys/*" ]] && break
+        inst_simple "${x}"
+    done
+}
--- a/modules.d/03rescue/module-setup.sh
+++ b/modules.d/03rescue/module-setup.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    # do not add this module by default
+    return 255
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    inst_multiple -o ps grep more cat rm strace free showmount \
+        ping netstat rpcinfo vi scp ping6 ssh \
+        fsck fsck.ext2 fsck.ext4 fsck.ext3 fsck.ext4dev fsck.vfat e2fsck
+}
+
--- a/modules.d/04watchdog/module-setup.sh
+++ b/modules.d/04watchdog/module-setup.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    return 255
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    inst_hook cmdline   00 "$moddir/watchdog.sh"
+    inst_hook cmdline   50 "$moddir/watchdog.sh"
+    inst_hook pre-trigger 00 "$moddir/watchdog.sh"
+    inst_hook initqueue 00 "$moddir/watchdog.sh"
+    inst_hook mount     00 "$moddir/watchdog.sh"
+    inst_hook mount     50 "$moddir/watchdog.sh"
+    inst_hook mount     99 "$moddir/watchdog.sh"
+    inst_hook pre-pivot 00 "$moddir/watchdog.sh"
+    inst_hook pre-pivot 99 "$moddir/watchdog.sh"
+    inst_hook cleanup   00 "$moddir/watchdog.sh"
+    inst_hook cleanup   99 "$moddir/watchdog.sh"
+    inst_hook emergency 02 "$moddir/watchdog-stop.sh"
+    inst_multiple -o wdctl
+}
+
--- a/modules.d/04watchdog/watchdog-stop.sh
+++ b/modules.d/04watchdog/watchdog-stop.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -c /dev/watchdog ] && echo -n 'V' > /dev/watchdog
--- a/modules.d/04watchdog/watchdog.sh
+++ b/modules.d/04watchdog/watchdog.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+if [ -e /dev/watchdog ]; then
+	if [ ! -e /tmp/watchdog_timeout ]; then
+		wdctl -s 60 /dev/watchdog >/dev/null 2>&1
+		> /tmp/watchdog_timeout
+	fi
+	info "Triggering watchdog"
+	>/dev/watchdog
+else
+	modprobe ib700wdt
+	modprobe i6300esb
+fi
--- a/modules.d/05busybox/module-setup.sh
+++ b/modules.d/05busybox/module-setup.sh
@@ -13,9 +13,10 @@ depends() {
 }

 install() {
-    local _i _progs _path
-    inst busybox /usr/bin/busybox
-    for _i in `/sbin/busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}'`
+    local _i _progs _path _busybox
+    _busybox=$(type -P busybox)
+    inst $_busybox /usr/bin/busybox
+    for _i in $($_busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}')
    do
        _progs="$_progs $_i"
    done
@@ -26,11 +27,7 @@ install() {
    for _i in $_progs; do
        _path=$(find_binary "$_i")
        [ -z "$_path" ] && continue
-        if [[ $_path != ${_path#/usr} ]]; then
-            ln -sf ../../usr/bin/busybox "$initdir/$_path"
-        else
-            ln -sf ../usr/bin/busybox "$initdir/$_path"
-        fi
+        ln_r /usr/bin/busybox $_path
    done
 }

--- a/modules.d/10i18n/10-console.rules
+++ b/modules.d/10i18n/10-console.rules
@@ -1,2 +1,2 @@
 # Console initialization - keyboard, font, etc.
-KERNEL=="tty0",		RUN+="/lib/udev/console_init $root/$name"
+KERNEL=="tty0",		RUN+="/sbin/initqueue --onetime --unique --name console_init_$name /lib/udev/console_init $root/$name"
--- a/modules.d/10i18n/README
+++ b/modules.d/10i18n/README
@@ -1,4 +1,4 @@
-Dracut i18n module
+dracut i18n module
 ------------------

 INDEX
@@ -21,7 +21,7 @@ is intended to be generic across different GNU/Linux distributions.
 i18n and keyboard settings are stored in different files among
 distributions.  To deal with it avoiding hardcoding those differences in
 the installation script we handle it by mappings between variables used
-by Dracut and the ones in the system.  Package maintainer is expected to
+by dracut and the ones in the system.  Package maintainer is expected to
 create those for his/her distribution and it's appreciated to share it
 with us, so we can include it in source package.

--- a/modules.d/10i18n/console_init.sh
+++ b/modules.d/10i18n/console_init.sh
@@ -2,6 +2,12 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh

+[ -n "$DRACUT_SYSTEMD" ] && exit 0
+
+if [ -x $systemdutildir/systemd-vconsole-setup ]; then
+    $systemdutildir/systemd-vconsole-setup "$@"
+fi
+
 [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf

 DEFAULT_FONT=LatArCyrHeb-16
--- a/modules.d/10i18n/module-setup.sh
+++ b/modules.d/10i18n/module-setup.sh
@@ -4,6 +4,11 @@

 check() {
    [[ "$mount_needs" ]] && return 1
+
+    for i in setfont loadkeys kbd_mode; do
+        type -P "$i" >/dev/null || return 1
+    done
+
    return 0
 }

@@ -12,9 +17,14 @@ depends() {
 }

 install() {
-    [ -x /lib/systemd/systemd-vconsole-setup ] && dracut_install /lib/systemd/systemd-vconsole-setup
+    if dracut_module_included "systemd"; then
+        unset FONT
+        unset KEYMAP
+        [[ -f /etc/vconsole.conf ]] && . /etc/vconsole.conf
+    fi
+
    KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
-    DEFAULT_FONT=LatArCyrHeb-16
+    DEFAULT_FONT="${i18n_default_font:-LatArCyrHeb-16}"
    I18N_CONF="/etc/locale.conf"
    VCONFIG_CONF="/etc/vconsole.conf"

@@ -31,7 +41,7 @@ install() {
            *) cmd=grep ;;
        esac

-        for INCL in $($cmd "^include " $MAP | cut -d' ' -f2 | tr -d '"'); do
+        for INCL in $($cmd "^include " $MAP | while read a a b; do echo ${a//\"/}; done); do
            for FN in $(find ${kbddir}/keymaps -type f -name $INCL\*); do
                findkeymap $FN
            done
@@ -74,34 +84,45 @@ install() {
            for map in ${item[1]//,/ }
            do
                map=(${map//-/ })
-                value=$(grep "^${map[0]}=" "${item[0]}")
-                value=${value#*=}
-                echo "${map[1]:-${map[0]}}=${value}"
+                if [[ -f "${item[0]}" ]]; then
+                    value=$(grep "^${map[0]}=" "${item[0]}")
+                    value=${value#*=}
+                    echo "${map[1]:-${map[0]}}=${value}"
+                fi
            done
        done
    }

    install_base() {
-        dracut_install setfont loadkeys kbd_mode stty
+        inst_multiple setfont loadkeys kbd_mode stty

-        inst ${moddir}/console_init /lib/udev/console_init
-        inst_rules ${moddir}/10-console.rules
-        inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
+        if ! dracut_module_included "systemd"; then
+            inst ${moddir}/console_init.sh /lib/udev/console_init
+            inst_rules ${moddir}/10-console.rules
+            inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
+        fi
    }

    install_all_kbd() {
        local rel f

-        for f in $(eval find ${kbddir}/{${KBDSUBDIRS}} -type f -print)
-        do
-            inst_simple $f
+        for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do
+            inst_dir "$_src"
+            cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_src}" "$_src"/*
        done

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

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

    install_local_i18n() {
@@ -148,9 +169,10 @@ install() {
        EXT_KEYMAPS+=\ ${UNIKEYMAP}\ ${GRP_TOGGLE}

        [[ ${KEYMAP} ]] || {
-            derror 'No KEYMAP.'
+            dinfo 'No KEYMAP configured.'
            return 1
        }
+
        findkeymap ${KEYMAP}

        for map in ${EXT_KEYMAPS}
@@ -163,7 +185,7 @@ install() {

        inst_opt_decompress ${kbddir}/consolefonts/${DEFAULT_FONT}.*

-        if [[ ${FONT} ]]
+        if [[ ${FONT} ]] && [[ ${FONT} != ${DEFAULT_FONT} ]]
        then
            FONT=${FONT%.psf*}
            inst_opt_decompress ${kbddir}/consolefonts/${FONT}.*
@@ -181,10 +203,20 @@ install() {
            inst_simple ${kbddir}/unimaps/${FONT_UNIMAP}.uni
        fi

-        mksubdirs ${initdir}${I18N_CONF}
-        mksubdirs ${initdir}${VCONFIG_CONF}
-        print_vars LC_ALL LANG >> ${initdir}${I18N_CONF}
-        print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> ${initdir}${VCONFIG_CONF}
+        if dracut_module_included "systemd" && [[ -f ${I18N_CONF} ]]; then
+            inst_simple ${I18N_CONF}
+        else
+            mksubdirs ${initdir}${I18N_CONF}
+            print_vars LC_ALL LANG >> ${initdir}${I18N_CONF}
+        fi
+
+        if dracut_module_included "systemd" && [[ -f ${VCONFIG_CONF} ]]; then
+            inst_simple ${VCONFIG_CONF}
+        else
+            mksubdirs ${initdir}${VCONFIG_CONF}
+            print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> ${initdir}${VCONFIG_CONF}
+        fi
+
        return 0
    }

@@ -200,12 +232,6 @@ install() {
            kbddir=''
        done

-        [[ ${kbddir} ]] || {
-            derror "Directories ${KBDSUBDIRS//,/, } not found.  Please" \
-                "inform us about the issue including your OS name and version."
-            return 1
-        }
-
        [[ -f $I18N_CONF && -f $VCONFIG_CONF ]] || \
            [[ ! ${hostonly} || ${i18n_vars} ]] || {
            derror 'i18n_vars not set!  Please set up i18n_vars in ' \
@@ -214,16 +240,13 @@ install() {
        return 0
    }

-    if checks
-    then
+    if checks; then
        install_base

-        if [[ ${hostonly} ]]
-        then
+        if [[ ${hostonly} ]] && ! [[ ${i18n_install_all} ]]; then
            install_local_i18n || install_all_kbd
        else
            install_all_kbd
        fi
    fi
 }
-
--- a/modules.d/10i18n/parse-i18n.sh
+++ b/modules.d/10i18n/parse-i18n.sh
@@ -13,21 +13,21 @@ inst_key_val() {
    _value=$(getarg $@)
    [ -z "${_value}" ] && _value=$_default
    if [ -n "${_value}" ]; then
-        printf '%s="%s"\n' $1 ${_value} >> $_file
+        printf '%s="%s"\n' $2 ${_value} >> $_file
    fi
    unset _file
    unset _value
 }

-inst_key_val '' /etc/vconsole.conf KEYMAP      vconsole.keymap      KEYTABLE
-inst_key_val '' /etc/vconsole.conf FONT        vconsole.font        SYSFONT
-inst_key_val '' /etc/vconsole.conf FONT_MAP    vconsole.font.map    CONTRANS
-inst_key_val '' /etc/vconsole.conf FONT_UNIMAP vconsole.font.unimap UNIMAP
-inst_key_val 1  /etc/vconsole.conf UNICODE     vconsole.unicode vconsole.font.unicode
-inst_key_val '' /etc/vconsole.conf EXT_KEYMAP  vconsole.keymap.ext
+inst_key_val '' /etc/vconsole.conf vconsole.keymap      KEYMAP      -d KEYTABLE
+inst_key_val '' /etc/vconsole.conf vconsole.font        FONT        -d SYSFONT
+inst_key_val '' /etc/vconsole.conf vconsole.font.map    FONT_MAP    -d CONTRANS
+inst_key_val '' /etc/vconsole.conf vconsole.font.unimap FONT_UNIMAP -d UNIMAP
+inst_key_val 1  /etc/vconsole.conf vconsole.font.unicode UNICODE vconsole.unicode
+inst_key_val '' /etc/vconsole.conf vconsole.keymap.ext  EXT_KEYMAP

-inst_key_val '' /etc/locale.conf   LANG        locale.LANG
-inst_key_val '' /etc/locale.conf   LC_ALL      locale.LC_ALL
+inst_key_val '' /etc/locale.conf   locale.LANG   LANG
+inst_key_val '' /etc/locale.conf   locale.LC_ALL LC_ALL

 if [ -f /etc/locale.conf ]; then
    . /etc/locale.conf
@@ -35,10 +35,8 @@ if [ -f /etc/locale.conf ]; then
    export LC_ALL
 fi

-# FIXME: fix systemd-vconsole-setup
-#if [ -x /lib/systemd/systemd-vconsole-setup ]; then
-#    /lib/systemd/systemd-vconsole-setup
-#    rm -f /{etc,lib}/udev/rules.d/10-console.rules
-#    rm -f /lib/udev/console_init
-#    ln -s /lib/systemd/systemd-vconsole-setup /lib/udev/console_init
-#fi
+if [ -n "$DRACUT_SYSTEMD" ]; then
+    rm -f -- /etc/udev/rules.d/10-console.rules
+    rm -f -- /lib/udev/rules.d/10-console.rules
+    rm -f -- /lib/udev/console_init
+fi
--- 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,47 +42,77 @@ 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
 fi

 testfile="$ROOT/.usrmovecheck$$"
-rm -f "$testfile"
+rm -f -- "$testfile"
 > "$testfile"
 if [[ ! -e "$testfile" ]]; then
    echo "Cannot write to $ROOT/"
    exit 1
 fi
-rm -f "$testfile"
+rm -f -- "$testfile"

 testfile="$ROOT/usr/.usrmovecheck$$"
-rm -f "$testfile"
+rm -f -- "$testfile"
 > "$testfile"
 if [[ ! -e "$testfile" ]]; then
    echo "Cannot write to $ROOT/usr/"
    exit 1
 fi
-rm -f "$testfile"
+rm -f -- "$testfile"

-ismounted() {
-    while read a m a; do
-        [[ "$m" = "$1" ]] && return 0
+find_mount() {
+    local dev mnt etc wanted_dev
+    wanted_dev="$(readlink -e -q $1)"
+    while read dev mnt etc; do
+        [ "$dev" = "$wanted_dev" ] && echo "$dev" && return 0
    done < /proc/mounts
    return 1
 }

+# usage: ismounted <mountpoint>
+# usage: ismounted /dev/<device>
+if command -v findmnt >/dev/null; then
+    ismounted() {
+        findmnt "$1" > /dev/null 2>&1
+    }
+else
+    ismounted() {
+        if [ -b "$1" ]; then
+            find_mount "$1" > /dev/null && return 0
+            return 1
+        fi
+
+        while read a m a; do
+            [ "$m" = "$1" ] && return 0
+        done < /proc/mounts
+        return 1
+    }
+fi
+
 # clean up after ourselves no matter how we die.
 cleanup() {
    echo "Something failed. Move back to the original state"
    for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" \
 	"$ROOT/usr/bin" "$ROOT/usr/sbin" "$ROOT/usr/lib" \
        "$ROOT/usr/lib64"; do
-        [[ -d "${dir}.usrmove-new" ]] && rm -fr "${dir}.usrmove-new"
+        [[ -d "${dir}.usrmove-new" ]] && rm -fr -- "${dir}.usrmove-new"
        if [[ -d "${dir}.usrmove-old" ]]; then
            mv "$dir" "${dir}.del~"
            mv "${dir}.usrmove-old" "$dir"
-            rm -fr "${dir}.del~"
+            rm -fr -- "${dir}.del~"
        fi
    done
 }
@@ -96,12 +126,12 @@ set -e

 # merge / and /usr in new dir in /usr
 for dir in bin sbin lib lib64; do
-    rm -rf "$ROOT/usr/${dir}.usrmove-new"
+    rm -rf -- "$ROOT/usr/${dir}.usrmove-new"
    [[ -L "$ROOT/$dir" ]] && continue
    [[ -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"
@@ -120,7 +150,7 @@ done
 for dir in bin sbin lib lib64; do
    [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
    echo "Switch to new \`$ROOT/usr/$dir'."
-    rm -fr "$ROOT/usr/${dir}.usrmove-old"
+    rm -fr -- "$ROOT/usr/${dir}.usrmove-old"
    mv "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-old"
    mv "$ROOT/usr/${dir}.usrmove-new" "$ROOT/usr/$dir"
 done
@@ -130,7 +160,7 @@ for dir in bin sbin lib lib64; do
    [[ -L "$ROOT/$dir" ]] && continue
    [[ -d "$ROOT/$dir" ]] || continue
    echo "Create \`$ROOT/$dir' symlink."
-    rm -rf "$ROOT/${dir}.usrmove-old" || :
+    rm -fr -- "$ROOT/${dir}.usrmove-old" || :
    mv "$ROOT/$dir" "$ROOT/${dir}.usrmove-old"
    ln -sfn usr/$dir "$ROOT/$dir"
 done
@@ -148,9 +178,9 @@ done

 for dir in bin sbin lib lib64; do
    [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
-        && rm -rf "$ROOT/usr/${dir}.usrmove-old~" || :
+        && rm -rf -- "$ROOT/usr/${dir}.usrmove-old~" || :
    [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
-        && rm -rf "$ROOT/${dir}.usrmove-old~" || :
+        && rm -rf -- "$ROOT/${dir}.usrmove-old~" || :
 done

 for dir in lib lib64; do
--- a/modules.d/30convertfs/module-setup.sh
+++ b/modules.d/30convertfs/module-setup.sh
@@ -12,9 +12,8 @@ depends() {
 }

 install() {
-    dracut_install bash
-    dracut_install find ldconfig mv rm cp ln 
+    inst_multiple bash find ldconfig mv rm cp ln
    inst_hook pre-pivot 99 "$moddir/do-convertfs.sh"
-    inst "$moddir/convertfs.sh" /usr/bin/convertfs
+    inst_script "$moddir/convertfs.sh" /usr/bin/convertfs
 }

--- a/modules.d/40network/dhclient-script
+++ b/modules.d/40network/dhclient-script
@@ -1,90 +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
-
-setup_interface() {
-    ip=$new_ip_address
-    mtu=$new_interface_mtu
-    mask=$new_subnet_mask
-    bcast=$new_broadcast_address
-    gw=${new_routers%%,*}
-    domain=$new_domain_name
-    search=$(printf "$new_domain_search")
-    namesrv=$new_domain_name_servers
-    hostname=$new_host_name
-
-    [ -f /tmp/net.$netif.override ] && . /tmp/net.$netif.override
-
-    # Taken from debian dhclient-script:
-    # The 576 MTU is only used for X.25 and dialup connections
-    # where the admin wants low latency.  Such a low MTU can cause
-    # problems with UDP traffic, among other things.  As such,
-    # 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
-
-    echo ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} dev $netif >> /tmp/net.$netif.up
-
-    [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
-
-    [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
-    if  [ -n "$namesrv" ] ; then
-        for s in $namesrv; do
-            echo nameserver $s
-        done
-    fi >> /tmp/net.$netif.resolv.conf
-
-    # Note: hostname can be fqdn OR short hostname, so chop off any
-    # trailing domain name and explicity add any domain if set.
-    [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
-}
-
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-export PS4="dhclient.$interface.$$ + "
-exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
-# We already need a set netif here
-netif=$interface
-
-# Huh? Interface configured?
-[ -f "/tmp/net.$netif.up" ] && exit 0
-
-case $reason in
-    PREINIT)
-        echo "dhcp: PREINIT $netif up"
-        ip link set $netif up
-        wait_for_if_up $netif
-        ;;
-    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
-        fi
-        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 "dhcp: $reason";;
-esac
-
-exit 0
--- a/modules.d/40network/dhclient-script.sh
+++ b/modules.d/40network/dhclient-script.sh
@@ -0,0 +1,156 @@
+#!/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
+type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
+
+# We already need a set netif here
+netif=$interface
+
+# Huh? Interface configured?
+[ -f "/tmp/net.$netif.up" ] && exit 0
+
+setup_interface() {
+    ip=$new_ip_address
+    mtu=$new_interface_mtu
+    mask=$new_subnet_mask
+    bcast=$new_broadcast_address
+    gw=${new_routers%%,*}
+    domain=$new_domain_name
+    search=$(printf -- "$new_domain_search")
+    namesrv=$new_domain_name_servers
+    hostname=$new_host_name
+    lease_time=$new_dhcp_lease_time
+
+    [ -f /tmp/net.$netif.override ] && . /tmp/net.$netif.override
+
+    # Taken from debian dhclient-script:
+    # The 576 MTU is only used for X.25 and dialup connections
+    # where the admin wants low latency.  Such a low MTU can cause
+    # problems with UDP traffic, among other things.  As such,
+    # 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
+        if ! ip link set $netif mtu $mtu ; then
+            ip link set $netif down
+            ip link set $netif mtu $mtu
+            linkup $netif
+        fi
+    fi
+
+    ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} \
+        valid_lft ${lease_time} preferred_lft ${lease_time} \
+        dev $netif
+
+    [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw
+
+    [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
+    if  [ -n "$namesrv" ] ; then
+        for s in $namesrv; do
+            echo nameserver $s
+        done
+    fi >> /tmp/net.$netif.resolv.conf
+
+    # Note: hostname can be fqdn OR short hostname, so chop off any
+    # trailing domain name and explicity add any domain if set.
+    [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+}
+
+setup_interface6() {
+    domain=$new_domain_name
+    search=$(printf -- "$new_domain_search")
+    namesrv=$new_domain_name_servers
+    hostname=$new_host_name
+    [ -n "$new_dhcp_lease_time" ] && lease_time=$new_dhcp_lease_time
+    [ -n "$new_max_life" ] && lease_time=$new_max_life
+    preferred_lft=$lease_time
+    [ -n "$new_preferred_life" ] && preferred_lft=$new_preferred_life
+
+    [ -f /tmp/net.$netif.override ] && . /tmp/net.$netif.override
+
+    ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+        dev ${netif} scope global \
+        ${lease_time:+valid_lft $lease_time} \
+        ${preferred_lft:+preferred_lft ${preferred_lft}}
+
+    [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
+    if  [ -n "$namesrv" ] ; then
+        for s in $namesrv; do
+            echo nameserver $s
+        done
+    fi >> /tmp/net.$netif.resolv.conf
+
+    # Note: hostname can be fqdn OR short hostname, so chop off any
+    # trailing domain name and explicity add any domain if set.
+    [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+}
+
+case $reason in
+    PREINIT)
+        echo "dhcp: PREINIT $netif up"
+        linkup $netif
+        ;;
+
+    PREINIT6)
+        echo "dhcp: PREINIT $netif up"
+        linkup $netif
+        ;;
+
+    BOUND)
+        echo "dhcp: BOND setting $netif"
+        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 '. /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
+
+        echo "[ -f /tmp/net.$netif.did-setup ]" > $hookdir/initqueue/finished/dhclient-$netif.sh
+        >/tmp/net.$netif.up
+        ;;
+
+    BOUND6)
+        echo "dhcp: BOND6 setting $netif"
+        setup_interface6
+
+        set | while read line; do
+            [ "${line#new_}" = "$line" ] && continue
+            echo "$line"
+        done >/tmp/dhclient.$netif.dhcpopts
+
+        {
+            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
+
+        echo "[ -f /tmp/net.$netif.did-setup ]" > $hookdir/initqueue/finished/dhclient-$netif.sh
+        >/tmp/net.$netif.up
+        ;;
+    *) echo "dhcp: $reason";;
+esac
+
+exit 0
--- a/modules.d/40network/dhcp-root.sh
+++ b/modules.d/40network/dhcp-root.sh
@@ -2,20 +2,24 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh

-# 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=)

-if [ "$root" = "dhcp" ] || [ "$root" = "dhcp6" ] || [ "$netroot" = "dhcp" ] ; then
+if [ -z "$netroot" ]; then
+    for netroot in $(getargs netroot=); do
+        [ "$netroot" = "dhcp" ] && break
+        [ "$netroot" = "dhcp6" ] && break
+    done
+    [ "$netroot" = "dhcp" ] || [ "$netroot" = "dhcp6" ] || unset netroot
+fi
+
+if [ "$root" = "dhcp" ] || [ "$root" = "dhcp6" ] || [ "$netroot" = "dhcp" ] || [ "$netroot" = "dhcp6" ]; then
    # Tell ip= checker that we need dhcp
    NEEDDHCP="1"

    # Done, all good!
    rootok=1
-    if [ "$netroot" != "dhcp" ] ; then
+    if [ "$netroot" != "dhcp" ] && [ "$netroot" != "dhcp6" ]; then
        netroot=$root
    fi

--- a/modules.d/40network/ifname-genrules.sh
+++ b/modules.d/40network/ifname-genrules.sh
@@ -7,15 +7,28 @@ if ! getarg ifname= >/dev/null ; then
    return
 fi

+command -v parse_ifname_opts >/dev/null || . /lib/net-lib.sh
+
 {
    for p in $(getargs ifname=); do
        parse_ifname_opts $p
-        printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="%s", ATTR{type}=="1", NAME="%s"\n' "$ifname_mac" "$ifname_if"
-    done

-    # Rename non named interfaces out of the way for named ones.
-    for p in $(getargs ifname=); do
-        parse_ifname_opts $p
-        printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="?*", ATTR{type}=="1", NAME!="?*", KERNEL=="%s", NAME="%%k-renamed"\n' "$ifname_if"
+        if [ -f /tmp/ifname-$ifname_mac ]; then
+            read oldif < /tmp/ifname-$ifname_mac
+        fi
+        if [ -f /tmp/ifname-$ifname_if ]; then
+            read oldmac < /tmp/ifname-$ifname_if
+        fi
+        if [ -n "$oldif" -a -n "$oldmac" -a "$oldif" = "$ifname_if" -a "$oldmac" = "$ifname_mac" ]; then
+            # skip same ifname= declaration
+            continue
+        fi
+
+        [ -n "$oldif" ] && warn "Multiple interface names specified for MAC $ifname_mac: $oldif"
+        [ -n "$oldmac" ] && warn "Multiple MAC specified for $ifname_if: $oldmac"
+
+        printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="%s", ATTR{type}=="1", NAME="%s"\n' "$ifname_mac" "$ifname_if"
+        echo $ifname_if > /tmp/ifname-$ifname_mac
+        echo $ifname_mac > /tmp/ifname-$ifname_if
    done
-} > /etc/udev/rules.d/50-ifname.rules
+} >> /etc/udev/rules.d/80-ifname.rules
--- a/modules.d/40network/ifup
+++ b/modules.d/40network/ifup
@@ -1,245 +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
-#
-# We don't need to check for ip= errors here, that is handled by the
-# cmdline parser script
-#
-# without $2 means this is for real netroot case
-# or it is for manually bring up network ie. for kdump scp vmcore
-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
-
-# Huh? No $1?
-[ -z "$1" ] && exit 1
-
-# $netif reads easier than $1
-netif=$1
-
-# enslave this interface to bond?
-if [ -e /tmp/bond.info ]; then
-    . /tmp/bond.info
-    for slave in $bondslaves ; do
-        if [ "$netif" = "$slave" ] ; then
-            netif=$bondname
-        fi
-    done
-fi
-
-# bridge this interface?
-if [ -e /tmp/bridge.info ]; then
-    . /tmp/bridge.info
-    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
-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"
-[ -z "$netroot" ] && [ -z "$manualup" ] && exit 0
-[ -n "$manualup" ] && >/tmp/net.$netif.manualup
-
-# Run dhclient
-do_dhcp() {
-    # dhclient-script will mark the netif up and generate the online
-    # event for nfsroot
-    # XXX add -V vendor class and option parsing per kernel
-    echo "Starting dhcp for interface $netif"
-    dhclient "$@" -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid -lf /tmp/dhclient.$netif.lease $netif \
-        || echo "dhcp failed"
-}
-
-load_ipv6() {
-    modprobe ipv6
-    i=0
-    while [ ! -d /proc/sys/net/ipv6 ]; do
-        i=$(($i+1))
-        [ $i -gt 10 ] && break
-        sleep 0.1
-    done
-}
-
-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
-
-    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
-
-    namesrv=$(getargs nameserver)
-    if  [ -n "$namesrv" ] ; then
-        for s in $namesrv; do
-            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
-
-    [ -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
-
-    namesrv=$(getargs nameserver)
-    if  [ -n "$namesrv" ] ; then
-        for s in $namesrv; do
-            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
-
-# start bond if needed
-if [ -e /tmp/bond.info ]; then
-    . /tmp/bond.info
-
-    if [ "$netif" = "$bondname" ] && [ ! -e /tmp/net.$bondname.up ] ; then # We are master bond device
-        modprobe bonding
-        ip link set $netif down
-
-        # Stolen from ifup-eth
-        # add the bits to setup driver parameters here
-        for arg in $bondoptions ; do
-            key=${arg%%=*};
-            value=${arg##*=};
-            # %{value:0:1} is replaced with non-bash specific construct
-            if [ "${key}" = "arp_ip_target" -a "${#value}" != "0" -a "+${value%%+*}" != "+" ]; then
-                OLDIFS=$IFS;
-                IFS=',';
-                for arp_ip in $value; do
-                    echo +$arp_ip > /sys/class/net/${netif}/bonding/$key
-                done
-                IFS=$OLDIFS;
-            else
-                echo $value > /sys/class/net/${netif}/bonding/$key
-            fi
-        done
-
-        ip link set $netif up
-
-        for slave in $bondslaves ; do
-            ip link set $slave down
-            ifenslave $bondname $slave
-            ip link set $slave up
-            wait_for_if_up $slave
-        done
-
-        # add the bits to setup the needed post enslavement parameters
-        for arg in $BONDING_OPTS ; do
-            key=${arg%%=*};
-            value=${arg##*=};
-            if [ "${key}" = "primary" ]; then
-                echo $value > /sys/class/net/${netif}/bonding/$key
-            fi
-        done
-    fi
-fi
-
-
-# XXX need error handling like dhclient-script
-
-# 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
-    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
-
-# No ip lines default to dhcp
-ip=$(getarg ip)
-
-if [ -z "$ip" ]; then
-    if [ "$netroot" = "dhcp6" ]; then
-        do_dhcp -6
-    else
-        do_dhcp -4
-    fi
-fi
-
-# Specific configuration, spin through the kernel command line
-# looking for ip= lines
-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
-        eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
-    done > /tmp/net.$netif.override
-
-    case $autoconf in
-        dhcp|on|any)
-            do_dhcp -4 ;;
-        dhcp6)
-            do_dhcp -6 ;;
-        auto6)
-            do_ipv6auto ;;
-        *)
-            do_static ;;
-    esac
-    break
-done
-exit 0
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -0,0 +1,400 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# We don't need to check for ip= errors here, that is handled by the
+# cmdline parser script
+#
+# without $2 means this is for real netroot case
+# or it is for manually bring up network ie. for kdump scp vmcore
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+
+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
+
+# $netif reads easier than $1
+netif=$1
+use_bridge='false'
+use_vlan='false'
+
+# enslave this interface to bond?
+for i in /tmp/bond.*.info; do
+    [ -e "$i" ] || continue
+    unset bondslaves
+    unset bondname
+    . "$i"
+    for slave in $bondslaves ; do
+        if [ "$netif" = "$slave" ] ; then
+            netif=$bondname
+            break 2
+        fi
+    done
+done
+
+for i in /tmp/team.*.info; do
+    [ -e "$i" ] || continue
+    unset teamslaves
+    unset teammaster
+    . "$i"
+    for slave in $teamslaves ; do
+        if [ "$netif" = "$slave" ] ; then
+            netif=$teammaster
+        fi
+    done
+done
+
+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)
+        elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+            : # We need to really setup team (recursive call)
+        else
+            netif="$vlanname"
+            use_vlan='true'
+        fi
+    fi
+fi
+
+# bridge this interface?
+if [ -e /tmp/bridge.info ]; then
+    . /tmp/bridge.info
+    for ethname in $bridgeslaves ; do
+        if [ "$netif" = "$ethname" ]; then
+            if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
+                : # We need to really setup bond (recursive call)
+            elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+                : # We need to really setup team (recursive call)
+            elif [ "$netif" = "$vlanname" ] && [ -n "$DO_VLAN_SETUP" ]; then
+                : # We need to really setup vlan (recursive call)
+            else
+                netif="$bridgename"
+                use_bridge='true'
+            fi
+        fi
+    done
+fi
+
+# disable manual ifup while netroot is set for simplifying our logic
+# in netroot case we prefer netroot to bringup $netif automaticlly
+[ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
+[ -z "$netroot" ] && [ -z "$manualup" ] && exit 0
+if [ -n "$manualup" ]; then
+    >/tmp/net.$netif.manualup
+else
+    [ -e /tmp/net.${netif}.did-setup ] && exit 0
+    [ -e /sys/class/net/$netif/address ] && \
+        [ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && exit 0
+fi
+
+# Run dhclient
+do_dhcp() {
+    # dhclient-script will mark the netif up and generate the online
+    # event for nfsroot
+    # XXX add -V vendor class and option parsing per kernel
+
+    [ -e /tmp/dhclient.$netif.pid ] && return 0
+
+    if ! iface_has_link $netif; then
+        echo "No carrier detected"
+        return 1
+    fi
+    echo "Starting dhcp for interface $netif"
+    dhclient "$@" -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid -lf /tmp/dhclient.$netif.lease $netif \
+        || echo "dhcp failed"
+}
+
+load_ipv6() {
+    [ -d /proc/sys/net/ipv6 ] && return
+    modprobe ipv6
+    i=0
+    while [ ! -d /proc/sys/net/ipv6 ]; do
+        i=$(($i+1))
+        [ $i -gt 10 ] && break
+        sleep 0.1
+    done
+}
+
+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
+    linkup $netif
+    wait_for_ipv6_auto $netif
+
+    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+
+    return 0
+}
+
+# Handle static ip configuration
+do_static() {
+    strstr $ip '*:*:*' && load_ipv6
+
+    linkup $netif
+    [ -n "$macaddr" ] && ip link set address $macaddr dev $netif
+    [ -n "$mtu" ] && ip link set mtu $mtu dev $netif
+    if strstr $ip '*:*:*'; then
+        # note no ip addr flush for ipv6
+        ip addr add $ip/$mask ${srv:+peer $srv} dev $netif
+        wait_for_ipv6_dad $netif
+    else
+        ip addr flush dev $netif
+        ip addr add $ip/$mask ${srv:+peer $srv} brd + dev $netif
+    fi
+
+    [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw
+    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+
+    return 0
+}
+
+# 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
+    exit 0
+fi
+
+# start bond if needed
+if [ -e /tmp/bond.${netif}.info ]; then
+    . /tmp/bond.${netif}.info
+
+    if [ "$netif" = "$bondname" ] && [ ! -e /tmp/net.$bondname.up ] ; then # We are master bond device
+        modprobe bonding
+        echo "+$netif" >  /sys/class/net/bonding_masters
+        ip link set $netif down
+
+        # Stolen from ifup-eth
+        # add the bits to setup driver parameters here
+        for arg in $bondoptions ; do
+            key=${arg%%=*};
+            value=${arg##*=};
+            # %{value:0:1} is replaced with non-bash specific construct
+            if [ "${key}" = "arp_ip_target" -a "${#value}" != "0" -a "+${value%%+*}" != "+" ]; then
+                OLDIFS=$IFS;
+                IFS=',';
+                for arp_ip in $value; do
+                    echo +$arp_ip > /sys/class/net/${netif}/bonding/$key
+                done
+                IFS=$OLDIFS;
+            else
+                echo $value > /sys/class/net/${netif}/bonding/$key
+            fi
+        done
+
+        linkup $netif
+
+        for slave in $bondslaves ; do
+            ip link set $slave down
+            cat /sys/class/net/$slave/address > /tmp/net.${netif}.${slave}.hwaddr
+            echo "+$slave" > /sys/class/net/$bondname/bonding/slaves
+            linkup $slave
+        done
+
+        # add the bits to setup the needed post enslavement parameters
+        for arg in $BONDING_OPTS ; do
+            key=${arg%%=*};
+            value=${arg##*=};
+            if [ "${key}" = "primary" ]; then
+                echo $value > /sys/class/net/${netif}/bonding/$key
+            fi
+        done
+    fi
+fi
+
+if [ -e /tmp/team.${netif}.info ]; then
+    . /tmp/team.${netif}.info
+    if [ "$netif" = "$teammaster" ] && [ ! -e /tmp/net.$teammaster.up ] ; then
+        # We shall only bring up those _can_ come up
+        # in case of some slave is gone in active-backup mode
+        working_slaves=""
+        for slave in $teamslaves ; do
+            teamdctl ${teammaster} port present ${slave} 2>/dev/null \
+                     && continue
+            ip link set dev $slave up 2>/dev/null
+            if wait_for_if_up $slave; then
+                working_slaves+="$slave "
+            fi
+        done
+        # Do not add slaves now
+        teamd -d -U -n -N -t $teammaster -f /etc/teamd/$teammaster.conf
+        for slave in $working_slaves; do
+            # team requires the slaves to be down before joining team
+            ip link set dev $slave down
+            (
+                unset TEAM_PORT_CONFIG
+                _hwaddr=$(cat /sys/class/net/$slave/address)
+                _subchannels=$(iface_get_subchannels "$slave")
+                if [ -n "$_hwaddr" ] && [ -e "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then
+                    . "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf"
+                elif [ -n "$_subchannels" ] && [ -e "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" ]; then
+                    . "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf"
+                elif [ -e "/etc/sysconfig/network-scripts/ifcfg-${slave}" ]; then
+                    . "/etc/sysconfig/network-scripts/ifcfg-${slave}"
+                fi
+
+                if [ -n "${TEAM_PORT_CONFIG}" ]; then
+                    /usr/bin/teamdctl ${teammaster} port config update ${slave} "${TEAM_PORT_CONFIG}"
+                fi
+            )
+            teamdctl $teammaster port add $slave
+        done
+        ip link set dev $teammaster up
+    fi
+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
+        brctl addbr $bridgename
+        brctl setfd $bridgename 0
+        for ethname in $bridgeslaves ; do
+            if [ "$ethname" = "$bondname" ] ; then
+                DO_BOND_SETUP=yes ifup $bondname -m
+            elif [ "$ethname" = "$teammaster" ] ; then
+                DO_TEAM_SETUP=yes ifup $teammaster -m
+            elif [ "$ethname" = "$vlanname" ]; then
+                DO_VLAN_SETUP=yes ifup $vlanname -m
+            else
+                linkup $ethname
+            fi
+            brctl addif $bridgename $ethname
+        done
+    fi
+fi
+
+get_vid() {
+    case "$1" in
+    vlan*)
+        echo ${1#vlan}
+        ;;
+    *.*)
+        echo ${1##*.}
+        ;;
+    esac
+}
+
+if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
+    modprobe 8021q
+    if [ "$phydevice" = "$bondname" ] ; then
+        DO_BOND_SETUP=yes ifup $phydevice -m
+    elif [ "$phydevice" = "$teammaster" ] ; then
+        DO_TEAM_SETUP=yes ifup $phydevice -m
+    else
+        linkup "$phydevice"
+    fi
+    ip link add dev "$vlanname" link "$phydevice" type vlan id "$(get_vid $vlanname)"
+    ip link set "$vlanname" up
+fi
+
+# No ip lines default to dhcp
+ip=$(getarg ip)
+
+if [ -z "$ip" ]; then
+    namesrv=$(getargs nameserver)
+    for s in $namesrv; do
+        echo nameserver $s >> /tmp/net.$netif.resolv.conf
+    done
+
+    if [ "$netroot" = "dhcp6" ]; then
+        do_dhcp -6
+    else
+        do_dhcp -4
+    fi
+fi
+
+
+# Specific configuration, spin through the kernel command line
+# looking for ip= lines
+for p in $(getargs ip=); do
+    ip_to_var $p
+    # skip ibft
+    [ "$autoconf" = "ibft" ] && continue
+
+    case "$dev" in
+        ??:??:??:??:??:??)  # MAC address
+            _dev=$(iface_for_mac $dev)
+            [ -n "$_dev" ] && dev="$_dev"
+            ;;
+        ??-??-??-??-??-??)  # MAC address in BOOTIF form
+            _dev=$(iface_for_mac $(fix_bootif $dev))
+            [ -n "$_dev" ] && dev="$_dev"
+            ;;
+    esac
+
+    # If this option isn't directed at our interface, skip it
+    [ -n "$dev" ] && [ "$dev" != "$netif" ] && \
+    [ "$use_bridge" != 'true' ] && \
+    [ "$use_vlan" != 'true' ] && continue
+
+    # setup nameserver
+    namesrv="$dns1 $dns2 $(getargs nameserver)"
+    for s in $namesrv; do
+        echo nameserver $s >> /tmp/net.$netif.resolv.conf
+    done
+
+    # Store config for later use
+    for i in ip srv gw mask hostname macaddr dns1 dns2; do
+        eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
+    done > /tmp/net.$netif.override
+
+    for autoopt in $(str_replace "$autoconf" "," " "); do
+        case $autoopt in
+            dhcp|on|any)
+                do_dhcp -4 ;;
+            dhcp6)
+                load_ipv6
+                do_dhcp -6 ;;
+            auto6)
+                do_ipv6auto ;;
+            *)
+                do_static ;;
+        esac
+    done
+
+    > /tmp/net.${netif}.up
+
+    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
+
+    exit 0
+done
+
+# netif isn't the top stack? Then we should exit here.
+# eg. netif is bond0. br0 is on top of it. dhcp br0 is correct but dhcp
+#     bond0 doesn't make sense.
+if [ -n "$DO_BOND_SETUP" -o -n "$DO_TEAM_SETUP" -o -n "$DO_VLAN_SETUP" ]; then
+    exit 0
+fi
+
+# no ip option directed at our interface?
+if [ ! -e /tmp/net.${netif}.up ]; then
+    if getargs 'ip=dhcp6'; then
+        load_ipv6
+        do_dhcp -6
+    else
+        do_dhcp -4
+    fi
+fi
+
+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
@@ -4,7 +4,6 @@

 check() {
    local _program
-    . $dracutfunctions

    for _program in ip arping dhclient ; do
        if ! type -P $_program >/dev/null; then
@@ -17,7 +16,6 @@ check() {
 }

 depends() {
-    [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg
    return 0
 }

@@ -25,8 +23,9 @@ installkernel() {
    # Include wired net drivers, excluding wireless

    net_module_filter() {
-        local _net_drivers='eth_type_trans|register_virtio_device'
-        local _unwanted_drivers='/(wireless|isdn|uwb)/'
+        local _net_drivers='eth_type_trans|register_virtio_device|usbnet_open'
+        local _unwanted_drivers='/(wireless|isdn|uwb|net/ethernet|net/phy|net/team)/'
+        local _ret
        # subfunctions inherit following FDs
        local _merge=8 _side2=9
        function nmf1() {
@@ -42,6 +41,7 @@ installkernel() {
                && ! $_fcont =~ iw_handler_get_spy ]] \
                && echo "$_fname"
            done
+            return 0
        }
        function rotor() {
            local _f1 _f2
@@ -51,50 +51,92 @@ installkernel() {
                    echo "$_f2" 1>&${_side2}
                fi
            done | nmf1 1>&${_merge}
+            return 0
        }
        # Use two parallel streams to filter alternating modules.
        set +x
        eval "( ( rotor ) ${_side2}>&1 | nmf1 ) ${_merge}>&1"
        [[ $debug ]] && set -x
+        return 0
    }

-    { find_kernel_modules_by_path drivers/net; find_kernel_modules_by_path drivers/s390/net; } \
+    { find_kernel_modules_by_path drivers/net; if [ "$_arch" = "s390" -o "$_arch" = "s390x" ]; then find_kernel_modules_by_path drivers/s390/net; fi; } \
        | net_module_filter | instmods

-    instmods ecb arc4
-    # bridge modules
-    instmods bridge stp llc
-    instmods ipv6
-    # bonding
-    instmods bonding
+    #instmods() will take care of hostonly
+    instmods \
+        =drivers/net/phy \
+        =drivers/net/team \
+        =drivers/net/ethernet \
+        ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net
 }

 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"
-    inst "$moddir/net-lib.sh" "/lib/net-lib.sh"
+    inst_multiple ip arping dhclient sed
+    inst_multiple -o ping ping6
+    inst_multiple -o brctl
+    inst_multiple -o teamd teamdctl teamnl
+    inst_simple /etc/libnl/classid
+    inst_script "$moddir/ifup.sh" "/sbin/ifup"
+    inst_script "$moddir/netroot.sh" "/sbin/netroot"
+    inst_script "$moddir/dhclient-script.sh" "/sbin/dhclient-script"
+    inst_simple "$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 92 "$moddir/parse-ibft.sh"
+    inst_hook cmdline 95 "$moddir/parse-vlan.sh"
    inst_hook cmdline 96 "$moddir/parse-bond.sh"
+    inst_hook cmdline 96 "$moddir/parse-team.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"
+
+    # install all config files for teaming
+    unset TEAM_MASTER
+    unset TEAM_CONFIG
+    unset TEAM_PORT_CONFIG
+    unset HWADDR
+    unset SUBCHANNELS
+    for i in /etc/sysconfig/network-scripts/ifcfg-*; do
+        [ -e "$i" ] || continue
+        case "$i" in
+            *~ | *.bak | *.orig | *.rpmnew | *.rpmorig | *.rpmsave)
+                continue
+                ;;
+        esac
+        (
+            . "$i"
+            if ! [ "${ONBOOT}" = "no" -o "${ONBOOT}" = "NO" ] \
+                    && [ -n "${TEAM_MASTER}${TEAM_CONFIG}${TEAM_PORT_CONFIG}" ]; then
+                if [ -n "$TEAM_CONFIG" ] && [ -n "$DEVICE" ]; then
+                    mkdir -p $initdir/etc/teamd
+                    printf -- "%s" "$TEAM_CONFIG" > "$initdir/etc/teamd/${DEVICE}.conf"
+                elif [ -n "$TEAM_PORT_CONFIG" ]; then
+                    inst_simple "$i"
+
+                    HWADDR="$(echo $HWADDR | sed 'y/ABCDEF/abcdef/')"
+                    if [ -n "$HWADDR" ]; then
+                        ln_r "$i" "/etc/sysconfig/network-scripts/mac-${HWADDR}.conf"
+                    fi
+
+                    SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')"
+                    if [ -n "$SUBCHANNELS" ]; then
+                        ln_r "$i" "/etc/sysconfig/network-scripts/ccw-${SUBCHANNELS}.conf"
+                    fi
+                fi
+            fi
+        )
+    done

    _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.*" \
+        {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*"

+    dracut_need_initqueue
 }

--- a/modules.d/40network/net-genrules.sh
+++ b/modules.d/40network/net-genrules.sh
@@ -2,62 +2,106 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh

-# pxelinux provides macaddr '-' separated, but we need ':'
-fix_bootif() {
-    local macaddr=${1}
-    local IFS='-'
-    macaddr=$(for i in ${macaddr} ; do echo -n $i:; done)
-    macaddr=${macaddr%:}
-    # strip hardware type field from pxelinux
-    [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:}
-    echo $macaddr
-}
+getargbool 0 rd.neednet && NEEDNET=1

 # Don't continue if we don't need network
-[ -z "$netroot" ] && ! getargbool 0 rd.neednet && return;
+if [ -z "$netroot" ] && [ ! -e "/tmp/net.ifaces" ] && [ "$NEEDNET" != "1" ]; then
+    return
+fi
+
+command -v fix_bootif >/dev/null || . /lib/net-lib.sh

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

    # bond: attempt only the defined interface (override bridge defines)
-    if [ -e /tmp/bond.info ]; then
-        . /tmp/bond.info
+    for i in /tmp/bond.*.info; do
+        [ -e "$i" ] || continue
+        unset bondslaves
+        unset bondname
+        . "$i"
        # It is enough to fire up only one
-        IFACES=${bondslaves%% *}
+        IFACES="$IFACES ${bondslaves%% *}"
+        MASTER_IFACES="$MASTER_IFACES ${bondname}"
+    done
+
+    for i in /tmp/team.*.info; do
+        [ -e "$i" ] || continue
+        unset teamslaves
+        unset teammaster
+        . "$i"
+        IFACES="$IFACES ${teamslaves}"
+        MASTER_IFACES="$MASTER_IFACES ${teammaster}"
+    done
+
+    if [ -e /tmp/vlan.info ]; then
+        . /tmp/vlan.info
+        IFACES="$IFACES $phydevice"
+        MASTER_IFACES="$MASTER_IFACES ${vlanname}"
    fi

-    # 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"
+    if [ -z "$IFACES" ]; then
+        [ -e /tmp/net.ifaces ] && read IFACES < /tmp/net.ifaces
+    fi
+
+    if [ -e /tmp/net.bootdev ]; then
+        bootdev=$(cat /tmp/net.bootdev)
+    fi
+
+    ifup='/sbin/ifup $env{INTERFACE}'
+    [ -z "$netroot" ] && ifup="$ifup -m"
+
+    runcmd="RUN+=\"/sbin/initqueue --name ifup-\$env{INTERFACE} --unique --onetime $ifup\""
+
+    # We have some specific interfaces to handle
+    if [ -n "$IFACES" ]; then
+        echo 'SUBSYSTEM!="net", GOTO="net_end"'
+        echo 'ACTION!="add|change|move", GOTO="net_end"'
+        for iface in $IFACES; do
+            case "$iface" in
+                ??:??:??:??:??:??)  # MAC address
+                    cond="ATTR{address}==\"$iface\""
+                    echo "$cond, $runcmd, GOTO=\"net_end\""
+                    ;;
+                ??-??-??-??-??-??)  # MAC address in BOOTIF form
+                    cond="ATTR{address}==\"$(fix_bootif $iface)\""
+                    echo "$cond, $runcmd, GOTO=\"net_end\""
+                    ;;
+                *)                  # an interface name
+                    cond="ENV{INTERFACE}==\"$iface\""
+                    echo "$cond, $runcmd, GOTO=\"net_end\""
+                    cond="NAME==\"$iface\""
+                    echo "$cond, $runcmd, GOTO=\"net_end\""
+                    ;;
+            esac
+            # The GOTO prevents us from trying to ifup the same device twice
+        done
+        echo 'LABEL="net_end"'
+
+        if [ -n "$MASTER_IFACES" ]; then
+            wait_ifaces=$MASTER_IFACES
        else
-            printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE} -m"\n' "$BOOTIF"
+            wait_ifaces=$IFACES
        fi

-    # 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"
+        for iface in $wait_ifaces; do
+            if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
+                echo "[ -f /tmp/net.${iface}.did-setup ]" >$hookdir/initqueue/finished/wait-$iface.sh
            fi
        done
-
    # Default: We don't know the interface to use, handle all
+    # Fixme: waiting for the interface as well.
    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
+        cond='ACTION=="add", SUBSYSTEM=="net"'
+        # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh
+        echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
    fi

-} > /etc/udev/rules.d/60-net.rules
+# if you change the name of "90-net.rules", also change modules.d/80cms/cmssetup.sh
+} > /etc/udev/rules.d/90-net.rules
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh

 get_ip() {
    local iface="$1" ip=""
@@ -12,8 +14,13 @@ iface_for_remote_addr() {
    echo $5
 }

+iface_for_ip() {
+    set -- $(ip -o addr show to $1)
+    echo $2
+}
+
 iface_for_mac() {
-    local interface="" mac="$(echo $1 | tr '[:upper:]' '[:lower:]')"
+    local interface="" mac="$(echo $1 | sed 'y/ABCDEF/abcdef/')"
    for interface in /sys/class/net/*; do
        if [ $(cat $interface/address) = "$mac" ]; then
            echo ${interface##*/}
@@ -21,13 +28,636 @@ iface_for_mac() {
    done
 }

+# get the iface name for the given identifier - either a MAC, IP, or iface name
+iface_name() {
+    case $1 in
+        ??:??:??:??:??:??|??-??-??-??-??-??) iface_for_mac $1 ;;
+        *:*:*|*.*.*.*) iface_for_ip $1 ;;
+        *) echo $1 ;;
+    esac
+}
+
+# list the configured interfaces
+configured_ifaces() {
+    local IFACES="" iface_id="" rv=1
+    [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
+    if { pidof udevd || pidof systemd-udevd; } > /dev/null; then
+        for iface_id in $IFACES; do
+            echo $(iface_name $iface_id)
+            rv=0
+        done
+    else
+        warn "configured_ifaces called before udev is running"
+        echo $IFACES
+        [ -n "$IFACES" ] && rv=0
+    fi
+    return $rv
+}
+
+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
+    [ -e /sys/class/net/$netif/address ] && \
+        rm -f -- /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
+    # TODO: send "offline" uevent?
+}
+
+setup_net() {
+    local netif="$1" f="" gw_ip="" netroot_ip="" iface="" IFACES=""
+    local _p
+    [ -e /tmp/net.$netif.did-setup ] && return
+    [ -e /sys/class/net/$netif/address ] && \
+        [ -e /tmp/net.$(cat /sys/class/net/$netif/address).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
+
+    # add static route
+    for _p in $(getargs rd.route); do
+        route_to_var "$_p" || continue
+        [ -n "$route_dev" ] && [ "$route_dev" != "$netif" ] && continue
+        ip route add "$route_mask" ${route_gw:+via "$route_gw"} ${route_dev:+dev "$route_dev"}
+        if strstr ":" "$route_mask"; then
+            printf -- "%s\n" "$route_mask ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}" \
+                > /tmp/net.route6."$netif"
+        else
+            printf -- "%s\n" "$route_mask ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}" \
+                > /tmp/net.route."$netif"
+        fi
+    done
+
+    # 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" ] && ! strstr "$dest" ":"; then
+        arping -q -f -w 60 -I $netif $dest || info "Resolving $dest via ARP on $netif failed"
+    fi
+    unset layer2
+
+    > /tmp/net.$netif.did-setup
+    [ -e /sys/class/net/$netif/address ] && \
+        > /tmp/net.$(cat /sys/class/net/$netif/address).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=-1 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 :; do
+        num=$(($num+1));
+        [ -e /sys/class/net/$name$num ] && continue
+        for n in $(getargs ifname=); do
+            [ "$name$num" = "${n%%:*}" ] && continue 2
+        done
+        break
+    done
+    echo "ifname=$name$num:$mac" >> /etc/cmdline.d/45-ifname.conf
+    echo "$name$num"
+}
+
+# pxelinux provides macaddr '-' separated, but we need ':'
+fix_bootif() {
+    local macaddr=${1}
+    local IFS='-'
+    macaddr=$(for i in ${macaddr} ; do echo -n $i:; done)
+    macaddr=${macaddr%:}
+    # strip hardware type field from pxelinux
+    [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:}
+    # return macaddr with lowercase alpha characters expected by udev
+    echo $macaddr | sed 'y/ABCDEF/abcdef/'
+}
+
+ibft_to_cmdline() {
+    local iface=""
+    modprobe -q iscsi_ibft
+    (
+        for iface in /sys/firmware/ibft/ethernet*; do
+            local mac="" dev=""
+            local dhcp="" ip="" gw="" mask="" hostname=""
+            local dns1 dns2
+
+            [ -e ${iface}/mac ] || continue
+            mac=$(read a < ${iface}/mac; echo $a)
+            [ -z "$mac" ] && continue
+            dev=$(set_ifname ibft $mac)
+
+            [ -e /tmp/net.${dev}.has_ibft_config ] && continue
+
+            [ -e ${iface}/dhcp ] && dhcp=$(read a < ${iface}/dhcp; echo $a)
+
+            if [ -n "$dhcp" ]; then
+                echo "ip=$dev:dhcp"
+            elif [ -e ${iface}/ip-addr ]; then
+                [ -e ${iface}/ip-addr ] && ip=$(read a < ${iface}/ip-addr; echo $a)
+                # skip not assigned ip adresses
+                [ "$ip" = "0.0.0.0" ] && continue
+                [ -e ${iface}/gateway ] && gw=$(read a < ${iface}/gateway; echo $a)
+                [ -e ${iface}/subnet-mask ] && mask=$(read a < ${iface}/subnet-mask; echo $a)
+                [ -e ${iface}/primary-dns ] && dns1=$(read a < ${iface}/primary-dns; echo $a)
+                [ -e ${iface}/secondary-dns ] && dns2=$(read a < ${iface}/secondary-dns; echo $a)
+                [ -e ${iface}/hostname ] && hostname=$(read a < ${iface}/hostname; echo $a)
+                if [ -n "$ip" ] && [ -n "$mask" ]; then
+                    echo "ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}"
+                else
+                    warn "${iface} does not contain a valid iBFT configuration"
+                    warn "ip-addr=$ip"
+                    warn "gateway=$gw"
+                    warn "subnet-mask=$mask"
+                    warn "hostname=$hostname"
+                fi
+            else
+                info "${iface} does not contain a valid iBFT configuration"
+                ls -l ${iface} | vinfo
+            fi
+
+            if [ -e ${iface}/vlan ]; then
+               vlan=$(read a < ${iface}/vlan; echo $a)
+               if [ "$vlan" -ne "0" ]; then
+                   case "$vlan" in
+                       [0-9]*)
+                           echo "vlan=$dev.$vlan:$dev"
+                           echo $mac > /tmp/net.${dev}.${vlan}.has_ibft_config
+                           ;;
+                       *)
+                           echo "vlan=$vlan:$dev"
+                           echo $mac > /tmp/net.${vlan}.has_ibft_config
+                           ;;
+                   esac
+               else
+                   echo $mac > /tmp/net.${dev}.has_ibft_config
+               fi
+            else
+                echo $mac > /tmp/net.${dev}.has_ibft_config
+            fi
+
+        done
+    ) >> /etc/cmdline.d/40-ibft.conf
+}
+
+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
+
+    unset iscsi_target_name
+    # extract target name
+    case "$v" in
+        *:iqn.*)
+            iscsi_target_name=iqn.${v##*:iqn.}
+            v=${v%:iqn.*}:
+            ;;
+        *:eui.*)
+            iscsi_target_name=eui.${v##*:eui.}
+            v=${v%:eui.*}:
+            ;;
+        *:naa.*)
+            iscsi_target_name=naa.${v##*:naa.}
+            v=${v%:naa.*}:
+            ;;
+    esac
+
+    # parse the rest
+    OLDIFS="$IFS"
+    IFS=:
+    set $v
+    IFS="$OLDIFS"
+
+    iscsi_protocol=$1; shift # ignored
+    iscsi_target_port=$1; shift
+
+    if [ -n "$iscsi_target_name" ]; then
+        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
+        return 0
+    fi
+
+
+    if [ $# -gt 3 ] && [ -n "$1$2" ]; then
+        if [ -z "$3" ] || [ "$3" -ge 0 ]  2>/dev/null ; then
+            iscsi_iface_name=$1; shift
+            iscsi_netdev_name=$1; shift
+        fi
+    fi
+
+    iscsi_lun=$1; shift
+
+    iscsi_target_name=$(printf "%s:" "$@")
+    iscsi_target_name=${iscsi_target_name%:}
+}
+
+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 dns1 dns2
+    case $# in
+        0)  autoconf="error" ;;
+        1)  autoconf=$1 ;;
+        2)  [ -n "$1" ] && dev=$1; [ -n "$2" ] && autoconf=$2 ;;
+        3)  [ -n "$1" ] && dev=$1; [ -n "$2" ] && autoconf=$2; [ -n "$3" ] && mtu=$3 ;;
+        4)  [ -n "$1" ] && dev=$1; [ -n "$2" ] && autoconf=$2; [ -n "$3" ] && mtu=$3; [ -n "$4" ] && macaddr=$4 ;;
+        *)  [ -n "$1" ] && ip=$1; [ -n "$2" ] && srv=$2; [ -n "$3" ] && gw=$3; [ -n "$4" ] && mask=$4;
+            [ -n "$5" ] && hostname=$5; [ -n "$6" ] && dev=$6; [ -n "$7" ] && autoconf=$7;
+            case "$8" in
+                [0-9]*:*|[0-9]*.[0-9]*.[0-9]*.[0-9]*)
+                    dns1="$8"
+                    [ -n "$9" ] && dns2="$9"
+                    ;;
+                [0-9]*)
+                    mtu="$8"
+                    ;;
+                *)
+                    if [ -n "${9}" -a -n "${10}" -a -n "${11}" -a -n "${12}" -a -n "${13}" -a -n "${14}" ]; then
+                        macaddr="${9}:${10}:${11}:${12}:${13}:${14}"
+                    fi
+	            ;;
+            esac
+            ;;
+    esac
+
+    # ip=<ipv4-address> means anaconda-style static config argument cluster:
+    # ip=<ip> gateway=<gw> netmask=<nm> hostname=<host> mtu=<mtu>
+    # ksdevice={link|bootif|ibft|<MAC>|<ifname>}
+    if strstr "$autoconf" "*.*.*.*"; then
+        ip="$autoconf"
+        gw=$(getarg gateway=)
+        mask=$(getarg netmask=)
+        hostname=$(getarg hostname=)
+        dev=$(getarg ksdevice=)
+        autoconf="none"
+        mtu=$(getarg mtu=)
+
+        # handle special values for ksdevice
+        case "$dev" in
+            bootif|BOOTIF) dev=$(fix_bootif $(getarg BOOTIF=)) ;;
+            link) dev="" ;; # FIXME: do something useful with this
+            ibft) dev="" ;; # ignore - ibft is handled elsewhere
+        esac
+    fi
+}
+
+route_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 route_mask route_gw route_dev
+    case $# in
+        2)  [ -n "$1" ] && route_mask="$1"; [ -n "$2" ] && route_gw="$2"
+            return 0;;
+        3)  [ -n "$1" ] && route_mask="$1"; [ -n "$2" ] && route_gw="$2"; [ -n "$3" ] && route_dev="$3"
+            return 0;;
+        *)  return 1;;
+    esac
+}
+
+parse_ifname_opts() {
+    local IFS=:
+    set $1
+
+    case $# in
+        7)
+            ifname_if=$1
+            # udev requires MAC addresses to be lower case
+            ifname_mac=$(echo $2:$3:$4:$5:$6:$7 | sed 'y/ABCDEF/abcdef/')
+            ;;
+        *)
+            die "Invalid arguments for ifname="
+            ;;
+    esac
+
+    case $ifname_if in
+        eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]|eth[0-9][0-9][0-9][0-9])
+            warn "ifname=$ifname_if uses the kernel name space for interfaces"
+            warn "This can fail for multiple network interfaces and is discouraged!"
+            warn "Please use a custom name like \"netboot\" or \"bluesocket\""
+            warn "or use biosdevname and no ifname= at all."
+            ;;
+    esac
+
+}
+
+# some network driver need long time to initialize, wait before it's ready.
+wait_for_if_link() {
+    local cnt=0
+    local li
+    while [ $cnt -lt 600 ]; do
+        li=$(ip -o link show dev $1 2>/dev/null)
+        [ -n "$li" ] && return 0
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+wait_for_if_up() {
+    local cnt=0
+    local li
+    while [ $cnt -lt 200 ]; do
+        li=$(ip -o link show up dev $1)
+        [ -n "$li" ] && [ -z "${li##*state UP*}" ] && return 0
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+wait_for_route_ok() {
+    local cnt=0
+    while [ $cnt -lt 200 ]; do
+        li=$(ip route show)
+        [ -n "$li" ] && [ -z "${li##*$1*}" ] && return 0
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+wait_for_ipv6_dad() {
+    local cnt=0
+    local li
+    while [ $cnt -lt 500 ]; do
+        li=$(ip -6 addr show dev $1)
+        strstr "$li" "tentative" || return 0
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+wait_for_ipv6_auto() {
+    local cnt=0
+    local li
+    while [ $cnt -lt 400 ]; do
+        li=$(ip -6 addr show dev $1)
+        if ! strstr "$li" "tentative"; then
+            strstr "$li" "dynamic" && return 0
+        fi
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+linkup() {
+    wait_for_if_link $1 2>/dev/null\
+     && ip link set $1 up 2>/dev/null\
+     && wait_for_if_up $1 2>/dev/null
+}
+
+type hostname >/dev/null 2>&1 || \
+hostname() {
+	cat /proc/sys/kernel/hostname
+}
+
 iface_has_link() {
    local interface="$1" flags=""
    [ -n "$interface" ] || return 2
    interface="/sys/class/net/$interface"
    [ -d "$interface" ] || return 2
-    flags=$(cat $interface/flags)
-    echo $(($flags|0x41)) > $interface/flags # 0x41: IFF_UP|IFF_RUNNING
+    linkup "$1"
    [ "$(cat $interface/carrier)" = 1 ] || return 1
    # XXX Do we need to reset the flags here? anaconda never bothered..
 }
+
+find_iface_with_link() {
+    local iface_path="" iface=""
+    for iface_path in /sys/class/net/*; do
+        iface=${iface_path##*/}
+        str_starts "$iface" "lo" && continue
+        if iface_has_link $iface; then
+            echo "$iface"
+            return 0
+        fi
+    done
+    return 1
+}
+
+is_persistent_ethernet_name() {
+    local _netif="$1"
+    local _name_assign_type="0"
+
+    [ -f "/sys/class/net/$_netif/name_assign_type" ] \
+        && _name_assign_type=$(cat "/sys/class/net/$_netif/name_assign_type")
+
+    # NET_NAME_ENUM 1
+    [ "$_name_assign_type" = "1" ] && return 1
+
+    # NET_NAME_PREDICTABLE 2
+    [ "$_name_assign_type" = "2" ] && return 0
+
+    case "$_netif" in
+        # udev persistent interface names
+        eno[0-9]|eno[0-9][0-9]|eno[0-9][0-9][0-9]*)
+            ;;
+        ens[0-9]|ens[0-9][0-9]|ens[0-9][0-9][0-9]*)
+            ;;
+        enp[0-9]s[0-9]*|enp[0-9][0-9]s[0-9]*|enp[0-9][0-9][0-9]*s[0-9]*)
+            ;;
+        enP*p[0-9]s[0-9]*|enP*p[0-9][0-9]s[0-9]*|enP*p[0-9][0-9][0-9]*s[0-9]*)
+            ;;
+        # biosdevname
+        em[0-9]|em[0-9][0-9]|em[0-9][0-9][0-9]*)
+            ;;
+        p[0-9]p[0-9]*|p[0-9][0-9]p[0-9]*|p[0-9][0-9][0-9]*p[0-9]*)
+            ;;
+        *)
+            return 1
+    esac
+    return 0
+}
+
+is_kernel_ethernet_name() {
+    local _netif="$1"
+    local _name_assign_type="1"
+
+    if [ -e "/sys/class/net/$_netif/name_assign_type" ]; then
+        _name_assign_type=$(cat "/sys/class/net/$_netif/name_assign_type")
+
+        case "$_name_assign_type" in
+            2|3|4)
+                # NET_NAME_PREDICTABLE 2
+                # NET_NAME_USER 3
+                # NET_NAME_RENAMED 4
+                return 1
+                ;;
+            1|*)
+                # NET_NAME_ENUM 1
+                return 0
+                ;;
+        esac
+    fi
+
+    # fallback to error prone manual name check
+    case "$_netif" in
+        eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*)
+            return 0
+            ;;
+        *)
+            return 1
+    esac
+
+}
+
+iface_get_subchannels() {
+    local _netif
+    local _subchannels
+
+    _netif="$1"
+
+    _subchannels=$({
+        for i in /sys/class/net/$_netif/device/cdev[0-9]*; do
+            [ -e $i ] || continue
+            channel=$(readlink -f $i)
+            printf -- "%s" "${channel##*/},"
+        done
+    })
+    [ -n "$_subchannels" ] || return 1
+
+    printf -- "%s" ${_subchannels%,}
+}
--- 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/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`kate: space-indent on; tab-width 4; indent-width 4; replace-tabs on; eol unix;`
				`@@ -0,0 +1 @@`
				`kate: space-indent on; tab-width 8; indent-width 8; replace-tabs on; eol unix;`