fcoe: Allow more time for the bnx2x link negotiation before brining up fcoe interfaces.

bnx2x can take no longer than 3 seconds to initialize the link in some setups which can cause fipvlan to fail and thus the fcoe interface(s) won't be created. Add another 10 seconds to give the link enough time to initialize. Signed-off-by: Chad Dupuis <chad.dupuis@cavium.com> Cherry-picked from: 3966a1e1ee Resolves: #1482185
iscsi: iscsistart -b does not like to be started in parallel
2017-12-07 15:54:19 +01:00 · 2016-04-29 13:40:43 +02:00 · 2016-04-07 14:19:04 +02:00 · 2016-04-06 10:29:51 +02:00 · 2016-04-06 10:24:58 +02:00 · 2016-03-10 14:34:20 +01:00
305 changed files with 13936 additions and 1370 deletions
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -0,0 +1,3 @@
+((nil . ((setq sh-basic-offset: 4)
+         (setq indent-tabs-mode nil)
+         )))
--- 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
@@ -0,0 +1,6 @@
+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)>
--- a/37
+++ b/37
@@ -1,11 +1,32 @@
-Andreas Thienemann <andreas@bawue.net>
-Bill Nottingham <notting@redhat.com>
-Dave Jones <davej@redhat.com>
-David Dillow <dave@thedillows.org>
 Harald Hoyer <harald@redhat.com>
-Jeremy Katz <katzj@redhat.com>
-Peter Jones <pjones@redhat.com>
-Seewer Philippe <philippe.seewer@bfh.ch>
 Victor Lowther <victor.lowther@gmail.com>
+Philippe Seewer <philippe.seewer@bfh.ch>
 Warren Togami <wtogami@redhat.com>
-
+Jeremy Katz <katzj@redhat.com>
+David Dillow <dave@thedillows.org>
+Andreas Thienemann <andreas@bawue.net>
+Hans de Goede <hdegoede@redhat.com>
+Peter Jones <pjones@redhat.com>
+Luca Berra <bluca@comedia.it>
+Marc Grimme <grimme@atix.de>
+Andrey Borzenkov <arvidjaar@mail.ru>
+Bill Nottingham <notting@redhat.com>
+Daniel Drake <dsd@laptop.org>
+David Cantrell <dcantrell@redhat.com>
+Lance Albertson <lance@osuosl.org>
+Michael Ploujnikov <plouj@somanetworks.com>
+Alan Jenkins <alan-jenkins@tuffmail.co.uk>
+Dan Horák <dan@danny.cz>
+Joey Boggs <jboggs@redhat.com>
+Dave Jones <davej@redhat.com>
+Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Luca Berra <bluca@vodka.it>
+Michal Schmidt <mschmidt@redhat.com>
+Mike Snitzer <msnitzer@redhat.com>
+Mike Snitzer <snitzer@redhat.com>
+Munehiro Matsuda <haro@kgt.co.jp>
+Peter Rajnoha <prajnoha@redhat.com>
+Quentin Armitage <quentin@armitage.org.uk>
+Sergey Fionov <fionov@gmail.com>
+Thilo Bangert <thilo.bangert@gmx.net>
+Yanko Kaneti <yaneti@declera.com>
--- a/93
+++ b/93
@@ -1,38 +1,66 @@
-VERSION=0.2
+VERSION=004
 GITVERSION=$(shell [ -d .git ] && git rev-list  --abbrev-commit  -n 1 HEAD  |cut -b 1-8)

-prefix = /usr
-datadir = ${prefix}/share
-pkglibdir = ${datadir}/dracut
-sysconfdir = ${prefix}/etc
-sbindir = ${prefix}/sbin
-mandir = ${prefix}/share/man
+prefix ?= /usr
+datadir ?= ${prefix}/share
+pkglibdir ?= ${datadir}/dracut
+sysconfdir ?= ${prefix}/etc
+sbindir ?= ${prefix}/sbin
+mandir ?= ${prefix}/share/man
+
+
+.PHONY: install clean archive rpm testimage test all check AUTHORS
+
+ifeq (1,${WITH_SWITCH_ROOT})
+targets = modules.d/99base/switch_root
+else
+targets = 
+endif
+
+all: $(targets) dracut-rhel6.html
+
+dracut-rhel6.html: dracut-rhel6.xml
+	xsltproc -o dracut-rhel6.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-rhel6.xml

 modules.d/99base/switch_root: switch_root.c
 	gcc -D _GNU_SOURCE -D 'PACKAGE_STRING="dracut"' -std=gnu99 -fsigned-char -g -O2 -o modules.d/99base/switch_root switch_root.c	

-all: modules.d/99base/switch_root
-
-.PHONY: install clean archive rpm testimage test all check
-
 install:
 	mkdir -p $(DESTDIR)$(pkglibdir)
 	mkdir -p $(DESTDIR)$(sbindir)
 	mkdir -p $(DESTDIR)$(sysconfdir)
 	mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
-	mkdir -p $(DESTDIR)$(mandir)/man8
+	mkdir -p $(DESTDIR)$(mandir)/man{1,5,8}
 	install -m 0755 dracut $(DESTDIR)$(sbindir)/dracut
+	install -m 0755 dracut-gencmdline $(DESTDIR)$(sbindir)/dracut-gencmdline
+	install -m 0755 dracut-catimages $(DESTDIR)$(sbindir)/dracut-catimages
+	install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(sbindir)/mkinitrd
+	install -m 0755 lsinitrd $(DESTDIR)$(sbindir)/lsinitrd
+ifeq (1,${WITH_SWITCH_ROOT})
 	install -m 0755 modules.d/99base/switch_root $(DESTDIR)$(sbindir)/switch_root
+endif
 	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
 	cp -arx modules.d $(DESTDIR)$(pkglibdir)
 	install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8
+	install -m 0644 mkinitrd.8 $(DESTDIR)$(mandir)/man8
+	install -m 0644 lsinitrd.1 $(DESTDIR)$(mandir)/man1
+	install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8
+	install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8
+	install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5
+ifeq (1,${WITH_SWITCH_ROOT})
 	rm $(DESTDIR)$(pkglibdir)/modules.d/99base/switch_root
+endif

 clean:
 	rm -f *~
 	rm -f modules.d/99base/switch_root
 	rm -f test-*.img
+	rm -f dracut-*.rpm dracut-*.tar.bz2
 	make -C test clean

 archive: dracut-$(VERSION)-$(GITVERSION).tar.bz2
@@ -42,24 +70,47 @@ dist: dracut-$(VERSION).tar.bz2
 dracut-$(VERSION).tar.bz2:
 	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ |bzip2 > dracut-$(VERSION).tar.bz2

+dracut-$(VERSION).tar.gz:
+	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ |gzip > dracut-$(VERSION).tar.gz
+
 dracut-$(VERSION)-$(GITVERSION).tar.bz2:
 	git archive --format=tar HEAD --prefix=dracut-$(VERSION)-$(GITVERSION)/ |bzip2 > dracut-$(VERSION)-$(GITVERSION).tar.bz2


 rpm: dracut-$(VERSION).tar.bz2
-	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" -ba dracut.spec 
-	rm -fr BUILD BUILDROOT
+	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; \
+	(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 )

-gitrpm: dracut-$(VERSION)-$(GITVERSION).tar.bz2
-	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" --define "gittag $(GITVERSION)" -ba dracut.spec 
-	rm -fr BUILD BUILDROOT
-
-check: all
+syncheck:
 	@ret=0;for i in modules.d/99base/init modules.d/*/*.sh; do \
+                [ "$${i##*/}" = "caps.sh" ] && continue; \
 		dash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret
-	make -C test check
+	@ret=0;for i in dracut modules.d/02caps/caps.sh modules.d/*/install modules.d/*/installkernel modules.d/*/check; do \
+		bash -n "$$i" ; ret=$$(($$ret+$$?)); \
+	done;exit $$ret
+
+check: all syncheck
+	$(MAKE) -C test check

 testimage: all
-	./dracut -l -f test-$(shell uname -r).img $(shell uname -r)
+	./dracut -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 
+
+hostimage: all
+	./dracut -H -l -a debug -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
--- a/286
+++ b/286
@@ -0,0 +1,286 @@
+dracut-006
+==========
+- fixed mdraid with IMSM
+- fixed dracut manpages
+- dmraid parse different error messages
+- add cdrom polling mechanism for slow cdroms
+- add module btrfs
+- add btrfsctl scan for btrfs multi-devices (raid)
+- teach dmsquash live-root to use rootflags
+- trigger udev with action=add
+- fixed add_drivers handling 
+- add sr_mod
+- use pigz instead of gzip, if available
+
+dracut-005
+==========
+- dcb support to dracut's FCoE support 
+- add readonly overlay support for dmsquash
+- add keyboard kernel modules
+- dracut.conf: added add_dracutmodules
+- add /etc/dracut.conf.d
+- add preliminary IPv6 support
+- bugfixes
+
+
+dracut-004
+==========
+- dracut-lib: read multiple lines from $init/etc/cmdline
+- lsinitrd and mkinitrd
+- dmsquash: add support for loopmounted *.iso files
+- lvm: add rd_LVM_LV and "--poll n"
+- user suspend support
+- add additional drivers in host-only mode, too
+- improved emergency shell
+- support for compressed kernel modules
+- support for loading Xen modules
+- rdloaddriver kernel command line parameter
+- man pages for dracut-catimages and dracut-gencmdline
+- bugfixes
+
+dracut-003
+==========
+- add debian package modules
+- add dracut.conf manpage
+- add module 90multipath
+- add module 01fips
+- crypt: ignore devices in /etc/crypttab (root is not in there)
+  unless rd_NO_CRYPTTAB is specified
+- kernel-modules: add scsi_dh scsi_dh_rdac scsi_dh_emc
+- add multinic support
+- add s390 zfcp support
+- add s390 dasd support
+- add s390 network support
+- fixed dracut-gencmdline for root=UUID or LABEL
+- do not destroy assembled raid arrays if mdadm.conf present
+- mount /dev/shm 
+- let udevd not resolve group and user names
+- moved network from udev to initqueue
+- improved debug output: specifying "rdinitdebug" now logs
+  to dmesg, console and /init.log
+- strip kernel modules which have no x bit set
+- redirect stdin, stdout, stderr all RW to /dev/console
+  so the user can use "less" to view /init.log and dmesg
+- add new device mapper udev rules and dmeventd 
+- fixed dracut-gencmdline for root=UUID or LABEL
+- do not destroy assembled raid arrays if mdadm.conf present
+- mount /dev/shm
+- let udevd not resolve group and user names
+- preserve timestamps of tools on initramfs generation
+- generate symlinks for binaries correctly
+- moved network from udev to initqueue
+- mount nfs3 with nfsvers=3 option and retry with nfsvers=2
+- fixed nbd initqueue-finished
+- improved debug output: specifying "rdinitdebug" now logs
+  to dmesg, console and /init.log
+- strip kernel modules which have no x bit set
+- redirect stdin, stdout, stderr all RW to /dev/console
+  so the user can use "less" to view /init.log and dmesg
+- make install of new dm/lvm udev rules optionally
+- add new device mapper udev rules and dmeventd
+- Fix LiveCD boot regression
+- bail out if selinux policy could not be loaded and
+  selinux=0 not specified on kernel command line
+- do not cleanup dmraids
+- copy over lvm.conf
+
+dracut-002
+==========
+- add ifname= argument for persistent netdev names
+- new /initqueue-finished to check if the main loop can be left
+- copy mdadm.conf if --mdadmconf set or mdadmconf in dracut.conf
+- plymouth: use plymouth-populate-initrd
+- add add_drivers for dracut and dracut.conf
+- add modprobe scsi_wait_scan to be sure everything was scanned
+- fix for several problems with md raid containers
+- fix for selinux policy loading
+- fix for mdraid for IMSM
+- fix for bug, which prevents installing 61-persistent-storage.rules (bug #520109)
+- fix for missing grep for md
+
+dracut-001
+==========
+- better --hostonly checks
+- better lvm/mdraid/dmraid handling
+- fcoe booting support
+    Supported cmdline formats:
+    fcoe=<networkdevice>:<dcb|nodcb>
+    fcoe=<macaddress>:<dcb|nodcb>
+    
+    Note currently only nodcb is supported, the dcb option is reserved for
+    future use.
+    
+    Note letters in the macaddress must be lowercase!
+    
+    Examples:
+    fcoe=eth0:nodcb
+    fcoe=4A:3F:4C:04:F8:D7:nodcb
+
+- Syslog support for dracut   
+    This module provides syslog functionality in the initrd.
+    This is especially interesting when complex configuration being
+    used to provide access to the device the rootfs resides on.
+
+
+dracut-0.9
+==========
+- let plymouth attach to the terminal (nice text output now)
+- new kernel command line parameter "rdinfo" show dracut output, even when
+  "quiet" is specified
+- rd_LUKS_UUID is now handled correctly
+- dracut-gencmdline: rd_LUKS_UUID and rd_MD_UUID is now correctly generated
+- now generates initrd-generic with around 15MB
+- smaller bugfixes
+
+dracut-0.8
+==========
+- iSCSI with username and password
+- support for live images (dmsquashed live images)
+- iscsi_firmware fixes
+- smaller images
+- bugfixes
+
+dracut-0.7
+==========
+- dracut:     strip binaries in initramfs
+    
+           --strip
+                  strip binaries in the initramfs (default)
+    
+           --nostrip
+                  do not strip binaries in the initramfs
+- dracut-catimages
+    
+    Usage: ./dracut-catimages [OPTION]... <initramfs> <base image>
+    [<image>...]
+    Creates initial ramdisk image by concatenating several images from the
+    command
+    line and /boot/dracut/
+    
+      -f, --force           Overwrite existing initramfs file.
+      -i, --imagedir        Directory with additional images to add
+                            (default: /boot/dracut/)
+      -o, --overlaydir      Overlay directory, which contains 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            This message
+      --debug               Output debug information of the build process
+      -v, --verbose         Verbose output during the build process
+
+- s390 dasd support
+
+dracut-0.6
+==========
+- dracut: add --kernel-only and --no-kernel arguments
+    
+           --kernel-only
+                  only install kernel drivers and firmware files
+    
+           --no-kernel
+                  do not install kernel drivers and firmware files
+    
+    All kernel module related install commands moved from "install"
+    to "installkernel".
+    
+    For "--kernel-only" all installkernel scripts of the specified
+    modules are used, regardless of any checks, so that all modules
+    which might be needed by any dracut generic image are in.
+    
+    The basic idea is to create two images. One image with the kernel
+    modules and one without. So if the kernel changes, you only have
+    to replace one image.
+    
+    Grub and the kernel can handle multiple images, so grub entry can
+    look like this:
+    
+    title Fedora (2.6.29.5-191.fc11.i586)
+            root (hd0,0)
+            kernel /vmlinuz-2.6.29.5-191.fc11.i586 ro rhgb quiet
+            initrd /initrd-20090722.img /initrd-kernel-2.6.29.5-191.fc11.i586.img /initrd-config.img
+    
+    initrd-20090722.img
+      the image provided by the initrd rpm
+      one old backup version is kept like with the kernel
+    
+    initrd-kernel-2.6.29.5-191.fc11.i586.img
+      the image provided by the kernel rpm
+    
+    initrd-config.img
+      optional image with local configuration files
+
+- dracut: add --kmoddir directory, where to look for kernel modules
+    
+           -k, --kmoddir [DIR]
+                  specify the directory, where to look for kernel modules
+
+
+
+dracut-0.5
+==========
+- more generic (all plymouth modules, all keyboards, all console fonts)
+- more kernel command line parameters (see also man dracut(8))
+- a helper tool, which generates the kernel command line (dracut-gencmdline)
+- bridged network boot
+- a lot of new command line parameter
+
+dracut-0.4
+==========
+- bugfixes
+- firmware loading support
+- new internal queue (initqueue)
+    initqueue now loops until /dev/root exists or root is mounted
+    
+    init now has the following points to inject scripts:
+    
+    /cmdline/*.sh
+       scripts for command line parsing
+    
+    /pre-udev/*.sh
+       scripts to run before udev is started
+    
+    /pre-trigger/*.sh
+       scripts to run before the main udev trigger is pulled
+    
+    /initqueue/*.sh
+       runs in parallel to the udev trigger
+       Udev events can add scripts here with /sbin/initqueue.
+       If /sbin/initqueue is called with the "--onetime" option, the script
+       will be removed after it was run.
+       If /initqueue/work is created and udev >= 143 then this loop can
+       process the jobs in parallel to the udevtrigger.
+       If the udev queue is empty and no root device is found or no root
+       filesystem was mounted, the user will be dropped to a shell after
+       a timeout.
+       Scripts can remove themselves from the initqueue by "rm $job".
+    
+    /pre-mount/*.sh
+       scripts to run before the root filesystem is mounted
+       NFS is an exception, because it has no device node to be created
+       and mounts in the udev events
+    
+    /mount/*.sh
+       scripts to mount the root filesystem
+       NFS is an exception, because it has no device node to be created
+       and mounts in the udev events
+       If the udev queue is empty and no root device is found or no root
+       filesystem was mounted, the user will be dropped to a shell after
+       a timeout.
+    
+    /pre-pivot/*.sh
+       scripts to run before the real init is executed and the initramfs
+       disappears
+       All processes started before should be killed here.
+    
+    The behaviour of the dmraid module demonstrates how to use the new
+    mechanism. If it detects a device which is part of a raidmember from a
+    udev rule, it installs a job to scan for dmraid devices, if the udev
+    queue is empty. After a scan, it removes itsself from the queue.
+
+
+
+dracut-0.3
+==========
+
+- first public version
+
--- a/10
+++ b/10
@@ -21,8 +21,10 @@ as hooks are guaranteed to be the path to slow-down.

 Most of the initrd generation functionality in dracut is provided by a bunch
 of generator modules that are sourced by the main dracut script to install
-specific functionality into the initrd.  They live in the modules subdirectory,
-and use functionality provided by dracut-functions to do their work.
+specific functionality into the initrd.  They live in the modules.d 
+subdirectory, and use functionality provided by dracut-functions to do their 
+work.
+
 Some general rules for writing modules:
 * Use one of the inst family of functions to actually install files
   on to the initrd.  They handle mangling the pathnames and (for binaries,
@@ -59,13 +61,13 @@ the documentation, git access, etc.

 Git Repository:
 http://dracut.git.sourceforge.net/
-git://dracut.git.sourceforge.net/gitroot/dracut
+git://dracut.git.sourceforge.net/gitroot/dracut/dracut

 Trac Instance:
 http://apps.sourceforge.net/trac/dracut/ 

 The git tree can be found at
-git://dracut.git.sourceforge.net/gitroot/dracut  for now.  See the TODO
+git://dracut.git.sourceforge.net/gitroot/dracut/dracut for now.  See the TODO
 file for things which still need to be done and HACKING for some
 instructions on how to get started.  There is also a mailing list that
 is being used for the discussion -- initramfs@vger.kernel.org.  It is
--- a/README.generic
+++ b/README.generic
@@ -8,3 +8,6 @@ To build a generic initramfs, you have to install the following software package
 * mdadm
 * net-tools iproute

+Generic initramfs'es are huge (usually over 10 megs in size uncompressed), but
+should be able to automatically boot any bootable configuration with appropriate
+boot flags (root device, network configuration information, etc.)
--- a/README.kernel
+++ b/README.kernel
@@ -0,0 +1,6 @@
+dracut-kernel is used to pull in all firmware files to build an initrd with 
+only kernel modules and firmware files.
+
+dracut --kernel-only only executes "installkernel" in the modules 
+subdirectories.
+
--- a/README.modules
+++ b/README.modules
@@ -16,7 +16,7 @@ dracut_install_dir/modules.d/
 	   it easy for an earlier module to override the functionality of a 
 	   later module, so that you can have a distro or system specific
 	   module override or modify the functionality of a generic module
-	   without having to patch the mode generic module.
+	   without having to patch the more generic module.

 install: dracut sources this script to install the functionality that a 
 	 module implements onto the initrd.  For the most part, this amounts
@@ -35,7 +35,7 @@ check: Dracut calls this program to check and see if a module can be installed
       are present.  It should exit with a 0 if they are, and a 1 if they are
       not.

-       When called with -H, it should perform the same check that it would
+       When called with -h, it should perform the same check that it would
       without any options, and it should also check to see if the 
       functionality the module implements is being used on the host system.
       For example, if this module handles installing support for LUKS
@@ -43,10 +43,57 @@ check: Dracut calls this program to check and see if a module can be installed
       encrpted volumes are available and the host system has the root
       partition on an encrypted volume, 1 otherwise.

+       When called with -d, it should output a list of dracut modules
+       that it relies upon.  An example would be the nfs and iscsi modules,
+       which rely on the network module to detect and configure network
+       interfaces.
+
       Check may take additional options in the future.  
-       We will most likely grow a module dependency checking system in the
-       near future, and check will need to handle a -d option when we do.

 Any other files in the module will not be touched by dracut directly. 

-You are encouraged to provide a README that descrobes what the module is for.
+You are encouraged to provide a README that describes what the module is for.
+
+
+HOOKS
+=====
+
+init has the following hook points to inject scripts:
+
+/cmdline/*.sh
+   scripts for command line parsing
+
+/pre-udev/*.sh
+   scripts to run before udev is started
+
+/pre-trigger/*.sh
+   scripts to run before the main udev trigger is pulled
+
+/initqueue/*.sh
+   runs in parallel to the udev trigger
+   Udev events can add scripts here with /sbin/initqueue.
+   If /sbin/initqueue is called with the "--onetime" option, the script
+   will be removed after it was run.
+   If /initqueue/work is created and udev >= 143 then this loop can
+   process the jobs in parallel to the udevtrigger.
+   If the udev queue is empty and no root device is found or no root
+   filesystem was mounted, the user will be dropped to a shell after
+   a timeout.
+   Scripts can remove themselves from the initqueue by "rm $job".
+
+/pre-mount/*.sh
+   scripts to run before the root filesystem is mounted
+   Network filesystems like NFS that do not use device files are an 
+   exception. Root can be mounted already at this point.
+
+/mount/*.sh
+   scripts to mount the root filesystem
+   If the udev queue is empty and no root device is found or no root
+   filesystem was mounted, the user will be dropped to a shell after
+   a timeout.
+
+/pre-pivot/*.sh
+   scripts to run before the real init is executed and the initramfs
+   disappears
+   All processes started before should be killed here.
+
--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,53 @@
+dracut (2.26) unstable; urgency=low
+
+  [ Harald Hoyer ]
+  * multipath: install udev rules and helper tools
+  * NEWS update
+  * multipath: install xdr utils
+  * multipath: install multipath kernel module
+  * specfile update
+  * dracut.8: fixed formatting for rootfs and mount options
+  * dracut: check more return codes, check for permissions and use
+    derror
+  * dracut: create initramfs-$(kernelversion).img by default
+  * Makefile: add WITH_SWITCH_ROOT
+  * fips: search different lib paths
+  * kernel-modules: add firewire-ohci to hardcoded modules list
+  * 90dm: install more device mapper kernel modules
+  * specfile update
+
+  [ Peter Jones ]
+  * Use glob for libdir when installing multipath libraries.
+  * Add #!/bin/bash for consistency.
+  * Make sure and get all the multipath related modules.
+  * Bring up multipath devices that are configured in multipath.conf.
+  * Fix missing shell variables.
+  * This has to be executable.
+  * Handle modules with hyphens in their names properly.
+
+  [ Harald Hoyer ]
+  * lvm: scan without monitor
+
+  [ Yanko Kaneti ]
+  * Wildcards need dracut_install
+
+  [ Harald Hoyer ]
+  * lvm/dmraid: make LIBDIR depend on the binary
+  * nfs: install passwd entries for nobody and nfsnobody
+  * nfs: add rd_NFS_DOMAIN parameter to set the NFSv4 domain name
+  * dracut-functions: inst_simple(): do not bail out if target is a dir
+    and exists
+  * dm: install dmsetup
+  * multipath: corrected initqueue parameter
+  * rootfs-block/mount-root: remount root with /etc/fstab filesystem
+    options
+  * test: set PATH
+
+ -- Philippe Seewer <philippe.seewer@.bfh.ch>  Fri, 27 Nov 2009 10:58:26 +0100
+
+dracut (2.21) unstable; urgency=low
+  [ Harald Hoyer ]
+  * fix rd_DASD argument handling (bug #531720)
+  * Resolves: rhbz#531720
+
+ -- Philippe Seewer <philippe.seewer@.bfh.ch>  Fri, 06 Nov 2009 15:52:00 +0100
--- a/debian/compat
+++ b/debian/compat
@@ -0,0 +1 @@
+5
--- a/debian/control
+++ b/debian/control
@@ -0,0 +1,40 @@
+Source: dracut
+Section: utils
+Priority: optional
+Maintainer: Philippe Seewer <philippe.seewer@bfh.ch>
+Build-Depends: debhelper (>= 5.0), cdbs
+Standards-Version: 3.8.3
+Vcs-Browser: http://dracut.git.sourceforge.net/git/gitweb-index.cgi
+Vcs-Git: git://dracut.git.sourceforge.net/gitroot/dracut/dracut
+
+Package: dracut
+Architecture: all
+Recommends: cryptsetup, dmsetup, dmraid, lvm2, mdadm
+Depends: cpio, module-init-tools, udev, ${misc:Depends}
+Provides: linux-initramfs-tool
+Description: A new initramfs infrastructure
+ Unlike existing initramfs's, this is an attempt at having as little as
+ possible hard-coded into the initramfs as possible.  The initramfs has
+ (basically) one purpose in life -- getting the rootfs mounted so that
+ we can transition to the real rootfs.  This is all driven off of
+ device availability.  Therefore, instead of scripts hard-coded to do
+ various things, we depend on udev to create device nodes for us and
+ then when we have the rootfs's device node, we mount and carry on. 
+ Having the root on MD, LVM2, LUKS is supported as well as NFS, iSCSI,
+ NBD and FCOE with dracut-network.
+
+Package: dracut-network
+Architecture: all
+Recommends: nfs-common, open-iscsi, nbd-client
+Depends: dracut, iputils-arping, dhcp3-client, ${misc:Depends}
+Description: A new initramfs infrastucture
+ Unlike existing initramfs's, this is an attempt at having as little as
+ possible hard-coded into the initramfs as possible.  The initramfs has
+ (basically) one purpose in life -- getting the rootfs mounted so that
+ we can transition to the real rootfs.  This is all driven off of
+ device availability.  Therefore, instead of scripts hard-coded to do
+ various things, we depend on udev to create device nodes for us and
+ then when we have the rootfs's device node, we mount and carry on. 
+ Having the root on MD, LVM2, LUKS is supported as well as NFS, iSCSI,
+ NBD and FCOE with dracut-network.
+
--- a/debian/copyright
+++ b/debian/copyright
@@ -0,0 +1,39 @@
+This package was debianized by Philippe Seewer <philippe.seewer@bfh.ch> on
+Fri Nov 20 15:45:00 +0100
+
+Sources can be downloaded from:
+
+    https://sourceforge.net/projects/dracut/
+
+Upstream Maintainer:
+    Harald Hoyer <harald@redhat.com>
+
+Updstream Authors:
+    Victor Lowther <victor.lowther@gmail.com>
+    Warren Togami <wtogami@redhat.com>
+    Jeremy Katz <katzj@redhat.com>
+    Philippe Seewer <philippe.seewer@bfh.ch>
+    David Dillow <dave@thedillows.org>
+    Andreas Thienemann <andreas@bawue.net>
+    Hans de Goede <hdegoede@redhat.com>
+    Marc Grimme <grimme@atix.de>
+    Bill Nottingham <notting@redhat.com>
+    Daniel Drake <dsd@laptop.org>
+    Lance Albertson <lance@osuosl.org>
+    Michael Ploujnikov <plouj@somanetworks.com>
+    Peter Jones <pjones@redhat.com>
+    Dave Jones <davej@redhat.com>
+    Michal Schmidt <mschmidt@redhat.com>
+    Peter Rajnoha <prajnoha@redhat.com>
+    Quentin Armitage <quentin@armitage.org.uk>
+    Sergey Fionov <fionov@gmail.com>
+    Thilo Bangert <thilo.bangert@gmx.net>
+
+Copyright:
+    Copyright 2009 Harald Hoyer <harald@redhat.com>
+
+
+License: GPLv2
+
+On Debian systems, the complete text of the GNU General Public 
+License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
--- a/debian/dracut-net.dirs
+++ b/debian/dracut-net.dirs
@@ -0,0 +1,5 @@
+usr/share/dracut/modules.d/40network
+usr/share/dracut/modules.d/95fcoe
+usr/share/dracut/modules.d/95iscsi
+usr/share/dracut/modules.d/95nbd
+usr/share/dracut/modules.d/95nfs
--- a/debian/dracut-net.install
+++ b/debian/dracut-net.install
@@ -0,0 +1,5 @@
+modules.d/40network	usr/share/dracut/modules.d
+modules.d/95fcoe	usr/share/dracut/modules.d
+modules.d/95iscsi	usr/share/dracut/modules.d
+modules.d/95nbd		usr/share/dracut/modules.d
+modules.d/95nfs		usr/share/dracut/modules.d
--- a/debian/dracut.dirs
+++ b/debian/dracut.dirs
@@ -0,0 +1,22 @@
+usr/share/dracut
+usr/share/dracut/modules.d/00dash
+usr/share/dracut/modules.d/01fips
+usr/share/dracut/modules.d/90crypt
+usr/share/dracut/modules.d/90dm
+usr/share/dracut/modules.d/90dmraid
+usr/share/dracut/modules.d/90kernel-modules
+usr/share/dracut/modules.d/90lvm
+usr/share/dracut/modules.d/90mdraid
+usr/share/dracut/modules.d/90multipath
+usr/share/dracut/modules.d/95dasd
+usr/share/dracut/modules.d/95dasd_mod
+usr/share/dracut/modules.d/95debug
+usr/share/dracut/modules.d/95resume
+usr/share/dracut/modules.d/95rootfs-block
+usr/share/dracut/modules.d/95terminfo
+usr/share/dracut/modules.d/95udev-rules
+usr/share/dracut/modules.d/95zfcp
+usr/share/dracut/modules.d/95znet
+usr/share/dracut/modules.d/98syslog
+usr/share/dracut/modules.d/99base
+/var/lib/dracut
--- a/debian/dracut.docs
+++ b/debian/dracut.docs
@@ -0,0 +1,4 @@
+HACKING
+README.generic
+README.kernel
+README.modules
--- a/debian/dracut.install
+++ b/debian/dracut.install
@@ -0,0 +1,25 @@
+dracut			usr/sbin
+dracut-catimages	usr/sbin
+dracut-update-initramfs	usr/sbin
+dracut-functions	usr/share/dracut
+dracut.conf		etc
+modules.d/00dash		usr/share/dracut/modules.d
+modules.d/01fips		usr/share/dracut/modules.d
+modules.d/90crypt		usr/share/dracut/modules.d
+modules.d/90dm			usr/share/dracut/modules.d
+modules.d/90dmraid		usr/share/dracut/modules.d
+modules.d/90kernel-modules	usr/share/dracut/modules.d
+modules.d/90lvm			usr/share/dracut/modules.d
+modules.d/90mdraid		usr/share/dracut/modules.d
+modules.d/90multipath		usr/share/dracut/modules.d
+modules.d/95dasd		usr/share/dracut/modules.d
+modules.d/95dasd_mod		usr/share/dracut/modules.d
+modules.d/95debug		usr/share/dracut/modules.d
+modules.d/95resume		usr/share/dracut/modules.d
+modules.d/95rootfs-block	usr/share/dracut/modules.d
+modules.d/95terminfo		usr/share/dracut/modules.d
+modules.d/95udev-rules		usr/share/dracut/modules.d
+modules.d/95zfcp		usr/share/dracut/modules.d
+modules.d/95znet		usr/share/dracut/modules.d
+modules.d/98syslog		usr/share/dracut/modules.d
+modules.d/99base		usr/share/dracut/modules.d
--- a/debian/dracut.manpages
+++ b/debian/dracut.manpages
@@ -0,0 +1,2 @@
+dracut.8
+dracut.conf.5
--- a/debian/dracut.postinst
+++ b/debian/dracut.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+# Regenerate initramfs when we're `installed`
+DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -u
+
+#DEBHELPER#
--- a/debian/dracut.triggers
+++ b/debian/dracut.triggers
@@ -0,0 +1 @@
+interest update-initramfs
--- a/debian/rules
+++ b/debian/rules
@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
--- a/259
+++ b/259
@@ -5,9 +5,24 @@
 # of the various mkinitrd implementations out there
 #

-# Copyright 2008, Red Hat, Inc.  Jeremy Katz <katzj@redhat.com>
-# GPLv2 header here
+# 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/>.
+#

+# store for logging
+dracut_args="$@"

 usage() {
 #                                                       80x25 linebreak here ^
@@ -19,8 +34,28 @@ Creates initial ramdisk images for preloading modules
                         call when building the initramfs. Modules are located
                         in /usr/share/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
-                         include in the initramfs.
+                        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 (default)
+  --nostrip             Do not strip binaries in the initramfs
+  --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
  -h, --help            This message
  --debug               Output debug information of the build process
  -v, --verbose         Verbose output during the build process
@@ -45,107 +80,213 @@ while (($# > 0)); do
 	-f|--force) force=yes;;
 	-m|--modules) dracutmodules_l="$2"; shift;;
 	-o|--omit) omit_dracutmodules_l="$2"; shift;;
+	-a|--add) add_dracutmodules_l="$2"; shift;;
 	-d|--drivers) drivers_l="$2"; shift;;
+	--add-drivers) add_drivers_l="$2"; shift;;
+        --omit-drivers) omit_drivers_l+="$2"; shift;;
+	--filesystems) filesystems_l="$2"; shift;;
+	-k|--kmoddir) drivers_dir_l="$2"; shift;;
+	--fwdir) fw_dir_l="$2"; shift;;
+	--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";;
+        --mdadmconf) mdadmconf_l="yes";;
+        --nomdadmconf) mdadmconf_l="no";;
+        --lvmconf) lvmconf_l="yes";;
+        --nolvmconf) lvmconf_l="no";;
 	-h|--help) usage; exit 1 ;;
 	--debug) debug="yes";;
 	-v|--verbose) beverbose="yes";;
 	-c|--conf) conffile="$2"; shift;;
+	--confdir) confdir="$2"; shift;;
 	-l|--local) allowlocal="yes" ;;
-	-H|--hostonly) hostonly="-h" ;;
+	-H|--hostonly) hostonly_l="yes" ;;
 	-i|--include) include_src="$2"; include_target="$3"; shift 2;;
 	-I|--install) install_items="$2"; shift;;
+	-*) printf "\nUnknown option: %s\n\n" "$1" >&2; usage; exit 1;;
 	*) break ;;
    esac
    shift
 done

+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+export PATH
+unset LD_LIBRARY_PATH
+unset GREP_OPTIONS
+
 [[ $debug ]] && { 
    export PS4='${BASH_SOURCE}@${LINENO}(${FUNCNAME[0]}): ';
    set -x
 }

+[[ $dracutbasedir ]] || dracutbasedir=/usr/share/dracut
+
+[[ $allowlocal && -f "$(readlink -f $(dirname $0))/dracut-functions" ]] && dracutbasedir="$(dirname $0)" 
+
 # if we were not passed a config file, try the default one
-[[ ! -f $conffile ]] && conffile="/etc/dracut.conf"
+if [[ ! -f $conffile ]]; then
+    [[ $allowlocal ]] || conffile="/etc/dracut.conf"
+    [[ $allowlocal ]] && conffile="$dracutbasedir/dracut.conf"
+fi
+
+if [[ ! -d $confdir ]]; then
+    [[ $allowlocal ]] || confdir="/etc/dracut.conf.d"
+    [[ $allowlocal ]] && confdir="$dracutbasedir/dracut.conf.d"
+fi
+
+# source our config dir
+if [ "$confdir" ] && [  -d "$confdir" ]; then
+    for f in "$confdir"/*.conf; do 
+	[ -e "$f" ] && . "$f"
+    done
+fi

 # source our config file
 [[ -f $conffile ]] && . "$conffile"

+# these optins add to the stuff in the config file
+[[ $add_dracutmodules_l ]] && add_dracutmodules+=" $add_dracutmodules_l"
+[[ $add_drivers_l ]] && add_drivers+=" $add_drivers_l"
+[[ $omit_drivers_l ]] && omit_drivers+=" $omit_drivers_l"
+
 # these options override the stuff in the config file
 [[ $dracutmodules_l ]] && dracutmodules=$dracutmodules_l
 [[ $omit_dracutmodules_l ]] && omit_dracutmodules=$omit_dracutmodules_l
 [[ $drivers_l ]] && drivers=$drivers_l
+[[ $filesystems_l ]] && filesystems=$filesystems_l
+[[ $drivers_dir_l ]] && drivers_dir=$drivers_dir_l
+[[ $fw_dir_l ]] && fw_dir=$fw_dir_l
+[[ $do_strip_l ]] && do_strip=$do_strip_l
+[[ $hostonly_l ]] && hostonly=$hostonly_l
+[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
+[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
 [[ $dracutbasedir ]] || dracutbasedir=/usr/share/dracut
+[[ $fw_dir ]] || fw_dir=/lib/firmware
+[[ $do_strip ]] || do_strip=yes
+# eliminate IFS hackery when messing with fw_dir
+fw_dir=${fw_dir//:/ }

-[[ $allowlocal && -f "$(dirname $0)/dracut-functions" ]] && dsrc="$(dirname $0)" || dsrc=$dracutbasedir
+[[ $hostonly = yes ]] && hostonly="-h"
+[[ $hostonly != "-h" ]] && unset hostonly

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

-dracutfunctions=$dsrc/dracut-functions
+dracutfunctions=$dracutbasedir/dracut-functions
 export dracutfunctions

+dinfo "Executing $0 $dracut_args"
+
+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
+
 # This is kinda legacy -- eventually it should go away.
 case $dracutmodules in
    ""|auto) dracutmodules="all" ;;
 esac

 [[ $2 ]] && kernel=$2 || kernel=$(uname -r)
-[[ $1 ]] && outfile=$(readlink -f $1) || outfile="/boot/initrd-$kernel.img"
+[[ $1 ]] && outfile=$1 || outfile="/boot/initramfs-$kernel.img"
+abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
+
+srcmods="/lib/modules/$kernel/"
+[[ $drivers_dir ]] && srcmods="$drivers_dir"
+export srcmods

 if [[ -f $outfile && ! $force ]]; then
-    echo "Will not override existing initramfs ($outfile) without --force"
+    derror "Will not override existing initramfs ($outfile) without --force"
    exit 1
 fi

-hookdirs="cmdline pre-udev pre-trigger netroot pre-mount pre-pivot mount emergency"
+outdir=$(dirname "$outfile")
+if ! [[ -d "$outdir" ]]; then
+    derror "Can't write $outfile: Directory $outdir does not exist."
+    exit 1
+fi

+if ! [[ -w "$outdir" ]]; then
+    derror "No permission to write $outdir."
+    exit 1
+fi
+
+if [[ -f "$outfile" ]] &&  ! [[ -w "$outfile" ]]; then
+    derror "No permission to write $outfile."
+    exit 1
+fi
+
+hookdirs="cmdline pre-udev pre-trigger netroot pre-mount pre-pivot mount emergency initqueue initqueue-finished initqueue-settled initqueue-timeout
+"
+
+[[ -n "$TMPDIR" ]] && ! [[ -w "$TMPDIR" ]] && unset TMPDIR
 readonly initdir=$(mktemp -d -t initramfs.XXXXXX)
-trap 'rm -rf "$initdir"' 0 # clean up after ourselves no matter how we die.
+
+trap 'ret=$?;rm -rf "$initdir";exit $ret;' EXIT # clean up after ourselves no matter how we die.
+trap 'exit 1;' SIGINT # clean up after ourselves no matter how we die.

 # Need to be able to have non-root users read stuff (rpcbind etc)
 chmod 755 "$initdir"

-export initdir hookdirs dsrc dracutmodules drivers debug beverbose
+export initdir hookdirs dracutbasedir dracutmodules drivers \
+    fw_dir drivers_dir debug beverbose no_kernel kernel_only \
+    add_drivers omit_drivers mdadmconf lvmconf filesystems

-# Create some directory structure first
-for d in bin sbin usr/bin usr/sbin usr/lib etc proc sys sysroot tmp dev/pts var/run; do 
-    mkdir -p "$initdir/$d"; 
-done
+if [[ $kernel_only != yes ]]; then
+    # Create some directory structure first
+    for d in bin sbin usr/bin usr/sbin usr/lib etc proc sys sysroot tmp dev/pts var/log var/run $hookdirs; do
+	inst_dir "/$d"
+    done
+fi

 # check all our modules to see if they should be sourced.
 # This builds a list of modules that we will install next.
 check_modules
-  
-#source our modules.
-for moddir in "$dsrc/modules.d"/[0-9][0-9]*; do
-    mod=${moddir##*/}; mod=${mod#[0-9][0-9]}
-    if strstr "$mods_to_load" " $mod "; then
-	. "$moddir/install"
-	mods_to_load=${mods_to_load// $mod /}
+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
+	if [[ $kernel_only = yes ]]; then
+	    [[ -x $moddir/installkernel ]] && . "$moddir/installkernel"
+	else
+	    [[ -x "$moddir/install" ]] && . "$moddir/install"
+	    if [[ $no_kernel != yes && -x $moddir/installkernel ]]; then
+		. "$moddir/installkernel"
+	    fi
+	fi
+	modules_loaded+="$_d_mod "
+	mods_to_load=${mods_to_load// $_d_mod /}
    fi
 done
 unset moddir
-echo $mods_to_load

 ## final stuff that has to happen

 # generate module dependencies for the initrd
-if ! /sbin/depmod -a -b "$initdir" $kernel; then
-    echo "\"/sbin/depmod -a $kernel\" failed."
-    exit 1
+if [[ -d $initdir/lib/modules/$kernel ]]; then
+    if ! depmod -a -b "$initdir" $kernel; then
+        derror "\"depmod -a $kernel\" failed."
+        exit 1
+    fi
 fi

-# make sure that library links are correct and up to date
-ldconfig -n -r "$initdir" /lib* /usr/lib*
-
 if [[ $include_src && $include_target ]]; then
-    mkdir -p "$initdir$include_target"
-    cp -a -t "$initdir$include_target" "$include_src"/*
+    if [[ -f $include_src ]]; then
+        inst $include_src $include_target
+    else
+        mkdir -p "$initdir$include_target"
+        cp -a -t "$initdir$include_target" "$include_src"/*
+    fi
 fi

 for item in $install_items; do
@@ -153,11 +294,53 @@ for item in $install_items; do
 done
 unset item

-[[ "$beverbose" = "yes" ]] && (du -c "$initdir" | sort -n)
+# make sure that library links are correct and up to date
+cp -ar /etc/ld.so.conf* "$initdir"/etc
+ldconfig -r "$initdir" || [[ $(id -u) != "0" ]] && dinfo "ldconfig might need uid=0 (root) for chroot()"

-( cd "$initdir"; find . |cpio -H newc -o |gzip -9 > "$outfile"; )
+[[ $beverbose = yes ]] && (du -c "$initdir" | sort -n)

-[[ "$beverbose" = "yes" ]] && ls -lh "$outfile"
+# strip binaries 
+if [[ $do_strip = yes ]] ; then
+    for p in strip grep find; do 
+	if ! which $p >/dev/null 2>&1; then
+	    dwarn "Could not find '$p'. Not stripping binaries in the initramfs."
+	    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
+        # do not strip files with a .hmac file,
+        # because that would alter the checksum
+        if ! [[ -f "${f%/*}/.${f##*/}.hmac" ]]; then
+	    dinfo "Stripping '$f'"
+	    strip -g "$f" 2>/dev/null|| :
+        else
+            dinfo "Not stripping '$f', because it has a hmac checksum file."
+        fi
+    done
+fi
+
+if strstr "$modules_loaded" " fips " && command -v prelink >/dev/null; then
+    for i in $initdir/bin/* \
+	$initdir/bin/* \
+	$initdir/usr/bin/* \
+	$initdir/usr/sbin/*; do
+	[ -x $i ] && prelink -u $i &>/dev/null
+    done
+fi
+
+type pigz &>/dev/null && gzip=pigz || gzip=gzip
+if ! ( set -o pipefail; umask 077; cd "$initdir"; find . |cpio -R root:root -H newc -o --quiet| \
+    $gzip -9 > "$outfile"; ); then
+    derror "dracut: creation of $outfile failed"
+    rm -f "$outfile"
+    exit 1
+fi
+dinfo "Wrote $outfile"
+dinfo $(ls -l "$outfile")

 exit 0

--- a/127
+++ b/127
@@ -0,0 +1,127 @@
+#!/bin/bash --norc
+
+# Copyright 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/>.
+#
+
+
+dwarning() {
+    echo "Warning: $@" >&2
+}
+
+dinfo() {
+    [[ $beverbose ]] && echo "$@" >&2
+}
+
+derror() {
+    echo "Error: $@" >&2
+}
+
+usage() {
+#                                                       80x25 linebreak here ^
+	echo "Usage: $0 [OPTION]... <initramfs> <base image> [<image>...]
+Creates initial ramdisk image by concatenating several images from the command
+line and /boot/dracut/
+
+  -f, --force           Overwrite existing initramfs file.
+  -i, --imagedir        Directory with additional images to add 
+                        (default: /boot/dracut/)
+  -o, --overlaydir      Overlay directory, which contains 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            This message
+  --debug               Output debug information of the build process
+  -v, --verbose         Verbose output during the build process
+"
+}
+
+
+imagedir=/boot/dracut/
+overlay=/var/lib/dracut/overlay
+
+while (($# > 0)); do
+    case $1 in
+	-f|--force) force=yes;;
+	-i|--imagedir) imagedir=$2;shift;;
+	-o|--overlaydir) overlay=$2;shift;;
+	--nooverlay) no_overlay=yes;shift;;
+	--noimagedir) no_imagedir=yes;shift;;
+	-h|--help) usage; exit 1 ;;
+	--debug) debug="yes";;
+	-v|--verbose) beverbose="yes";;
+	-*) printf "\nUnknown option: %s\n\n" "$1" >&2; usage; exit 1;;
+	*) break ;;
+    esac
+    shift
+done
+
+outfile=$1; shift
+
+if [[ -z $outfile ]]; then
+    derror "No output file specified."
+    usage
+    exit 1
+fi
+
+baseimage=$1; shift
+
+if [[ -z $baseimage ]]; then
+    derror "No base image specified."
+    usage
+    exit 1
+fi
+
+if [[ -f $outfile && ! $force ]]; then
+    derror "Will not override existing initramfs ($outfile) without --force"
+    exit 1
+fi
+
+if [[ ! $no_imagedir && ! -d $imagedir ]]; then
+    derror "Image directory $overlay is not a directory"
+    exit 1
+fi
+
+if [[ ! $no_overlay && ! -d $overlay ]]; then
+    derror "Overlay $overlay is not a directory"
+    exit 1
+fi
+
+if [[ ! $no_overlay ]]; then
+    ofile="$imagedir/90-overlay.img"
+    dinfo "Creating image $ofile from directory $overlay"
+    type pigz &>/dev/null && gzip=pigz || gzip=gzip
+    ( cd "$overlay"; find . |cpio --quiet -H newc -o |$gzip -9 > "$ofile"; )
+fi
+
+if [[ ! $no_imagedir ]]; then
+    for i in "$imagedir/"*.img; do
+	[[ -f $i ]] && images+=("$i")
+    done
+fi
+
+images+=($@)
+
+dinfo "Using base image $baseimage"
+cat "$baseimage" > "$outfile"
+
+for i in "${images[@]}"; do 
+    dinfo "Appending $i"
+    cat "$i" >> "$outfile"
+done
+
+dinfo "Created $outfile"
+
+exit 0
--- a/dracut-catimages.8
+++ b/dracut-catimages.8
@@ -0,0 +1,52 @@
+.TH DRACUT-CATIMAGES 8 "June 2009" "Linux"
+.SH NAME
+dracut-catimages \- creates initial ramdisk image by concatenating images
+.SH SYNOPSIS
+\fBdracut-catimages\fR [\fIOPTION\fR]... \fI<initramfs base image>\fR \fI[<image>...]\fR
+
+.SH DESCRIPTION
+.B dracut-catimages
+creates an initial ramdisk image by concatenating several images from the command
+line and /boot/dracut/*.img
+
+.SH OPTIONS
+.TP
+.BR \-f ", " \-\-force
+overwrite existing initramfs file.
+.TP
+.BR \-i ", " \-\-imagedir
+Directory with additional images to add (default: /boot/dracut/)
+.TP
+.BR \-o ", " \-\-overlaydir
+Overlay directory, which contains additional files that will be used to create an additional image
+.TP
+.BR \-\-nooverlay
+Do not use the overlay directory
+.TP
+.BR \-\-noimagedir
+Do not use the additional image directory
+.TP
+.BR \-h ", " \-\-help
+display help text and exit. 
+.TP
+.B \-\-debug
+output debug information of the build process
+.TP
+.BR \-v ", " \-\-verbose
+verbose output during the build process
+
+.SH FILES
+.TP
+.B /boot/dracut/*.img
+.TP
+.B 
+.SH AUTHORS
+.nf
+Harald Hoyer <harald@redhat.com>
+.fi
+.SH AVAILABILITY
+The dracut-catimages command is part of the dracut package and is available from
+http://sourceforge.net/apps/trac/dracut/wiki
+
+.SH SEE ALSO
+.BR dracut (8)
--- a/518
+++ b/518
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# functions used by mkinitrd and other tools.
+# functions used by dracut and other tools.
 #
-# Copyright 2005-2008 Red Hat, Inc.  All rights reserved.
+# 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
@@ -17,39 +17,233 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# Authors:
-#       Peter Jones <pjones@redhat.com>
-#       Jeremy Katz <katzj@redhat.com>
-#       Jakub Jelinek <jakub@redhat.com>

 IF_RTLD=""
 IF_dynamic=""

 # Generic substring function.  If $2 is in $1, return 0.
-strstr() { [[ ! ${1#*$2*} = $1 ]]; }
+strstr() { [[ $1 =~ $2 ]]; }

 # Log initrd creation.
 if ! [[ $dracutlogfile ]]; then
-    [[ $dsrc = /usr/share/dracut ]] && \
-       dracutlogfile=/var/log/dracut.log || \
-       dracutlogfile=/tmp/dracut.log
-    [[ -w "$dracutlogfile" ]] || dracutlogfile=/tmp/dracut.log
-    >"$dracutlogfile"
+    [[ $dracutbasedir = /usr/share/dracut ]] && \
+	dracutlogfile=/var/log/dracut.log || \
+	dracutlogfile=$HOME/dracut.log
+    if [[ -w ${dracutlogfile%/*} ]]; then
+        >>"$dracutlogfile"
+    fi
 fi

 dwarning() {
    echo "W: $@" >&2
-    [[ -w "$dracutlogfile" ]] && echo "W: $@" >>"$dracutlogfile"
+    [[ -w $dracutlogfile ]] && echo $(date) "Warn:" $@ >>"$dracutlogfile"
 }

 dinfo() {
    [[ $beverbose ]] && echo "I: $@" >&2
-    [[ -w "$dracutlogfile" ]] && echo "I: $@" >>"$dracutlogfile"
+    [[ -w $dracutlogfile ]] && echo $(date) "Info:" $@ >>"$dracutlogfile"
 }

 derror() {
    echo "E: $@" >&2
-    [[ -w "$dracutlogfile" ]] && echo "E: $@" >>"$dracutlogfile"
+    [[ -w $dracutlogfile ]] && echo $(date) "Err:" $@ >>"$dracutlogfile"
+}
+
+
+
+# normalize_path <path>
+# Prints the normalized path, where it removes any duplicated
+# and trailing slashes.
+# Example:
+# $ normalize_path ///test/test//
+# /test/test
+normalize_path() {
+    shopt -q -s extglob
+    set -- "${1//+(\/)//}"
+    shopt -q -u extglob
+    echo "${1%/}"
+}
+
+# convert_abs_rel <from> <to>
+# Prints the relative path, when creating a symlink to <to> from <from>.
+# Example:
+# $ convert_abs_rel /usr/bin/test /bin/test-2
+# ../../bin/test-2
+# $ ln -s $(convert_abs_rel /usr/bin/test /bin/test-2) /usr/bin/test
+convert_abs_rel() {
+    local __current __absolute __abssize __cursize __newpath
+    local -i __i __level
+
+    set -- "$(normalize_path "$1")" "$(normalize_path "$2")"
+
+    # corner case #1 - self looping link
+    [[ "$1" == "$2" ]] && { echo "${1##*/}"; return; }
+
+    # corner case #2 - own dir link
+    [[ "${1%/*}" == "$2" ]] && { echo "."; return; }
+
+    IFS="/" __current=($1)
+    IFS="/" __absolute=($2)
+
+    __abssize=${#__absolute[@]}
+    __cursize=${#__current[@]}
+
+    while [[ ${__absolute[__level]} == ${__current[__level]} ]]
+    do
+        (( __level++ ))
+        if (( __level > __abssize || __level > __cursize ))
+        then
+            break
+        fi
+    done
+
+    for ((__i = __level; __i < __cursize-1; __i++))
+    do
+        if ((__i > __level))
+        then
+            __newpath=$__newpath"/"
+        fi
+        __newpath=$__newpath".."
+    done
+
+    for ((__i = __level; __i < __abssize; __i++))
+    do
+        if [[ -n $__newpath ]]
+        then
+            __newpath=$__newpath"/"
+        fi
+        __newpath=$__newpath${__absolute[__i]}
+    done
+
+    echo "$__newpath"
+}
+
+# returns OK if $1 contains $2 at the beginning
+str_starts() {
+    [ "${1#$2*}" != "$1" ]
+}
+
+ln_r() {
+    local _source=$1
+    local _dest=$2
+
+    if ! str_starts "$_source" "/"; then
+        ln -sfn "$_source" "${initdir}/${_dest}"
+    else
+        [[ -d "${_dest%/*}" ]] && _dest=$(readlink -f "${_dest%/*}")/${_dest##*/}
+        ln -sfn $(convert_abs_rel "${_dest}" "${_source}") "${initdir}/${_dest}"
+    fi
+}
+
+get_fs_env() {
+    if [[ -x /lib/udev/vol_id ]]; then
+	eval $(/lib/udev/vol_id --export $1)
+    elif find_binary blkid >/dev/null; then
+	eval $(blkid -o udev $1)
+    else
+	return 1
+    fi
+}
+
+get_fs_type() (
+    get_fs_env $1 || return
+    echo $ID_FS_TYPE
+)
+
+get_fs_uuid() (
+    get_fs_env $1 || return
+    echo $ID_FS_UUID
+)
+
+# finds the major:minor of the block device backing the root filesystem.
+find_block_device() {
+    local rootdev blkdev fs type opts misc
+    while read blkdev fs type opts misc; do
+	[[ $blkdev = rootfs ]] && continue # skip rootfs entry
+	[[ $fs = $1 ]] && { rootdev=$blkdev; break; } # we have a winner!
+    done < /proc/mounts
+    [[ -b $rootdev ]] || return 1 # oops, not a block device.
+    # get major/minor for the device
+    ls -nLl "$rootdev" | \
+	(read x x x x maj min x; maj=${maj//,/}; echo $maj:$min)
+}
+
+find_root_block_device() { find_block_device /; }
+
+# Walk all the slave relationships for a given block device.
+# Stop when our helper function returns success
+# $1 = function to call on every found block device
+# $2 = block device in major:minor format
+check_block_and_slaves() {    
+    local x 
+    [[ -b /dev/block/$2 ]] || return 1 # Not a block device? So sorry.
+    "$1" $2 && return
+    check_vol_slaves "$@" && return 0
+    if [[ -f "/sys/dev/block/$2/../dev" ]]; then
+	check_block_and_slaves $1 $(cat "/sys/dev/block/$2/../dev") &&  return 0
+    fi
+    [[ -d /sys/dev/block/$2/slaves ]] || return 1
+    for x in /sys/dev/block/$2/slaves/*/dev; do
+        [[ -f $x ]] || continue
+	check_block_and_slaves $1 $(cat "$x") &&  return 0
+    done
+    return 1
+}
+
+get_numeric_dev() {
+    ls -lH "$1" | { read a b c d maj min rest; printf "%d:%d" ${maj%%,} $min;}
+}
+
+# ugly workaround for the lvm design
+# There is no volume group device,
+# so, there are no slave devices for volume groups.
+# Logical volumes only have the slave devices they really live on,
+# but you cannot create the logical volume without the volume group.
+# And the volume group might be bigger than the devices the LV needs.
+check_vol_slaves() {
+    for i in /dev/mapper/*; do 
+	lv=$(get_numeric_dev $i)
+	if [[ $lv = $2 ]]; then
+	    vg=$(lvm lvs --noheadings -o vg_name $i 2>/dev/null)
+	    # strip space
+	    vg=$(echo $vg)
+	    if [[ $vg ]]; then
+		for pv in $(lvm vgs --noheadings -o pv_name "$vg" 2>/dev/null); \
+		    do
+ 		    check_block_and_slaves $1 $(get_numeric_dev $pv) \
+			&&  return 0
+		done
+	    fi
+	fi
+    done
+    return 1
+}
+
+# Install a directory, keeping symlinks as on the original system.
+# Example: if /lib points to /lib64 on the host, "inst_dir /lib/file"
+# will create ${initdir}/lib64, ${initdir}/lib64/file,
+# and a symlink ${initdir}/lib -> lib64.
+inst_dir() {
+    [[ -e ${initdir}/"$1" ]] && return 0  # already there
+
+    local _dir="$1" _part="${1%/*}" _file
+    while [[ "$_part" != "${_part%/*}" ]] && ! [[ -e "${initdir}/${_part}" ]]; do
+        _dir="$_part $_dir"
+        _part=${_part%/*}
+    done
+
+        # iterate over parent directories
+    for _file in $_dir; do
+        [[ -e "${initdir}/$_file" ]] && continue
+        if [[ -L $_file ]]; then
+            inst_symlink "$_file"
+        else
+            # create directory
+            mkdir -m 0755 -p "${initdir}/$_file" || return 1
+            [[ -e "$_file" ]] && chmod --reference="$_file" "${initdir}/$_file"
+            chmod u+w "${initdir}/$_file"
+        fi
+    done
 }

 # $1 = file to copy to ramdisk
@@ -57,27 +251,37 @@ derror() {
 # Location of the image dir is assumed to be $initdir
 # We never overwrite the target if it exists.
 inst_simple() {
-    local src target
+    local src target 
    [[ -f $1 ]] || return 1
-    src=$1 target="${initdir}${2:-$1}"
-    [[ -f $target ]] && return 0
-    mkdir -p "${target%/*}"
+    src=$1 target="${2:-$1}"
+    if ! [[ -d ${initdir}$target ]]; then
+        [[ -e ${initdir}$target ]] && return 0
+        inst_dir "${target%/*}"
+    fi
+    # install checksum files also
+    if [[ -e  "${src%/*}/.${src##*/}.hmac" ]]; then 
+	inst "${src%/*}/.${src##*/}.hmac" "${target%/*}/.${target##*/}.hmac"
+    fi
    dinfo "Installing $src" 
-    cp -fL "$src" "$target"
+    cp -pfL "$src" "${initdir}$target"
 }

-# Same as above, but specialzed to handle dynamic libraries.
+# Same as above, but specialized to handle dynamic libraries.
 # It handles making symlinks according to how the original library
 # is referenced.
 inst_library() {
    local src=$1 dest=${2:-$1}
-    [[ -f $initdir$dest ]] && return 0
+    [[ -e $initdir$dest ]] && return 0
    if [[ -L $src ]]; then
-	reallib="$(readlink -f "$src")"
+	# install checksum files also
+        if [[ -e  "${src%/*}/.${src##*/}.hmac" ]]; then 
+            inst "${src%/*}/.${src##*/}.hmac" "${dest%/*}/.${dest##*/}.hmac"
+        fi
+	reallib=$(readlink -f "$src")
 	lib=${src##*/}
 	inst_simple "$reallib" "$reallib"
-	mkdir -p ${initdir}${dest%/*}
-	(cd "${initdir}${dest%/*}" && ln -s "$reallib" "$lib")
+	inst_dir "${dest%/*}"
+	ln_r "$reallib" "$dest"
    else
 	inst_simple "$src" "$dest"
    fi
@@ -87,7 +291,7 @@ inst_library() {
 # search in the usual places to find the binary.
 find_binary() {
    local binpath="/bin /sbin /usr/bin /usr/sbin" p
-    [[ -x $1 ]] && { echo $1; return 0; }
+    [[ -z ${1##/*} && -x $1 ]] && { echo $1; return 0; } 
    for p in $binpath; do
 	[[ -x $p/$1 ]] && { echo "$p/$1"; return 0; }
    done
@@ -100,10 +304,11 @@ inst_binary() {
    local bin target
    bin=$(find_binary "$1") || return 1
    target=${2:-$bin}
+    inst_symlink $bin $target && return 0
    local LDSO NAME IO FILE ADDR I1 n f TLIBDIR
-    [[ -f $initdir$target ]] && return 0
+    [[ -e $initdir$target ]] && return 0
    # I love bash!
-    ldd $bin 2>/dev/null | while read line; do
+    LC_ALL=C ldd $bin 2>/dev/null | while read line; do
 	[[ $line = 'not a dynamic executable' ]] && return 1
 	if [[ $line =~ not\ found ]]; then
 	    derror "Missing a shared library required by $bin."
@@ -111,21 +316,23 @@ inst_binary() {
 	    derror "dracut cannot create an initrd."
 	    exit 1
 	fi
-	[[ $line =~ ([^ ]*/lib[^/]*/[^ ]*\.so[^ ]*) ]] || continue
+	so_regex='([^ ]*/lib[^/]*/[^ ]*\.so[^ ]*)'
+	[[ $line =~ $so_regex ]] || continue
 	FILE=${BASH_REMATCH[1]}
-	[[ -f ${initdir}$FILE ]] && continue
+	[[ -e ${initdir}$FILE ]] && continue
 	# see if we are loading an optimized version of a shared lib.
-	if [[ $FILE =~ ^(/lib[^/]*).* ]]; then
+	lib_regex='^(/lib[^/]*).*'
+	if [[ $FILE =~ $lib_regex ]]; then
            TLIBDIR=${BASH_REMATCH[1]}
-            BASE="${FILE##*/}"
+            BASE=${FILE##*/}
 	    # prefer nosegneg libs, then unoptimized ones.
 	    for f in "$TLIBDIR/i686/nosegneg" "$TLIBDIR"; do
-		[[ -f $f/$BASE ]] || continue
-		FILE="$f/$BASE"
+		[[ -e $f/$BASE ]] || continue
+		FILE=$f/$BASE
 		break
 	    done
 	    inst_library "$FILE" "$TLIBDIR/$BASE"
-            IF_dynamic="yes"
+            IF_dynamic=yes
 	    continue
 	fi
        inst_library "$FILE" 
@@ -141,24 +348,35 @@ inst_script() {
    read -r -n 80 line <"$1"
    # If debug is set, clean unprintable chars to prevent messing up the term
    [[ $debug ]] && line=$(echo -n "$line" | tr -c -d '[:print:][:space:]')
-    [[ $line =~ (#! *)(/[^ ]+).* ]] || return 1
+    shebang_regex='(#! *)(/[^ ]+).*'
+    [[ $line =~ $shebang_regex ]] || return 1
    inst "${BASH_REMATCH[2]}" && inst_simple "$@"
 }

 # same as above, but specialized for symlinks
 inst_symlink() {
-    local src=$1 target=$initdir${2:-$1} realsrc
+    local _src=$1 _target=${2:-$1} _realsrc
+    strstr "$1" "/" || return 1
    [[ -L $1 ]] || return 1
-    [[ -L $target ]] && return 0
-    realsrc=$(readlink -f "$src")
-    [[ $realsrc = ${realsrc##*/} ]] && realsrc="${src%/*}/$realsrc"
-    inst "$realsrc" && ln -s "$realsrc" "$target"
+    [[ -L $initdir/$_target ]] && return 0
+    _realsrc=$(readlink -f "$_src")
+    [[ ${_realsrc#/} = ${_realsrc} ]] && _realsrc="${_src%/*}/${_realsrc}"
+    if ! [[ -e $initdir/$_realsrc ]]; then
+        if [[ -d $_realsrc ]]; then
+            inst_dir "$_realsrc"
+        else
+            inst "$_realsrc"
+        fi
+    fi
+    [[ ! -e $initdir/${_target%/*} ]] && inst_dir "${_target%/*}"
+
+    ln_r "${_realsrc}" "${_target}"
 }

-# find a rule in the usual places.
+# find a udev rule in the usual places.
 find_rule() {
    [[ -f $1 ]] && { echo "$1"; return 0; }
-    for r in . /lib/udev/rules.d /etc/udev/rules.d $dsrc/rules.d; do
+    for r in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
 	[[ -f $r/$1 ]] && { echo "$r/$1"; return 0; }
    done
    return 1
@@ -167,10 +385,11 @@ find_rule() {
 # udev rules always get installed in the same place, so
 # create a function to install them to make life simpler.
 inst_rules() { 
-    local target="/etc/udev/rules.d"
-    mkdir -p "$initdir/lib/udev/rules.d" "$initdir$target"
+    local target=/etc/udev/rules.d
+    inst_dir "/lib/udev/rules.d"
+    inst_dir "$target"
    for rule in "$@"; do 
-	rule=$(find_rule $rule) && \
+	rule=$(find_rule "$rule") && \
 	    inst_simple "$rule" "$target/${rule##*/}"
    done
 }
@@ -178,10 +397,21 @@ inst_rules() {
 # general purpose installation function
 # Same args as above.
 inst() {
-    if (($# != 1 && $# != 2 )); then
-        derror "inst only takes 1 or 2 arguments"
-	exit 1
-    fi
+    case $# in
+        1) ;;
+        2)
+            [[ -z $initdir ]] && [[ -d $2 ]] && export initdir=$2
+            [[ $initdir = $2 ]] && set $1
+            ;;
+        3)
+	    [[ -z $initdir ]] && export initdir=$2 
+            set $1 $3
+            ;;
+        *)
+            derror "inst only takes 1 or 2 or 3 arguments"
+            exit 1
+            ;;
+    esac
    for x in inst_symlink inst_script inst_binary inst_simple; do
       $x "$@" && return 0
    done
@@ -204,21 +434,29 @@ inst_hook() {
 }

 dracut_install() {
+    if [[ $1 = '-o' ]]; then 
+	local optional=yes
+	shift
+    fi
    while (($# > 0)); do
-	if inst "$1" ; then
-            shift 
-            continue
-        fi
-        derror "Failed to install $1"; exit 1
+	if ! inst "$1" ; then
+	    if [[ $optional = yes ]]; then
+		dinfo "Skipping program $1 as it cannot be found and is flagged to be optional"
+	    else
+		derror "Failed to install $1"
+		exit 1
+            fi
+	fi
+	shift
    done
 }

 check_module_deps() {
    local moddir dep ret
    # if we are already set to be loaded, we do not have to be checked again.
-    strstr "$mods_to_load" " $1 "
+    strstr "$mods_to_load" " $1 " && return
    # turn a module name into a directory, if we can.
-    moddir=$(echo ${dsrc}/modules.d/??${1})
+    moddir=$(echo ${dracutbasedir}/modules.d/??${1})
    [[ -d $moddir && -x $moddir/install ]] || return 1
    # if we do not have a check script, we are unconditionally included
    if [[ -x $moddir/check ]]; then
@@ -237,18 +475,24 @@ check_module_deps() {

 should_source_module() {
    local dep
-    [[ -x $1/install ]] || return 1
+    if [[ $kernel_only = yes ]]; then
+        [[ -x $1/installkernel ]] && return 0
+        return 1
+    fi
+    [[ -x $1/install ]] || [[ -x $1/installkernel ]] || return 1
    [[ -x $1/check ]] || return 0
    "$1/check" $hostonly || return 1
    for dep in $("$1/check" -d); do
 	check_module_deps "$dep" && continue
-	dwarning "Cannot load $mod, dependencies failed."
+	dwarning "Cannot load dracut module \"$mod\", dependencies failed."
 	return 1
    done
 }

 check_modules() {
-    for moddir in "$dsrc/modules.d"/[0-9][0-9]*; do
+    local modcheck;
+    local mod;
+    for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
 	local mod=${moddir##*/}; mod=${mod#[0-9][0-9]}
 	# If we are already scheduled to be loaded, no need to check again.
 	strstr "$mods_to_load" " $mod " && continue
@@ -257,21 +501,119 @@ check_modules() {
 	[[ $dracutmodules != all ]] && ! strstr "$dracutmodules" "$mod" && \
 	    continue
 	strstr "$omit_dracutmodules" "$mod" && continue
-	should_source_module "$moddir" || continue
+	if ! strstr "$add_dracutmodules" "$mod"; then
+	    should_source_module "$moddir" || continue
+        fi
 	mods_to_load+=" $mod "
    done
+
+    modcheck=$add_dracutmodules
+    [[ $dracutmodules != all ]] && modcheck="$m $dracutmodules"
+    for mod in $modcheck; do
+        strstr "$mods_to_load" "$mod" && continue
+        strstr "$omit_dracutmodules" "$mod" && continue
+        dwarning "Dracut module \"$mod\" cannot be found."
+    done
 }

-# install kernel modules, and handle installing all their dependencies as well.
+# Install a single kernel module along with any firmware it may require.
+# $1 = full path to kernel module to install
+install_kmod_with_fw() {
+    local modname=${1##*/} fwdir found
+    modname=${modname%.ko*}
+    # no need to go further if the module is already installed
+    [[ -e  "${initdir}/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" ]] && return 0
+
+    if [[ $omit_drivers ]]; then
+        local _kmod=${1##*/}
+        _kmod=${_kmod%.ko}
+        _kmod=${_kmod/-/_}
+        if [[ "$_kmod" =~ $omit_drivers ]]; then
+            dinfo "Omitting driver $_kmod"
+            return 1
+        fi
+        if [[ "${1##*/lib/modules/$kernel/}" =~ $omit_drivers ]]; then
+            dinfo "Omitting driver $_kmod"
+            return 1
+        fi
+    fi
+
+    inst_simple "$1" "/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" || \
+	return $?
+
+    for fw in $(modinfo -k $kernel -F firmware $1 2>/dev/null); do
+	found=''
+	for fwdir in $fw_dir; do
+	    if [[ -d $fwdir && -f $fwdir/$fw ]]; then
+		inst_simple "$fwdir/$fw" "/lib/firmware/$fw"
+		found=yes
+	    fi
+	done
+	if [[ $found != yes ]]; then
+	    dinfo "Possible missing firmware \"${fw}\" for kernel module \"${mod}.ko\""
+	fi
+    done
+    return 0
+}
+
+# Do something with all the dependencies of a kernel module.
+# Note that kernel modules depend on themselves using the technique we use
+# $1 = function to call for each dependency we find 
+#      It will be passed the full path to the found kernel module 
+# $2 = module to get dependencies for
+# rest of args = arguments to modprobe
+for_each_kmod_dep() {
+    local func=$1 kmod=$2 cmd modpapth options 
+    shift 2
+    modprobe "$@" --ignore-install --show-depends $kmod 2>/dev/null | ( \
+        local found=0;
+	while read cmd modpath options; do
+	    [[ $cmd = insmod ]] || continue
+	    $func ${modpath} || exit $?
+            found=1
+    done; [[ $found -eq 0 ]] && exit 1; exit 0;)
+    return $?
+}
+
+# filter kernel modules to install certain modules that meet specific
+# requirements.
+# $1 = function to call with module name to filter.
+#      This function will be passed the full path to the module to test.
+# The behaviour of this function can vary depending on whether $hostonly is set.
+# If it is, we will only look at modules that are already in memory.
+# If it is not, we will look at all kernel modules
+# This function returns the full filenames of modules that match $1
+filter_kernel_modules () (
+    if ! [[ $hostonly ]]; then
+        filtercmd='find "$srcmods/kernel/drivers" "$srcmods/updates" "$srcmods/extra" "$srcmods/weak-updates" -name "*.ko" -o -name "*.ko.gz" 2>/dev/null'
+    else
+	filtercmd='cut -d " " -f 1 </proc/modules|xargs modinfo -F filename -k $kernel'
+    fi
+    for modname in $(eval $filtercmd); do
+        case $modname in
+            *.ko)
+                "$1" "$modname" && echo "$modname"
+                ;;
+            *.ko.gz)
+                gzip -dc "$modname" > $initdir/$$.ko
+                $1 $initdir/$$.ko && echo "$modname"
+                rm -f $initdir/$$.ko
+                ;;
+        esac
+    done
+)
+
+# install kernel modules along with all their dependencies.
 instmods() {
+    [[ $no_kernel = yes ]] && return
    local mod mpargs modpath modname cmd
-    local srcmods="/lib/modules/$kernel/"
+    local ret=0
    while (($# > 0)); do
-	mod=${1%.ko}
+	mod=${1%.ko*}
 	case $mod in
 	    =*) # This introduces 2 incompatible meanings for =* arguments
                # to instmods.  We need to decide which one to keep.
-		if [ "$mod" = "=ata" -a -f $srcmods/modules.block ] ; then 
+		if [[ $mod = =ata && -f $srcmods/modules.block ]] ; then 
 		    instmods $mpargs $(egrep 'ata|ahci' "${srcmods}/modules.block")
 		elif [ -f $srcmods/modules.${mod#=} ]; then
 		    instmods $mpargs $(cat ${srcmods}/modules.${mod#=} )
@@ -279,43 +621,41 @@ instmods() {
 		    instmods $mpargs $(find "$srcmods" -path "*/${mod#=}/*")
 		fi
 		;;
-	    --*) mpargs+=" $mod";;
+	    --*) 
+	        mod=${mod##*/}
+                mpargs+=" $mod";;
            i2o_scsi)
                    # Must never run this diagnostic-only module
                    shift; continue;
                ;;
-	    *)  mod=${mod##*/}
-	        # if we are already installed, skip this module and go on
+	    *)  
+                # if we are already installed, skip this module and go on
 	        # to the next one.
 	        [[ -f $initdir/$1 ]] && { shift; continue; }
+
+	        mod=${mod##*/}
+
+                if [[ $omit_drivers ]] && [[ "$1" =~ $omit_drivers ]]; then
+                    dinfo "Omitting driver ${mod##$srcmods}"
+                    shift; continue;
+                fi
+
 		# If we are building a host-specific initramfs and this
 		# module is not already loaded, move on to the next one.
-		[[ $hostonly ]] && ! grep -q "$mod" /proc/modules && { 
+		[[ $hostonly ]] && ! grep -q "${mod//-/_}" /proc/modules && \
+	        ! echo $add_drivers | grep -qe "\<${mod}\>" &&	{
 		    shift; continue; 
 		}
-                modprobe $mpargs --ignore-install --set-version $kernel \
-		    --show-depends $mod 2>/dev/null | \
-		    while read cmd modpath options; do
-		    [[ $cmd = insmod ]] || continue
-		    modname=${modpath##*/}
-		    modname=${modname%.ko}
-		    if [[ ${mod/-/_} != ${modname/-/_} ]]; then
-			dinfo "Installing dependencies for $mod ($modpath)"
-			instmods $mpargs $modname
-		    fi
-		    inst_simple "$modpath"
-		done
-		for fw in $(/sbin/modinfo -F firmware $mod 2>/dev/null); do
-		    if [[ -f /lib/firmware/$fw ]]; then
-			inst_simple "/lib/firmware/$fw"
-		    else
-			dwarning "Possible missing firmware /lib/firmware/${fw} for module ${mod}.ko"
-		    fi
-		done
-		;;
+		# ok, load the module, all its dependencies, and any firmware
+		# it may require
+		for_each_kmod_dep install_kmod_with_fw $mod \
+		    --set-version $kernel -d ${srcmods%%/lib/modules/*}/
+		ret=$((ret+$?))
+                ;;
 	esac      
 	shift
    done
+    return $ret
 } 

 # vim:ts=8:sw=4:sts=4:et
--- a/715
+++ b/715
@@ -0,0 +1,715 @@
+#!/bin/bash --norc
+#
+# 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 --show-depends $1 2>/dev/null| 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/,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
+# vim:ts=8:sw=4:sts=4:et
--- a/dracut-gencmdline.8
+++ b/dracut-gencmdline.8
@@ -0,0 +1,20 @@
+.TH DRACUT-GENCMDLINE 8 "June 2009" "Linux"
+.SH NAME
+dracut-gencmdline \- generates kernel command line parameters for the dracut generated initramfs
+.SH SYNOPSIS
+.BR dracut-gencmdline
+
+.SH DESCRIPTION
+.B dracut-gencmdline
+generates kernel command line parameters for the dracut generated initramfs, which are very specific to the host system.
+
+.SH AUTHORS
+.nf
+Harald Hoyer <harald@redhat.com>
+.fi
+.SH AVAILABILITY
+The dracut-gencmdline command is part of the dracut package and is available from
+http://sourceforge.net/apps/trac/dracut/wiki
+
+.SH SEE ALSO
+.BR dracut (8)
--- a/dracut-rhel6.xml
+++ b/dracut-rhel6.xml
--- a/558
+++ b/558
@@ -0,0 +1,558 @@
+#!/bin/sh
+
+STATEDIR=/var/lib/dracut
+BOOTDIR=/boot
+CONF=/etc/dracut.conf
+KPKGCONF=/etc/kernel-img.conf
+USETRIGGERS=true
+mode=""
+version=""
+
+set -e
+
+if        $USETRIGGERS                                         \
+       && [ x"$DPKG_MAINTSCRIPT_PACKAGE" != x ]                \
+       && [ $# = 1 ]                                           \
+       && [ x"$1" = x-u ]                                      \
+       && dpkg-trigger --check-supported 2>/dev/null
+then
+       if dpkg-trigger --no-await update-initramfs; then
+               echo "dracut-update-initramfs: deferring update (trigger activated)"
+               exit 0
+       fi
+fi
+
+usage()
+{
+       if [ -n "${1}" ]; then
+               printf "${@}\n\n" >&2
+       fi
+       cat >&2 << EOF
+Usage: ${0} [OPTION]...
+
+Options:
+ -k [version]  Specify kernel version or 'all'
+ -c            Create a new initramfs
+ -u            Update an existing initramfs
+ -d            Remove an existing initramfs
+ -t            Take over a custom initramfs with this one
+ -b            Set alternate boot directory
+ -v            Be verbose
+ -h            This message
+
+EOF
+       exit 1
+}
+
+# chroot check
+chrooted()
+{
+        # borrowed from udev's postinst
+        if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; then
+                # the devicenumber/inode pair of / is the same as that of
+                # /sbin/init's root, so we're *not* in a chroot and hence
+                # return false.
+                return 1
+        fi
+        return 0
+}
+
+mild_panic()
+{
+       if [ -n "${1}" ]; then
+               printf "${@}\n" >&2
+       fi
+       exit 0
+}
+
+panic()
+{
+       if [ -n "${1}" ]; then
+               printf "${@}\n" >&2
+       fi
+       exit 1
+}
+
+verbose()
+{
+       if [ "${verbose}" = 1 ]; then
+               printf "${@}\n"
+       fi
+}
+
+version_exists()
+{
+       [ -e "${STATEDIR}/${1}" ] && [ -e "${initramfs}" ]
+       return $?
+}
+
+set_initramfs()
+{
+       initramfs="${BOOTDIR}/dracut.img-${version}"
+}
+
+
+# backup initramfs while running
+backup_initramfs()
+{
+       [ ! -r "${initramfs}" ] && return 0
+       initramfs_bak="${initramfs}.dpkg-bak"
+       [ -r "${initramfs_bak}" ] && rm -f "${initramfs_bak}"
+       ln -f "${initramfs}" "${initramfs_bak}" \
+               || cp -a "${initramfs}" "${initramfs_bak}"
+       verbose "Keeping ${initramfs_bak}"
+}
+
+# keep booted initramfs
+backup_booted_initramfs()
+{
+       initramfs_bak="${initramfs}.dpkg-bak"
+
+       # first time run thus no backup
+       [ ! -r "${initramfs_bak}" ] && return 0
+
+       # chroot with no /proc
+       [ ! -r /proc/uptime ] && rm -f "${initramfs_bak}" && return 0
+
+       # no kept backup wanted
+       [ "${backup_initramfs}" = "no" ] && rm -f "${initramfs_bak}" && return 0
+
+       # no backup yet
+       if [ ! -r "${initramfs}.bak" ]; then
+               mv -f ${initramfs_bak} "${initramfs}.bak"
+               verbose "Backup ${initramfs}.bak"
+               return 0
+       fi
+
+       # keep booted initramfs
+       uptime_days=$(awk '{printf "%d", $1 / 3600 / 24}' /proc/uptime)
+       if [ -n "$uptime_days" ]; then
+               boot_initramfs=$(find "${initramfs}.bak" -mtime +${uptime_days})
+       fi
+       if [ -n "${boot_initramfs}" ]; then
+               mv -f "${initramfs_bak}" "${initramfs}.bak"
+               verbose "Backup ${initramfs}.bak"
+               return 0
+       fi
+       verbose "Removing current backup ${initramfs_bak}"
+       rm -f ${initramfs_bak}
+}
+
+# nuke generated copy
+remove_initramfs()
+{
+       [ -z "${initramfs_bak}" ] && return 0
+       rm -f "${initramfs_bak}"
+       verbose "Removing ${initramfs_bak}"
+}
+
+
+generate_initramfs()
+{
+       echo "dracut-update-initramfs: Generating ${initramfs}"
+       OPTS=""
+       if [ "${verbose}" = 1 ]; then
+               OPTS="-v ${OPTS}"
+       fi
+       ##WORK HERE!
+       if dracut ${OPTS} "${initramfs}.new" "${version}"; then
+               mv -f "${initramfs}.new" "${initramfs}"
+               set_sha1
+       else
+               mkinitramfs_return="$?"
+               remove_initramfs
+               rm -f "${initramfs}.new"
+               if [ "$mkinitramfs_return" = "2" ]; then
+                       # minversion wasn't met, exit 0
+                       exit 0
+               fi
+               echo "update-initramfs: failed for ${initramfs}"
+               exit $mkinitramfs_return
+       fi
+}
+
+# lilo call
+run_lilo()
+{
+       # show lilo errors on failure
+       if ! lilo -t  > /dev/null 2>&1 ; then
+               echo "ERROR lilo fails for new ${initramfs}:"
+               echo
+               lilo -t
+       fi
+       lilo
+}
+
+# check if lilo is on mbr
+mbr_check()
+{
+       # try to discover grub|grub2 and be happy
+       [ -r /boot/grub/grub.cfg ] \
+               && groot=$(awk '/^set root=/{print substr($2, 7, 3); exit}' \
+                       /boot/grub/grub.cfg)
+       [ -r /boot/grub/menu.lst ] \
+               && groot=$(awk '/^root/{print substr($2, 2, 3); exit}' \
+                       /boot/grub/menu.lst)
+       [ -e /boot/grub/device.map ] && [ -n "${groot}" ] \
+               && dev=$(awk "/${groot}/{ print \$NF}" /boot/grub/device.map)
+       [ -n "${dev}" ] && [ -r ${dev} ] \
+               && dd if="${dev}" bs=512 skip=0 count=1 2> /dev/null \
+               | grep -q GRUB && return 0
+
+       # check out lilo.conf for validity
+       boot=$(awk -F = '/^boot=/{ print $2}' /etc/lilo.conf)
+       [ -z "${boot}" ] && return 0
+       case ${boot} in
+       /dev/md/*)
+               if [ -r /proc/mdstat ]; then
+                       MD=${boot#/dev/md/}
+                       boot="/dev/$(awk "/^md${MD}/{print substr(\$5, 1, 3)}" \
+                       /proc/mdstat)"
+               fi
+               ;;
+       /dev/md*)
+               if [ -r /proc/mdstat ]; then
+                       MD=${boot#/dev/}
+                       boot="/dev/$(awk "/^${MD}/{print substr(\$5, 1, 3)}" \
+                       /proc/mdstat)"
+               fi
+               ;;
+       esac
+       [ ! -r "${boot}" ] && return 0
+       dd if="${boot}" bs=512 skip=0 count=1 2> /dev/null | grep -q LILO \
+               && run_lilo && return 0
+
+       # no idea which bootloader is used
+       echo
+       echo "WARNING: grub and lilo installed."
+       echo "If you use grub as bootloader everything is fine."
+       echo "If you use lilo as bootloader you must run lilo!"
+       echo
+}
+
+# Invoke bootloader
+run_bootloader()
+{
+       # if both lilo and grub around, figure out if lilo needs to be run
+       if ( command -v update-grub >/dev/null 2>&1 \
+               || [ -e /boot/grub/menu.lst ] || [ -e /boot/grub/grub.cfg ] ) \
+       && ( [ -e /etc/lilo.conf ] && command -v lilo >/dev/null 2>&1 ); then
+               [ -r "${KPKGCONF}" ] && \
+               do_b=$(awk  '/^do_bootloader/{print $3}' "${KPKGCONF}")
+               if [ "${do_b}" = "yes" ] || [ "${do_b}" = "Yes" ] \
+               || [ "${do_b}" = "YES" ]; then
+                       run_lilo
+                       return 0
+               elif [ "${do_b}" = "no" ] || [ "${do_b}" = "No" ] \
+               || [ "${do_b}" = "NO" ]; then
+                       return 0
+               fi
+
+               # do_bootloader unconfigured
+               mbr_check
+               return 0
+       fi
+       if [ -r /etc/lilo.conf ] && command -v lilo >/dev/null 2>&1; then
+               run_lilo
+               return 0
+       fi
+       if command -v elilo >/dev/null 2>&1; then
+               elilo
+               return 0
+       fi
+       if [ -r /etc/zipl.conf ]; then
+               zipl
+       fi
+       if flash-kernel --supported >/dev/null 2>&1; then
+               flash-kernel ${version}
+       fi
+}
+
+compare_sha1()
+{
+       sha1sum "${initramfs}" | diff "${STATEDIR}/${version}" - >/dev/null 2>&1
+       return $?
+}
+
+# Note that this must overwrite so that updates work.
+set_sha1()
+{
+       sha1sum "${initramfs}" > "${STATEDIR}/${version}"
+}
+
+delete_sha1()
+{
+       rm -f "${STATEDIR}/${version}"
+}
+
+# ro /boot is not modified
+ro_boot_check()
+{
+       # check irrelevant inside of a chroot
+       if [ ! -r /proc/mounts ] || chrooted; then
+               return 0
+       fi
+
+       boot_opts=$(awk '/boot/{if ((match($4, /^ro/) || match($4, /,ro/)) \
+               && $2 == "/boot") print "ro"}' /proc/mounts)
+       if [ -n "${boot_opts}" ]; then
+               echo "WARNING: /boot is ro mounted."
+               echo "update-initramfs: Not updating ${initramfs}"
+               exit 0
+       fi
+}
+
+get_sorted_versions()
+{
+       version_list=""
+
+       for gsv_x in "${STATEDIR}"/*; do
+               gsv_x="$(basename "${gsv_x}")"
+               if [ "${gsv_x}" = '*' ]; then
+                       return 0
+               fi
+               worklist=""
+               for gsv_i in $version_list; do
+                       if dpkg --compare-versions "${gsv_x}" '>' "${gsv_i}"; then
+                               worklist="${worklist} ${gsv_x} ${gsv_i}"
+                               gsv_x=""
+                       else
+                               worklist="${worklist} ${gsv_i}"
+                       fi
+               done
+               if [ "${gsv_x}" != "" ]; then
+                       worklist="${worklist} ${gsv_x}"
+               fi
+               version_list="${worklist}"
+       done
+
+       verbose "Available versions: ${version_list}"
+}
+
+set_current_version()
+{
+       if [ -f /boot/dracut.img-`uname -r` ]; then
+               version=`uname -r`
+       fi
+}
+
+set_linked_version()
+{
+       if [ -e /initrd.img ] && [ -L /initrd.img ]; then
+               linktarget="$(basename "$(readlink /initrd.img)")"
+       fi
+
+       if [ -e /boot/initrd.img ] && [ -L /boot/initrd.img ]; then
+               linktarget="$(basename "$(readlink /boot/initrd.img)")"
+       fi
+
+       if [ -z "${linktarget}" ]; then
+               return
+       fi
+
+       version="${linktarget##*img-}"
+}
+
+set_highest_version()
+{
+       get_sorted_versions
+       set -- ${version_list}
+       version=${1}
+}
+
+create()
+{
+       if [ -z "${version}" ]; then
+               usage "Create mode requires a version argument"
+       fi
+
+       set_initramfs
+
+       if [ "${takeover}" = 0 ]; then
+               if version_exists "${version}"; then
+                       panic "Cannot create version ${version}: already exists"
+               fi
+
+               if [ -e "${initramfs}" ]; then
+                       panic "${initramfs} already exists, cannot create."
+               fi
+       fi
+
+       generate_initramfs
+}
+
+update()
+{
+       if [ "${update_initramfs}" = "no" ]; then
+               echo "update-initramfs: Not updating initramfs."
+               exit 0
+       fi
+
+       if [ -z "${version}" ]; then
+               set_highest_version
+       fi
+
+       if [ -z "${version}" ]; then
+               set_linked_version
+       fi
+
+       if [ -z "${version}" ]; then
+               set_current_version
+       fi
+
+       if [ -z "${version}" ]; then
+               verbose "Nothing to do, exiting."
+               exit 0
+       fi
+
+       set_initramfs
+
+       ro_boot_check
+
+       altered_check
+
+       backup_initramfs
+
+       generate_initramfs
+
+       run_bootloader
+
+       backup_booted_initramfs
+}
+
+delete()
+{
+       if [ -z "${version}" ]; then
+               usage "Delete mode requires a version argument"
+       fi
+
+       set_initramfs
+
+       if [ ! -e "${initramfs}" ]; then
+               panic "Cannot delete ${initramfs}, doesn't exist."
+       fi
+
+       if ! version_exists "${version}"; then
+               panic "Cannot delete version ${version}: Not created by this utility."
+       fi
+
+       altered_check
+
+       echo "update-initramfs: Deleting ${initramfs}"
+
+       delete_sha1
+
+       rm -f "${initramfs}"
+}
+
+# Check for update mode on existing and modified initramfs
+altered_check()
+{
+       # No check on takeover
+       [ "${takeover}" = 1 ] && return 0
+       if [ ! -e "${initramfs}" ]; then
+               mild_panic "${initramfs} does not exist. Cannot update."
+       fi
+       if ! compare_sha1; then
+               echo "update-initramfs: ${initramfs} has been altered." >&2
+               mild_panic "update-initramfs: Cannot update. Override with -t option."
+       fi
+}
+
+# Defaults
+verbose=0
+yes=0
+# We default to takeover=1 in Ubuntu, but not Debian
+takeover=0
+
+##
+
+while getopts "k:cudyvtb:h?" flag; do
+       case "${flag}" in
+       k)
+               version="${OPTARG}"
+               ;;
+       c)
+               mode="c"
+               ;;
+       d)
+               mode="d"
+               ;;
+       u)
+               mode="u"
+               ;;
+       v)
+               verbose="1"
+               ;;
+       y)
+               yes="1"
+               ;;
+       t)
+               takeover="1"
+               ;;
+       b)
+               BOOTDIR="${OPTARG}"
+               if [ ! -d "${BOOTDIR}" ]; then
+                       echo "Error: ${BOOTDIR} is not a directory."
+                       exit 1
+               fi
+               ;;
+       h|?)
+               usage
+               ;;
+       esac
+done
+
+shift $((${OPTIND} - 1))
+
+if [ $# -ne 0 ]; then
+       echo "Invalid argument for option -k."
+       usage
+fi
+
+# Validate arguments
+if [ -z "${mode}" ]; then
+       usage "You must specify at least one of -c, -u, or -d."
+fi
+
+if [ "${version}" = "all" ] \
+       || ( [ "${update_initramfs}" = "all" ] && [ -z "${version}" ] ); then
+       : FIXME check for --yes, and if not ask are you sure
+       get_sorted_versions
+       if [ -z "${version_list}" ]; then
+               verbose "Nothing to do, exiting."
+               exit 0
+       fi
+
+       OPTS="-b ${BOOTDIR}"
+       if [ "${verbose}" = "1" ]; then
+               OPTS="${OPTS} -v"
+       fi
+       if [ "${takeover}" = "1" ]; then
+               OPTS="${OPTS} -t"
+       fi
+       if [ "${yes}" = "1" ]; then
+               OPTS="${OPTS} -y"
+       fi
+       for u_version in ${version_list}; do
+               # Don't stop if one version doesn't work.
+               set +e
+               verbose "Execute: ${0} -${mode} -k \"${u_version}\" ${OPTS}"
+               "${0}" -${mode} -k "${u_version}" ${OPTS}
+               set -e
+       done
+       exit 0
+fi
+
+
+case "${mode}" in
+       c)
+               create
+               ;;
+       d)
+               delete
+               ;;
+       u)
+               update
+               ;;
+esac
--- a/dracut.8
+++ b/dracut.8
@@ -1,16 +1,16 @@
 .TH DRACUT 8 "June 2009" "Linux"
 .SH NAME
-switch_root \- switch to another filesystem as the root of the mount tree.
+dracut \- create initial ramdisk images for preloading modules
 .SH SYNOPSIS
 \fBdracut\fR [\fIOPTION\fR]... \fI<image>\fR  \fI<kernel-version>\fR

 .SH DESCRIPTION
-.B switch_root
-\fBdracut\fR creates an initial image used by the kernel for
+.B 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.

-.SH OPTIONS
+.SS Options
 .TP
 .BR \-f ", " \-\-force
 overwrite existing initramfs file.
@@ -24,8 +24,55 @@ Modules are located in
 .BR \-o ", " \-\-omit " \fILIST\fR"
 omit a space-separated list of dracut modules.
 .TP
+.BR \-a ", " \-\-add " \fILIST\fR"
+add a space-separated list of dracut modules.
+.TP
 .BR \-d ", " \-\-drivers " \fILIST\fR"
-specify a space-separated list of kernel modules to include in the initramfs.
+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.
+.TP
+.BR \-\-add-drivers " \fILIST\fR"
+specify a space-separated list of kernel modules to add to the initramfs.
+The kernel modules have to be specified without the ".ko" suffix.
+.TP
+.BR \-\-omit-drivers " \fILIST\fR"
+specify a space-separated list of kernel modules to omit from the initramfs.
+The kernel modules have to be specified without the ".ko" suffix. 
+Regular expressions are also allowed like ".*/fs/ocfs/.*".
+
+If [LIST] has multiple arguments, then you have to put these in quotes.
+
+example:
+# dracut --omit "module1 module2"  ...
+.TP
+.BR \-\-filesystems " \fILIST\fR"
+specify a space-separated list of kernel filesystem modules to exclusively 
+include in the generic initramfs.
+.TP
+.BR \-k ", " \-\-kmoddir " \fI{DIR}\fR   
+specify the directory, where to look for kernel modules
+.TP
+.BR " \-\-fwdir " \fI{DIR}\fR   
+specify additional directory, where to look for firmwares
+.TP
+.BR \-\-kernel-only
+only install kernel drivers and firmware files
+.TP
+.BR \-\-no-kernel
+do not install kernel drivers and firmware files
+.TP
+.BR \-\-mdadmconf
+include local /etc/mdadm.conf
+.TP
+.BR \-\-nomdadmconf
+do not include local /etc/mdadm.conf
+.TP
+.BR \-\-strip
+strip binaries in the initramfs (default)
+.TP
+.BR \-\-nostrip
+do not strip binaries in the initramfs
 .TP
 .BR \-h ", " \-\-help
 display help text and exit. 
@@ -41,6 +88,11 @@ specify configuration file to use.
 Default: 
 .IR /etc/dracut.conf
 .TP
+.BR \-\-confdir " \fIDIR\fR"
+specify configuration directory to use.
+Default: 
+.IR /etc/dracut.conf.d
+.TP
 .BR \-l ", " \-\-local
 local mode. Use modules from the current working
 directory instead of the system-wide installed in
@@ -58,7 +110,7 @@ target directory in the final initramfs.
 .BR \-I ", " \-\-install " \fILIST\fR"
 install the space separated list of files into the initramfs.

-.SH KERNEL COMMAND LINE
+.SH "KERNEL COMMAND LINE"
 The root filesystem used by the kernel is specified in the boot configuration
 file, as always. The traditional \fBroot=/dev/hda1\fR style device 
 specification is allowed. If a label is used, as in \fBroot=LABEL=rootPart\fR
@@ -67,45 +119,257 @@ with the appropriate label, and mount that device as the root filesystem.
 \fBroot=UUID=uuidnumber\fR will mount the partition with that UUID as the 
 root filesystem.

-.SH Standard
+.SS Standard
 .TP
-.B init=<path to real init>
+.BR init= "<path to real init>"
 .TP
-.B root=<path to blockdevice>
-specify e.g. \fI/dev/sda1\fR or
-\fI/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1\fR
+.BR root= "<path to blockdevice>"
+specify blockdevice to use as root filesystem. 
+ e.g.
+  root=/dev/sda1
+  root=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1
+.TP
+.BR rootfstype= "<filesystem type>"
+"auto" if not specified, e.g. rootfstype=ext3
+.TP
+.BR 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.
+.TP
+\fBrootfallback=\fR\fI<path to blockdevice>\fR
+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\&.
+.TP
+.B rd_NO_FSTAB
+do not honor special mount options for the root filesystem found in 
+/etc/fstab of the real root.

-.SH DHCP
+.SS Misc
 .TP
-.B root=dhcp
-get IP from dhcp server, root-path option from dhcp specifies root location
+.BR hostname= "<hostname>"
+set the initial hostname
+.TP
+.BR rdblacklist= "<drivername>"
+do not load kernel module <drivername>
+This parameter can be specified multiple times.
+.TP
+.BR rdloaddriver= "<drivername>"
+force loading kernel module <drivername>
+This parameter can be specified multiple times.
+.TP
+.BR rd_retry= "<seconds>"
+wait <seconds> until dracut tries to force assemble LVM or RAID volumes. If the root device is not found within <seconds>*2 then dracut fails and either drops to a shell, if rdshell is on the kernel command line, or exits with 1, which normally causes a kernel panic.

-.SH NFS
+Default: rd_retry=40
+
+.SS Debug
 .TP
-.B root=[<server-ip>:]<root-dir>[:<nfs-options>]
+.B rdinfo
+print informational output though "quiet" is set
+.TP
+.B rdshell
+allow dropping to a shell, if root mounting fails
+.TP
+.B rdinitdebug
+set -x for the dracut shell and logs to dmesg, console and /init.log
+.TP
+.B rdbreak
+drop to a shell at the end
+.TP
+.ad l
+.BR rdbreak= \%{cmdline\:|pre-udev\:|pre-trigger\:|initqueue\:|pre-mount\:|mount\:|pre-pivot}
+.ad
+drop to a shell on defined breakpoint
+.TP
+.B rdudevinfo
+set udev to loglevel info
+.TP
+.B rdudevdebug
+set udev to loglevel debug
+
+.SS I18N
+ e.g.
+  LANG=en_US.UTF-8
+  SYSFONT=latarcyrheb-sun16
+  KEYTABLE=de-latin1-nodeadkeys
+.TP
+.BR KEYBOARDTYPE= sun|pc
+will be written to /etc/sysconfig/keyboard in the initramfs
+.TP
+.BR KEYTABLE= "<keytable filename>"
+will be written to /etc/sysconfig/keyboard in the initramfs
+.TP
+.BR SYSFONT= "Console font"
+will be written to /etc/sysconfig/i18n in the initramfs
+.TP
+.BR SYSFONTACM= "Unicode font map"
+will be written to /etc/sysconfig/i18n in the initramfs
+.TP
+.BR UNIMAP= "Unicode font map"
+will be written to /etc/sysconfig/i18n in the initramfs
+.TP
+.BR LANG= <locale>
+will be written to /etc/sysconfig/i18n in the initramfs
+
+.SS LVM
+.TP
+.BR rd_NO_LVM
+disable LVM detection
+.TP
+.BR 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.
+.TP
+.BR 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.
+.TP
+.BR rd_NO_LVMCONF
+remove any /etc/lvm/lvm.conf, which may exist in the initramfs
+
+.SS "crypto LUKS"
+.TP
+.BR rd_NO_LUKS
+disable crypto LUKS detection
+.TP
+.BR 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.
+.TP
+.BR rd_NO_CRYPTTAB
+do not check, if LUKS partition is in /etc/crypttab
+
+.SS MD
+.TP
+.BR rd_NO_MD
+disable MD RAID detection
+.TP
+.BR rd_NO_MDIMSM
+no MD RAID for imsm/isw raids, use dmraid instead
+.TP
+.BR rd_NO_MDADMCONF
+ignore mdadm.conf included in initramfs
+.TP
+.BR rd_MD_UUID= "<md uuid>"
+only activate the raid sets with the given UUID.
+This parameter can be specified multiple times.
+
+.SS DMRAID
+.TP
+.BR rd_NO_DM
+disable DM RAID detection
+.TP
+.BR rd_DM_UUID= "<dmraid uuid>"
+only activate the raid sets with the given UUID.
+This parameter can be specified multiple times.
+
+.SS MULTIPATH
+.TP
+.BR rd_NO_MULTIPATH
+disable multipath in the initramfs
+
+.SS FIPS
+.TP
+.BR fips=1
+enable FIPS
+.TP
+.BR boot=<boot device>
+specify the device, where /boot is located
+ e.g.
+  boot=/dev/sda1
+  boot=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1
+  boot=UUID=<uuid>
+  boot=LABEL=<label>
+
+If the root device is encrypted, the /boot partition must reside on a seperate partition and has to be specified.
+
+.SS Network
+.TP
+.BR ip= {dhcp|on|any|dhcp6|auto6|ibft}
+dhcp|on|any: get ip from dhcp server from all interfaces. If root=dhcp, 
+loop sequentially through all interfaces (eth0, eth1, ...) and use the first 
+with a valid DHCP root-path.
+.sp
+\fBauto6\fR: IPv6 autoconfiguration
+.sp
+\fBdhcp6\fR: IPv6 DHCP
+.sp
+\fBibft\fR: iBFT autoconfiguration
+
+.TP
+.BR ip= <interface>:{dhcp|on|any|dhcp6|auto6}
+dhcp|on|any|dhcp6: get ip from dhcp server on a specific interface
+auto6: do IPv6 autoconfiguration
+This parameter can be specified multiple times.
+
+.TP
+.ad l
+.BR ip= "\%<client-IP>\::[<server-id>]\::<gateway-IP>\::<netmask>\::<client\%hostname>\::<interface>\::{none|off}"
+.ad
+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.
+.TP
+.BR ifname= <interface>:<MAC>
+Assign network device name <interface> (ie eth0) to the NIC with MAC <MAC>.
+Note that if you use this option you \fBmust\fR specify an ifname= argument
+for all interfaces used in ip= or fcoe= arguments
+This parameter can be specified multiple times.
+.TP
+.BR bootdev= <interface>
+specify network interface to use routing and netroot information from. 
+Required if multiple ip= lines are used.
+.TP
+.BR nameserver= "<IP> [nameserver=<IP> ...]"
+specify nameserver(s) to use
+.TP
+.BR 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)
+This parameter can be specified multiple times.
+.TP
+.BR 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
+.TP
+.BR 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
+.TP
+.BR biosdevname={0|1]}
+turn off/on biosdevname network interface renaming
+.SS NFS
+.TP
+.BR 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. 
-NFS options can be appended with the prefix "." or ","
+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 ",".
 .TP
-.B root=nfs:[<server-ip>:]<root-dir>[:<nfs-options>] 
+.BR root= "nfs:[<server-ip>:]<root-dir>[:<nfs-options>]"
 .TP
-.B root=nfs4:[<server-ip>:]<root-dir>[:<nfs-options>]
+.BR root= "nfs4:[<server-ip>:]<root-dir>[:<nfs-options>]"
 .TP
-.B root=dhcp 
+.BR root= dhcp|dhcp6 
 root=dhcp alone directs initrd to look at the DHCP root-path where NFS 
 options can be specified.
    root-path=<server-ip>:<root-dir>[,<nfs-options>]
    root-path=nfs:<server-ip>:<root-dir>[,<nfs-options>]
    root-path=nfs4:<server-ip>:<root-dir>[,<nfs-options>] 
 .TP
-.B root=/dev/nfs nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
+.BR root= /dev/nfs " nfsroot=" "[<server-ip>:]<root-dir>[,<nfs-options>]"
 \fBDeprecated!\fR kernel Documentation/filesystems/nfsroot.txt defines 
 this method.  
 This is supported by dracut but not recommended.
-
-.SH iSCSI
 .TP
-.B root=iscsi:[<servername>]:[<protocol>]:[<port>]:[<LUN>]:<targetname>
+.BR rd_NFS_DOMAIN= "<NFSv4 domain name>"
+Set the NFSv4 domain name. Will overwrite the settings in /etc/idmap.conf.
+
+.SS iSCSI
+.TP
+.ad l
+.BR root= "\%iscsi:[username:password\:[:reverse:password]@]\:[<servername>]\::[<protocol>]\::[<port>]\:[:[<iscsi_iface_name>]:[<netdev_name>]]\::[<LUN>]\::<targetname>"
+.ad
 protocol defaults to "6", LUN defaults to "0".

 If the "servername" field is provided by BOOTP or DHCP, then that
@@ -117,93 +381,131 @@ associated fields.

 http://tools.ietf.org/html/rfc4173

-If the root partition is not specified using \fBroot=\fR, one of the partitions found 
-with label \fBROOT\fR or \fB/\fR will be used to boot from.
-
 .TP
-.B root=iscsi:[<servername>]:[<protocol>]:[<port>]:[<LUN>]:<targetname>
+.ad l
+.BR root= "\%iscsi:[username:password\:[:reverse:password]@]\:[<servername>]\::[<protocol>]\::[<port>]\:[:[<iscsi_iface_name>]:[<netdev_name>]]\::[<LUN>]\::<targetname>"
+.ad
 e.g. root=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0

+.ad l
+If servername is an IPv6 address, it has to be put in brackets.
+ e.g. 
+  root=iscsi:[2001:DB8::1]::::iqn.2009-06.dracut:target0
 .TP
-.B root=??? netroot=iscsi:[<servername>]:[<protocol>]:[<port>]:[<LUN>]:<targetname> ...
+.ad l
+.BR root= ??? " netroot=" "\%iscsi:[username:password[:reverse:password]@]\:[<servername>]\::[<protocol>]\::[<port>]\:[:[<iscsi_iface_name>]:[<netdev_name>]]\::[<LUN>]\::<targetname> ..."
+.ad
 multiple netroot options allow setting up multiple iscsi disks
-e.g. 
-   root=UUID=12424547 netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0 netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1
-.B not yet implemented
+ e.g. 
+  root=UUID=12424547
+  netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0
+  netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1
+
+.ad l
+If servername is an IPv6 address, it has to be put in brackets.
+ e.g.
+  netroot=iscsi:[2001:DB8::1]::::iqn.2009-06.dracut:target0
 .TP
-.B root=??? iscsi_initiator= iscsi_target_name= iscsi_target_ip= iscsi_target_port= iscsi_target_group= iscsi_username=  iscsi_password= iscsi_in_username= iscsi_in_password=
+.ad l
+.BR \%root= \%??? " \%iscsi_initiator=" \%<initiator> " \%iscsi_target_name=" "<target name>" " \%iscsi_target_ip=" "<target ip>" " \%iscsi_target_port=" "<target port>" " \%iscsi_target_group=" "<target group>" " \%iscsi_username=" "<username>" " \%iscsi_password=" <password> " \%iscsi_in_username=" "<in username>" " \%iscsi_in_password=" "<in password>"
+.ad
+manually specify all iscsistart parameter (see \fIiscsistart\ --help\fR)

 .TP
-.B root=??? iscsi_firmware
+.BR root= ??? " netroot=iscsi iscsi_firmware"
 will read the iscsi parameter from the BIOS firmware

-.SH NBD
 .TP
-.B root=nbd:<server>:<port>[:<fstype>][:<mountopts>]
+.BR iscsi_param= <param>
+<param> will be passed as "--param <param>" to iscsistart.
+This parameter can be specified multiple times.
+ e.g.:
+   "netroot=iscsi iscsi_firmware iscsi_param=node.session.timeo.replacement_timeout=30"
+   will result in
+   iscsistart -b --param node.session.timeo.replacement_timeout=30
+
+.SS FCoE
+.TP
+.BR fcoe=<edd|interface|MAC>:<dcb|nodcb>
+Try to connect to a FCoE SAN through the NIC specified by <interface> or <MAC> or EDD settings.
+This parameter can be specified multiple times.
+
+.SS NBD
+.TP
+.BR root= nbd:<server>:<port>[:<fstype>][:<mountopts>]
 mount nbd share from <server>
 .TP
-.B root=dhcp 
-   with dhcp root-path=nbd:<server>:<port>[:<fstype>][:<mountopts>]
-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.
+.BR root= dhcp 
+with dhcp root-path=nbd:<server>:<port>[:<fstype>][:<mountopts>]
+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.

-.SH Network
-.TP bootdev=<interface>
-.B specify the network interface to boot from
-.TP
-.B ip=[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.
-.TP
-.B ip=<interface>:[dhcp|on|any]
-get ip from dhcp server on a specific interface
-.TP
-.B ip=<client-IP-number>:<gateway-IP-number>:<netmask>:<client-hostname>:<interface>:[dhcp|on|any|]
-explicit network configuration

-.SH Misc
+.SS DASD
 .TP
-.B rdblacklist=<drivername>
-do not load kernel module <drivername>
+.BR rd_DASD_MOD= ....
+same syntax as the kernel module parameter (s390 only)

-.SH Debug
 .TP
-.B rdinitdebug
-set -x for the dracut shell
-.TP
-.B rdbreak=[pre-udev|pre-mount|mount|pre-pivot|]
-drop the shell on defined breakpoint
-.TP
-.B rdudevinfo
-set udev to loglevel info
-.TP
-.B rdudevdebug
-set udev to loglevel debug
-.TP
-.B rdnetdebug
-debug network scripts in dracut. Output is written to /tmp/
+.ad l
+.BR rd_DASD= "\%<dasd adaptor device bus ID>\:[,readonly=X]\:[,use_diag=X]\:[,erplog=X]\:[,failfast=X]"
+.ad
+activate DASD device with the given adaptor device bus ID and setting the sysfs attributes
+to the specified values
+This parameter can be specified multiple times.

-.SH CONFIGURATION IN INITRAMFS
+.SS ZFCP
+.TP
+.BR rd_ZFCP= "<zfcp adaptor device bus ID>,\:<WWPN>,\:<FCPLUN>"
+rd_ZFCP can be specified multiple times on the kernel command line.
+
+example: rd_ZFCP=0.0.4000,0x5005076300C213e9,0x5022000000000000 
+.TP
+.BR rd_NO_ZFCPCONF
+ignore zfcp.conf included in the initramfs
+
+.SS ZNET
+.TP
+.BR rd_ZNET= "<nettype>,<subchannels>,<options>"
+rd_ZNET can be specified multiple times on the kernel command line. Examples:
+    rd_ZNET=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portname=foo
+    rd_ZNET=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar
+
+.SS "Plymouth Boot Splash"
+.TP
+.BR rd_NO_PLYMOUTH
+do not start plymouth. This will not work with encrypted partitions.
+
+.SH FILES
+.TP
+.B /var/log/dracut.log
+.TP
+.B /etc/dracut.conf
+see \fBdracut.conf\fR(5)
+.SS "Configuration in the Initramfs"
 .TP 
-.B /conf/conf.d/
-Any files found in /conf/conf.d/ will be sourced in the initramfs to 
+.B /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.
+.TP
+.B /etc/cmdline
+Can contain additional command line options.

 .SH AUTHORS
 .nf
-Andreas Thienemann <andreas@bawue.net>
-Bill Nottingham <notting@redhat.com>
-Dave Jones <davej@redhat.com>
-David Dillow <dave@thedillows.org>
 Harald Hoyer <harald@redhat.com>
-Jeremy Katz <katzj@redhat.com>
-Peter Jones <pjones@redhat.com>
-Seewer Philippe <philippe.seewer@bfh.ch>
 Victor Lowther <victor.lowther@gmail.com>
 Warren Togami <wtogami@redhat.com>
+Jeremy Katz <katzj@redhat.com>
+Philippe Seewer <philippe.seewer@bfh.ch>
+David Dillow <dave@thedillows.org>
 .fi
 .SH AVAILABILITY
 The dracut command is part of the dracut package and is available from
-https://sourceforge.net/apps/trac/dracut/wiki
-
+http://sourceforge.net/apps/trac/dracut/wiki

+.SH SEE ALSO
+.BR dracut.conf (5)
--- a/dracut.conf
+++ b/dracut.conf
@@ -1,10 +1,26 @@
 # Sample dracut config file

 # Specific list of dracut modules to use
-#dracutmodules=""
+#dracutmodules+=""

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

-# Additional kernel modules to install
-#drivers=""
+# Dracut modules to add to the default
+#add_dracutmodules+=""
+
+# additional kernel modules to the default
+#add_drivers+=""
+
+# list of kernel filesystem modules to be included in the generic initramfs
+#filesystems+=""
+
+# build initrd only to boot current hardware
+#hostonly="yes"
+#
+
+# install local /etc/mdadm.conf
+mdadmconf="yes"
+
+# install local /etc/lvm/lvm.conf
+lvmconf="yes"
--- a/dracut.conf.5
+++ b/dracut.conf.5
@@ -0,0 +1,78 @@
+.TH DRACUT.CONF 5 "NOV 2009" "Linux"
+.SH NAME
+dracut.conf \- configuration file for dracut
+
+.SH SYNOPSIS
+\fB/etc/dracut.conf\fR
+
+.SH DESCRIPTION
+.B dracut.conf
+is loaded during the initialisation phase of dracut.
+Command line parameter will overwrite any values set here.
+
+.SH OPTIONS
+.TP
+.BR dracutmodules+= \%"\ [LIST]\ "
+Specify a space-separated list of dracut modules to
+call when building the initramfs. Modules are located
+in /usr/share/dracut/modules.d.
+.TP
+.BR omit_dracutmodules+= \%"\ [LIST]\ "
+Omit a space-separated list of dracut modules.
+.TP
+.BR add_dracutmodules+= \%"\ [LIST]\ "
+Add a space-separated list of dracut modules.
+.TP
+.BR drivers+= \%"\ [LIST]\ "
+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.
+.TP
+.BR add_drivers+= \%"\ [LIST]\ "
+Specify a space-separated list of kernel 
+modules to add to the initramfs.
+The kernel modules have to be specified without the ".ko" suffix.
+.TP
+.BR omit_drivers+= \%"\ [LIST]\ "
+Specify a space-separated list of kernel 
+modules to omit from the initramfs.
+The kernel modules have to be specified without the ".ko" suffix.
+Regular expressions are also allowed like ".*/fs/foo/.* .*/fs/bar/.*".
+.TP
+.BR filesystems+= \%"\ [LIST]\ "
+Specify a space-separated list of kernel filesystem
+modules to exclusively include in the generic
+initramfs.
+.TP
+.BR drivers_dir= \%"<dir>"
+Specify the directory, where to look for kernel modules
+.TP
+.BR fw_dir+= \%":<dir>[:<dir>\ ...]"
+Specify additional directories, where to look for firmwares, separated by :
+.TP
+.BR do_strip= \%"yes|no"
+Strip binaries in the initramfs (default=yes)
+.TP
+.BR hostonly= \%"yes|no"
+Host-Only mode: Install only what is needed for booting 
+the local host instead of a generic host.
+.TP
+.BR mdadmconf= \%"yes|no"
+Include local /etc/mdadm.conf (default=yes)
+.TP
+.BR lvmconf= \%"yes|no"
+Include local /etc/lvm/lvm.conf (default=yes)
+.TP
+.BR kernel_only= \%"yes|no"
+Only install kernel drivers and firmware files. (default=no)
+.TP
+.BR no_kernel= \%"yes|no"
+Do not install kernel drivers and firmware files (default=no)
+.TP
+\fBinstall_items+=\fR"\ \&\fI<file>\fR[ \fI<file>\fR\ \&\&...]\ \&"
+
+Specify additional files to include in the initramfs, separated by spaces.
+
+.SH SEE ALSO
+.BR dracut (8)
+
--- a/dracut.logrotate
+++ b/dracut.logrotate
@@ -0,0 +1,9 @@
+/var/log/dracut.log {
+    missingok
+    notifempty
+    compress
+    delaycompress
+    copytruncate
+    size 1M
+    create 0600 root root
+}
--- a/dracut.png
+++ b/dracut.png
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,111 +1,295 @@
-%if 0%{?fedora} < 12
-%define with_switch_root 1
-%else
+# Variables must be defined
+%define with_switch_root	1
+%define with_nbd		1
+
+# switchroot provided by util-linux-ng in F-12+
+%if 0%{?fedora} > 11 || 0%{?rhel} >= 6
 %define with_switch_root 0
 %endif
-
-%if %{defined gittag}
-%define rdist 1.git%{gittag}%{?dist}
-%define dashgittag -%{gittag}
-%else
-%define rdist %{?dist}
+# nbd in Fedora only
+%if 0%{?rhel} >= 6
+%define with_nbd 0
 %endif

-
 Name: dracut
-Version: 0.2
-Release: 1%{?rdist}
+Version: 004
+Release: 1%{?dist}
 Summary: Initramfs generator using udev
-Group: System Environment/Base		
-License: GPLv2+	
+Group: System Environment/Base
+License: GPLv2+
 URL: http://apps.sourceforge.net/trac/dracut/wiki
-Source0: dracut-%{version}%{?dashgittag}.tar.bz2
+
+Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: udev
-Requires: util-linux-ng
-Requires: module-init-tools
-Requires: cpio
-Requires: coreutils
-Requires: findutils
-Requires: grep
-Requires: mktemp
-Requires: mount
-Requires: bash
-Requires: /bin/sh 
-Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils
-Requires: lvm2 >= 2.02.33-9, dhclient
-Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1
-Requires: e2fsprogs >= 1.38-12, libselinux, libsepol, coreutils
-Requires: mdadm, elfutils-libelf, plymouth >= 0.7.0
-Requires: cryptsetup-luks
-%ifnarch s390 s390x
-Requires: dmraid
-Requires: kbd
+
+%if 0%{?fedora} > 12 || 0%{?rhel} >= 6
+# no "provides", because dracut does not offer
+# all functionality of the obsoleted packages
+Obsoletes: mkinitrd <= 6.0.93
+Obsoletes: mkinitrd-devel <= 6.0.93
+Obsoletes: nash <= 6.0.93
+Obsoletes: libbdevid-python <= 6.0.93
 %endif

+Requires: bash
+Requires: bzip2
+Requires: coreutils
+Requires: cpio
+Requires: dash
+Requires: filesystem >= 2.1.0
+Requires: findutils
+Requires: grep
+Requires: gzip
+Requires: initscripts >= 8.63-1
+Requires: kbd
+Requires: mktemp >= 1.5-5
+Requires: module-init-tools >= 3.7-9
+Requires: mount
+Requires: plymouth >= 0.8.0-0.2009.29.09.19.1
+Requires: plymouth-scripts
+Requires: sed
+Requires: tar
+Requires: udev
+Requires: util-linux-ng >= 2.16
+Requires: which
+Requires: file
+
 %if ! 0%{?with_switch_root}
+Requires: util-linux-ng >= 2.16
 BuildArch: noarch
 %endif

+BuildRequires: docbook-style-xsl docbook-dtds libxslt
+BuildRequires: dash bash git
+
 %description
 dracut is a new, event-driven initramfs infrastructure based around udev.

+%package network
+Summary: Dracut modules to build a dracut initramfs with network support
+Requires: %{name} = %{version}-%{release}
+Requires: dhclient rpcbind nfs-utils
+Requires: iscsi-initiator-utils
+%if %{with_nbd}
+Requires: nbd
+%endif
+Requires: net-tools iproute
+Requires: bridge-utils
+
+%description network
+This package requires everything which is needed to build a generic
+all purpose initramfs with network support with dracut.
+
+%package fips
+Summary: Dracut modules to build a dracut initramfs with an integrity check
+Requires: %{name} = %{version}-%{release}
+Requires: hmaccalc fipscheck
+%if 0%{?rhel} > 5
+# For Alpha 3, we want nss instead of nss-softokn
+Requires: nss
+%else
+Requires: nss-softokn
+%endif
+Requires: nss-softokn-freebl >= 3.14.3-22.el6_6
+
+%description fips
+This package requires everything which is needed to build an
+all purpose initramfs with dracut, which does an integrity check.
+
+%package fips-aesni
+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.
+
+%package caps
+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.

 %package generic
-Summary: Metapackage to build a generic initramfs
+Summary: Metapackage to build a generic initramfs with dracut
 Requires: %{name} = %{version}-%{release}
-Requires: rpcbind nfs-utils 
-Requires: iscsi-initiator-utils
-Requires: nbd
-Requires: net-tools iproute
+Requires: %{name}-network = %{version}-%{release}

 %description generic
 This package requires everything which is needed to build a generic
-all purpose initramfs.
+all purpose initramfs with dracut.


+%package kernel
+Summary: Metapackage to build generic initramfs with dracut with only kernel modules
+Requires: %{name} = %{version}-%{release}
+
+%description kernel
+This package requires everything which is needed to build a initramfs with all
+kernel modules and firmware files needed by dracut modules.
+
+%package tools
+Summary: Dracut tools to build the local initramfs
+Requires: %{name} = %{version}-%{release}
+Requires: coreutils cryptsetup-luks device-mapper
+Requires: diffutils dmraid findutils gawk grep lvm2
+Requires: module-init-tools sed
+Requires: cpio gzip
+
+%description tools
+This package contains tools to assemble the local initrd and host configuration.
+
 %prep
-%setup -q -n %{name}-%{version}%{?dashgittag}
+%setup -q -n %{name}-%{version}
+
+%if %{defined PATCH1}
+git init
+git config user.email "dracut-maint@redhat.com"
+git config user.name "Fedora dracut team"
+git add .
+git commit -a -q -m "%{version} baseline."
+
+# Apply all the patches.
+git am -p1 %{patches}
+%endif
+
+chmod 0755 modules.d/*/check
+# make rpmlint happy
+chmod 0755 modules.d/*/install
+chmod 0755 modules.d/*/installkernel
+chmod 0755 modules.d/*/*.sh

 %build
-make
-
+make WITH_SWITCH_ROOT=0%{?with_switch_root}

 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin sysconfdir=/etc mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
+     sysconfdir=/etc mandir=%{_mandir} WITH_SWITCH_ROOT=0%{?with_switch_root}

-%if ! 0%{?with_switch_root}
-rm -f $RPM_BUILD_ROOT/sbin/switch_root
+echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
+rm $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/01fips/check
+rm $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/02fips-aesni/check
+
+mkdir -p $RPM_BUILD_ROOT/boot/dracut
+mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
+touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
+
+%if 0%{?fedora} <= 12 && 0%{?rhel} < 6
+rm $RPM_BUILD_ROOT/sbin/mkinitrd
+rm $RPM_BUILD_ROOT/sbin/lsinitrd
 %endif

+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut
+
+echo 'do_strip=no' > $RPM_BUILD_ROOT/etc/dracut.conf.d/02-fips.conf
+> $RPM_BUILD_ROOT/etc/system-fips
+
 %clean
 rm -rf $RPM_BUILD_ROOT

 %files
 %defattr(-,root,root,0755)
-%doc README HACKING TODO COPYING AUTHORS
+%doc README HACKING TODO COPYING AUTHORS NEWS dracut-rhel6.html
 /sbin/dracut
 %if 0%{?with_switch_root}
 /sbin/switch_root
 %endif
+%if 0%{?fedora} > 12 || 0%{?rhel} >= 6
+/sbin/mkinitrd
+/sbin/lsinitrd
+%endif
 %dir %{_datadir}/dracut
 %{_datadir}/dracut/dracut-functions
-%{_datadir}/dracut/modules.d
 %config(noreplace) /etc/dracut.conf
+%dir /etc/dracut.conf.d
+%config(noreplace) /etc/logrotate.d/dracut
+%{_mandir}/man1/lsinitrd.1*
+%{_mandir}/man8/mkinitrd.8*
 %{_mandir}/man8/dracut.8*
+%{_mandir}/man5/dracut.conf.5*
+%{_datadir}/dracut/modules.d/00dash
+%{_datadir}/dracut/modules.d/10redhat-i18n
+%{_datadir}/dracut/modules.d/10rpmversion
+%{_datadir}/dracut/modules.d/50plymouth
+%{_datadir}/dracut/modules.d/60xen
+%{_datadir}/dracut/modules.d/90btrfs
+%{_datadir}/dracut/modules.d/90crypt
+%{_datadir}/dracut/modules.d/90dm
+%{_datadir}/dracut/modules.d/90dmraid
+%{_datadir}/dracut/modules.d/90dmsquash-live
+%{_datadir}/dracut/modules.d/90kernel-modules
+%{_datadir}/dracut/modules.d/90lvm
+%{_datadir}/dracut/modules.d/90mdraid
+%{_datadir}/dracut/modules.d/90multipath
+%{_datadir}/dracut/modules.d/95debug
+%{_datadir}/dracut/modules.d/95fstab-sys
+%{_datadir}/dracut/modules.d/95resume
+%{_datadir}/dracut/modules.d/95rootfs-block
+%{_datadir}/dracut/modules.d/95dasd
+%{_datadir}/dracut/modules.d/95dasd_mod
+%{_datadir}/dracut/modules.d/95zfcp
+%{_datadir}/dracut/modules.d/95znet
+%{_datadir}/dracut/modules.d/95terminfo
+%{_datadir}/dracut/modules.d/95udev-rules
+%{_datadir}/dracut/modules.d/95uswsusp
+%{_datadir}/dracut/modules.d/96insmodpost
+%{_datadir}/dracut/modules.d/97biosdevname
+%{_datadir}/dracut/modules.d/98syslog
+%{_datadir}/dracut/modules.d/99base
+%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
+
+%files network
+%defattr(-,root,root,0755)
+%doc README HACKING TODO COPYING AUTHORS NEWS
+%{_datadir}/dracut/modules.d/40network
+%{_datadir}/dracut/modules.d/95fcoe
+%{_datadir}/dracut/modules.d/95iscsi
+%{_datadir}/dracut/modules.d/95nbd
+%{_datadir}/dracut/modules.d/95nfs
+%{_datadir}/dracut/modules.d/45ifcfg
+
+%files fips
+%defattr(-,root,root,0755)
+%doc COPYING
+%{_datadir}/dracut/modules.d/01fips
+%config(noreplace) /etc/dracut.conf.d/02-fips.conf
+%config(missingok) /etc/system-fips
+
+%files fips-aesni
+%defattr(-,root,root,0755)
+%doc COPYING
+%{_datadir}/dracut/modules.d/02fips-aesni
+
+%files caps
+%defattr(-,root,root,0755)
+%doc COPYING
+%{_datadir}/dracut/modules.d/02caps
+
+%files kernel
+%defattr(-,root,root,0755)
+%doc README.kernel

 %files generic
 %defattr(-,root,root,0755)
 %doc README.generic

+%files tools
+%defattr(-,root,root,0755)
+%doc COPYING NEWS
+%{_mandir}/man8/dracut-gencmdline.8*
+%{_mandir}/man8/dracut-catimages.8*
+/sbin/dracut-gencmdline
+/sbin/dracut-catimages
+%dir /boot/dracut
+%dir /var/lib/dracut
+%dir /var/lib/dracut/overlay
+
 %changelog
-* Wed Jul 01 2009 Harald Hoyer <harald@redhat.com> 0.2-1
- version 0.2
-
-* Fri Jun 19 2009 Harald Hoyer <harald@redhat.com> 0.1-1
- first release
-
-* Thu Dec 18 2008 Jeremy Katz <katzj@redhat.com> - 0.0-1
- Initial build
-
--- a/dracut.svg
+++ b/dracut.svg
--- a/git2spec.pl
+++ b/git2spec.pl
@@ -0,0 +1,61 @@
+#!/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 -M -N --no-signature -o "'.$pdir.'" '.$tag.' |');
+    @lines=<GIT>;
+    close GIT;         # be done
+    return @lines;
+};
+
+use POSIX qw(strftime);
+my $datestr = strftime "%Y%m%d", gmtime;
+
+my $tag=shift;
+my $pdir=shift;
+$tag=&last_tag if not defined $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;
+
+while(<>) {
+    if (/^Version:/) {
+	print "Version: $tag\n";
+    }
+    elsif (/^Release:/) {
+	print "Release: $release%{?dist}\n";
+    }
+    elsif ((/^Source0:/) || (/^Source:/)) {
+	print $_;
+	$num=1;
+	for(@patches) {
+	    s/.*\///g;
+	    print "Patch$num: $_";
+	    $num++;
+	}
+	print "\n";
+    }
+    else {
+	print $_;
+    }
+}
--- 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/141
+++ b/141
@@ -0,0 +1,141 @@
+#!/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 "-f, --file <filename>       print the contents of <filename>."
+        echo "-k, --kver <kernel version> inspect the initramfs of <kernel version>."
+        echo
+    } >&2
+}
+
+sorted=0
+declare -A filenames
+
+unset POSIXLY_CORRECT
+TEMP=$(getopt \
+    -o "shf:k:" \
+    --long kver: \
+    --long file: \
+    --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;;
+        --)         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
+    image="/boot/initramfs-${KERNEL_VERSION}.img"
+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
+
+read -N 6 bin < "$image"
+case $bin in
+    $'\x1f\x8b'*)
+        CAT="zcat";;
+    BZh*)
+        CAT="bzcat";;
+    070701)
+        CAT="cat";;
+    *)
+        CAT="xzcat";
+        if echo "test"|xz|xzcat --single-stream >/dev/null 2>&1; then
+            CAT="xzcat --single-stream"
+        fi
+        ;;
+esac
+
+ret=0
+
+if (( ${#filenames[@]} > 0 )); then
+    (( ${#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
+else
+    echo "Image: $image: $(du -h $image | while read a b; do echo $a;done)"
+    echo "========================================================================"
+    $CAT -- "$image" | cpio --extract --verbose --quiet --to-stdout -- 'dracut-*' 2>/dev/null
+    ((ret+=$?))
+    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 "========================================================================"
+fi
+
+exit $ret
--- a/lsinitrd.1
+++ b/lsinitrd.1
@@ -0,0 +1,73 @@
+'\" t
+.\"     Title: lsinitrd
+.\"    Author: [see the "AUTHORS" section]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 07/17/2013
+.\"    Manual: dracut
+.\"    Source: dracut
+.\"  Language: English
+.\"
+.TH "LSINITRD" "1" "07/17/2013" "dracut" "dracut"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+lsinitrd \- tool to show the contents of an initramfs image
+.SH "SYNOPSIS"
+.sp
+\fBlsinitrd\fR [\fIOPTION\&...\fR] [<image> [<filename> [<filename> [\&...] ]]]
+.sp
+\fBlsinitrd\fR [\fIOPTION\&...\fR] \-k <kernel\-version>
+.SH "DESCRIPTION"
+.sp
+lsinitrd shows the contents of an initramfs image\&. if <image> is omitted, then lsinitrd uses the default image \fI/boot/<machine\-id>/<kernel\-version>/initrd\fR or \fI/boot/initramfs\-<kernel\-version>\&.img\fR\&.
+.SH "OPTIONS"
+.PP
+\fB\-h, \-\-help\fR
+.RS 4
+print a help message and exit\&.
+.RE
+.PP
+\fB\-s, \-\-size\fR
+.RS 4
+sort the contents of the initramfs by size\&.
+.RE
+.PP
+\fB\-f, \-\-file\fR\ \&\fI<filename>\fR
+.RS 4
+print the contents of <filename>\&.
+.RE
+.PP
+\fB\-k, \-\-kver\fR\ \&\fI<kernel version>\fR
+.RS 4
+inspect the initramfs of <kernel version>\&.
+.RE
+.SH "AVAILABILITY"
+.sp
+The lsinitrd command is part of the dracut package and is available from \m[blue]\fBhttps://dracut\&.wiki\&.kernel\&.org\fR\m[]
+.SH "AUTHORS"
+.sp
+Harald Hoyer
+.sp
+Amerigo Wang
+.sp
+Nikoli
+.SH "SEE ALSO"
+.sp
+\fBdracut\fR(8)
--- a/mkinitrd-dracut.sh
+++ b/mkinitrd-dracut.sh
@@ -0,0 +1,150 @@
+#!/bin/bash --norc
+
+error() {
+    local NONL=""
+    if [ "$1" == "-n" ]; then
+        NONL="-n"
+        shift
+    fi
+    echo $NONL "$@" > /dev/stderr
+}
+
+usage () {
+    if [ "$1" == "-n" ]; then
+        cmd=echo
+    else
+        cmd=error
+    fi
+
+    $cmd "usage: `basename $0` [--version] [--help] [-v] [-f] [--preload <module>]"
+    $cmd "       [--image-version] [--with=<module>]"
+    $cmd "       <initrd-image> <kernel-version>"
+    $cmd ""
+    $cmd "       (ex: `basename $0` /boot/initramfs-$(uname -r).img $(uname -r))"
+
+    if [ "$1" == "-n" ]; then
+        exit 0
+    else
+        exit 1
+    fi
+}
+
+
+while [ $# -gt 0 ]; do
+    case $1 in
+        --with-usb*)
+            if [ "$1" != "${1##--with-usb=}" ]; then
+                usbmodule=${1##--with-usb=}
+            else
+                usbmodule="usb-storage"
+            fi
+            basicmodules="$basicmodules $usbmodule"
+            unset usbmodule
+            ;;
+        --with-avail*)
+            if [ "$1" != "${1##--with-avail=}" ]; then
+                modname=${1##--with-avail=}
+            else
+                modname=$2
+                shift
+            fi
+
+            basicmodules="$basicmodules $modname"
+            ;;
+        --with*)
+            if [ "$1" != "${1##--with=}" ]; then
+                modname=${1##--with=}
+            else
+                modname=$2
+                shift
+            fi
+
+            basicmodules="$basicmodules $modname"
+            ;;
+        --version)
+            echo "mkinitrd: dracut compatibility wrapper"
+            exit 0
+            ;;
+        -v|--verbose)
+            dracut_args="${dracut_args} -v"
+            ;;
+        -f|--force)
+            dracut_args="${dracut_args} -f"
+            ;;
+        --preload*)
+            if [ "$1" != "${1##--preload=}" ]; then
+                modname=${1##--preload=}
+            else
+                modname=$2
+                shift
+            fi
+            basicmodules="$basicmodules $modname"
+            ;;
+        --image-version)
+            img_vers=yes
+            ;;
+	--rootfs*)
+            if [ "$1" != "${1##--rootfs=}" ]; then
+                rootfs="${1##--rootfs=}"
+            else
+                rootfs="$2"
+                shift
+            fi
+	    dracut_args="${dracut_args} --filesystems $rootfs"
+	    ;;
+        --builtin*) ;;
+        --without*) ;;
+        --without-usb) ;;
+        --fstab*) ;;
+        --nocompress) ;;
+        --ifneeded) ;;
+        --omit-scsi-modules) ;;
+        --omit-ide-modules) ;;
+        --omit-raid-modules) ;;
+        --omit-lvm-modules) ;;
+        --omit-dmraid) ;;
+        --allow-missing) ;;
+        --net-dev*) ;;
+        --noresume) ;;
+	--rootdev*) ;;
+	--thawdev*) ;;
+	--rootopts*) ;;
+	--root*) ;;
+	--loopdev*) ;;
+	--loopfs*) ;;
+	--loopopts*) ;;
+	--looppath*) ;;
+	--dsdt*) ;;
+        --bootchart) ;;
+        --help)
+            usage -n
+            ;;
+        *)
+            if [ -z "$target" ]; then
+                target=$1
+            elif [ -z "$kernel" ]; then
+                kernel=$1
+            else
+                usage
+            fi
+            ;;
+    esac
+
+    shift
+done
+
+if [ -z "$target" -o -z "$kernel" ]; then
+    usage
+fi
+
+if [ -n "$img_vers" ]; then
+    target="$target-$kernel"
+fi
+
+if [ -n "$basicmodules" ]; then
+	dracut $dracut_args --add-drivers "$basicmodules" "$target" "$kernel"
+else
+	dracut $dracut_args "$target" "$kernel"
+fi
+
+# vim:ts=8:sw=4:sts=4:et
--- a/mkinitrd.8
+++ b/mkinitrd.8
@@ -0,0 +1,103 @@
+'\" t
+.\"     Title: mkinitrd
+.\"    Author: [see the "AUTHORS" section]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 07/17/2013
+.\"    Manual: dracut
+.\"    Source: dracut
+.\"  Language: English
+.\"
+.TH "MKINITRD" "8" "07/17/2013" "dracut" "dracut"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+mkinitrd \- is a compat wrapper, which calls dracut to generate an initramfs
+.SH "SYNOPSIS"
+.sp
+\fBmkinitrd\fR [\fIOPTION\&...\fR] [<initrd\-image>] <kernel\-version>
+.SH "DESCRIPTION"
+.sp
+mkinitrd creates an initramfs image <initrd\-image> for the kernel with version <kernel\-version> by calling "dracut"\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBImportant\fR
+.ps -1
+.br
+.sp
+If a more fine grained control over the resulting image is needed, "dracut" should be called directly\&.
+.sp .5v
+.RE
+.SH "OPTIONS"
+.PP
+\fB\-\-version\fR
+.RS 4
+print info about the version
+.RE
+.PP
+\fB\-v, \-\-verbose\fR
+.RS 4
+increase verbosity level
+.RE
+.PP
+\fB\-f, \-\-force\fR
+.RS 4
+overwrite existing initramfs file\&.
+.RE
+.PP
+\fB*\-\-image\-version\fR
+.RS 4
+append the kernel version to the target image <initrd\-image>\-<kernel\-version>\&.
+.RE
+.PP
+\fB\-\-with=<module>\fR
+.RS 4
+add the kernel module <module> to the initramfs\&.
+.RE
+.PP
+\fB\-\-preload=<module>\fR
+.RS 4
+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\&.
+.RE
+.PP
+\fB\-\-nocompress\fR
+.RS 4
+do not compress the resulting image\&.
+.RE
+.PP
+\fB\-\-help\fR
+.RS 4
+print a help message and exit\&.
+.RE
+.SH "AVAILABILITY"
+.sp
+The mkinitrd command is part of the dracut package and is available from \m[blue]\fBhttps://dracut\&.wiki\&.kernel\&.org\fR\m[]
+.SH "AUTHORS"
+.sp
+Harald Hoyer
+.SH "SEE ALSO"
+.sp
+\fBdracut\fR(8)
--- a/modules.d/01fips/check
+++ b/modules.d/01fips/check
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+[[ $1 = -d ]] && exit 0
+exit 255
+
--- a/modules.d/01fips/fips-boot.sh
+++ b/modules.d/01fips/fips-boot.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# 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
+elif getarg boot= >/dev/null; then
+    . /sbin/fips.sh
+    if mount_boot; then
+        do_fips || die "FIPS integrity test failed"
+    fi
+fi
--- a/modules.d/01fips/fips-noboot.sh
+++ b/modules.d/01fips/fips-noboot.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# 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
+elif ! [ -f /tmp/fipsdone ]; then
+    . /sbin/fips.sh
+    mount_boot
+    do_fips || die "FIPS integrity test failed"
+fi
--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
@@ -0,0 +1,124 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+mount_boot()
+{
+    boot=$(getarg boot=)
+
+    if [ -n "$boot" ]; then
+        case "$boot" in
+        LABEL=*)
+            boot="$(echo $boot | sed 's,/,\\x2f,g')"
+            boot="/dev/disk/by-label/${boot#LABEL=}"
+            ;;
+        UUID=*)
+            boot="/dev/disk/by-uuid/${boot#UUID=}"
+            ;;
+        /dev/*)
+            ;;
+        *)
+            die "You have to specify boot=<boot device> as a boot option for fips=1" ;;
+        esac
+
+        if ! [ -e "$boot" ]; then
+            udevadm trigger --action=add >/dev/null 2>&1
+            [ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
+            i=0
+            while ! [ -e $boot ]; do
+                if [ $UDEVVERSION -ge 143 ]; then
+                    udevadm settle --exit-if-exists=$boot >/dev/null 2>&1
+                else
+                    udevadm settle --timeout=30 >/dev/null 2>&1
+                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
+            done
+        fi
+
+        [ -e "$boot" ] || return 1
+
+        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 /dev/.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()
+{
+    local _v
+    local _s
+    local _v
+    local _module
+    info "Checking integrity of kernel"
+    KERNEL=$(uname -r)
+
+    if ! [ -e "/boot/.vmlinuz-${KERNEL}.hmac" ]; then
+        warn "/boot/.vmlinuz-${KERNEL}.hmac does not exist"
+        return 1
+    fi
+
+    if [ -e "/dev/.initramfs/live/vmlinuz0" ]; then
+        do_rhevh_check /dev/.initramfs/live/vmlinuz0 || return 1
+    elif [ -e "/dev/.initramfs/live/isolinux/vmlinuz0" ]; then
+        do_rhevh_check /dev/.initramfs/live/isolinux/vmlinuz0 || return 1
+    else
+        sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1
+    fi
+
+    FIPSMODULES=$(cat /etc/fipsmodules)
+
+    info "Loading and integrity checking all crypto modules"
+    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
+                    [ "$_k" = "driver" ] && _v=$(str_replace "$_v" "_" "-")
+                    [ "$_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 "All initrd crypto checks done"
+
+    > /tmp/fipsdone
+
+    umount /boot >/dev/null 2>&1
+
+    return 0
+}
--- a/modules.d/01fips/install
+++ b/modules.d/01fips/install
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+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
+dracut_install sha512hmac rmmod insmod mount uname umount
+
+libdir="lib"
+if ldd $(find_binary sha512hmac) 2>/dev/null | grep -q /lib64/; then
+    libdir="lib64"
+fi
+
+if [ -e /usr/$libdir/libsoftokn3.so ]; then
+    dracut_install \
+        /usr/$libdir/libsoftokn3.so /usr/$libdir/libsoftokn3.chk
+else
+    dracut_install \
+        /$libdir/libsoftokn3.so /$libdir/libsoftokn3.chk
+fi
+
+for i in /{usr,}/$libdir/libssl.so* /{usr,}/$libdir/libcrypto.so* \
+         /{usr,}/$libdir/.libssl.so*.hmac /{usr,}/$libdir/.libcrypto.so*.hmac; do
+    [ -e $i ] || continue
+    dracut_install $i
+done
+
+dracut_install -o /usr/$libdir/hmaccalc/sha*hmac.hmac
+dracut_install fipscheck
+dracut_install /etc/system-fips
+
+if command -v prelink >/dev/null; then
+    dracut_install prelink
+fi
+
+# vim:ts=8:sw=4:sts=4:et
--- a/modules.d/01fips/installkernel
+++ b/modules.d/01fips/installkernel
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+_fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm "
+_fipsmodules+="chainiv crc32c 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 -p "${initdir}/etc/modprobe.d"
+
+for mod in $_fipsmodules; do
+    if hostonly='' instmods $mod; then
+        echo $mod >> "${initdir}/etc/fipsmodules"
+        echo "blacklist $mod" >> "${initdir}/etc/modprobe.d/fips.conf"
+    fi
+done
+
+# vim:ts=8:sw=4:sts=4:et
--- a/modules.d/02caps/README
+++ b/modules.d/02caps/README
@@ -0,0 +1,33 @@
+This adds the following parameters:
+rd.caps=1
+        turn the caps module on/off
+rd.caps.initdrop=cap_sys_module,cap_sys_rawio
+        drop the specified comma seperated capabilities
+rd.caps.disablemodules=1
+        turn off module loading
+rd.caps.disablekexec=1
+        turn off the kexec functionality
+
+If module loading is turned off, all modules have to be loaded in the
+initramfs, which are used later on. This can be done with
+"rdloaddriver="
+rdloaddriver=autofs4,sunrpc,ipt_REJECT,nf_conntrack_ipv4,....
+
+Because the kernel command line would get huge with all those drivers, I
+recommend to make use of $initramfs/etc/cmdline.
+
+So, all rd.caps.* and rdloaddriver arguments are in caps.conf can be
+copied to $initramfs/etc/cmdline with "-i caps.conf /etc/cmdline".
+
+Also all modules have to be loaded in the initramfs via "--add-drivers".
+
+The resulting initramfs creation would look like this:
+
+  --add-drivers "autofs4 sunrpc ipt_REJECT nf_conntrack_ipv4 \
+  nf_defrag_ipv4 iptable_filter ip_tables
+  ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack
+  ip6table_filter ip6_tables dm_mirror dm_region_hash dm_log uinput ppdev
+  parport_pc parport ipv6 sg 8139too 8139cp mii i2c_piix4 i2c_core ext3
+  jbd mbcache sd_mod crc_t10dif sr_mod cdrom ata_generic pata_acpi ata_piix
+  dm_mod" \
+  /boot/initramfs-caps.img
--- a/modules.d/02caps/caps.sh
+++ b/modules.d/02caps/caps.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+capsmode=$(getarg rd.caps)
+
+if [ "$capsmode" = "1" ]; then
+    CAPS_INIT_DROP=$(getarg rd.caps.initdrop=)
+    CAPS_USERMODEHELPER_BSET=$(capsh --drop="$CAPS_INIT_DROP" -- -c 'while read a b ; do [ "$a" = "CapBnd:" ] && echo $((0x${b:$((${#b}-8)):8})) $((0x${b:$((${#b}-16)):8})) && break; done < /proc/self/status')
+    CAPS_MODULES_DISABLED=$(getarg rd.caps.disablemodules=)
+    CAPS_KEXEC_DISABLED=$(getarg rd.caps.disablekexec=)
+
+    info "Loading CAPS_MODULES $CAPS_MODULES"
+    for i in $CAPS_MODULES;do modprobe $i 2>&1 >/dev/null | vinfo; done
+    
+    if [ "$CAPS_MODULES_DISABLED" = "1" -a -e /proc/sys/kernel/modules_disabled ]; then
+        info "Disabling module loading."
+        echo $CAPS_MODULES_DISABLED > /proc/sys/kernel/modules_disabled
+    fi
+
+    if [ "$CAPS_KEXEC_DISABLED" = "1" -a -e /proc/sys/kernel/kexec_disabled ]; then
+        info "Disabling kexec."
+        echo $CAPS_KEXEC_DISABLED > /proc/sys/kernel/kexec_disabled
+    fi
+
+    info "CAPS_USERMODEHELPER_BSET=$CAPS_USERMODEHELPER_BSET"
+    if [ -e /proc/sys/kernel/usermodehelper/bset ]; then
+        info "Setting usermode helper bounding set."
+        echo $CAPS_USERMODEHELPER_BSET > /proc/sys/kernel/usermodehelper/bset
+        echo $CAPS_USERMODEHELPER_BSET > /proc/sys/kernel/usermodehelper/inheritable
+    fi
+    
+    echo "CAPS_INIT_DROP=\"$CAPS_INIT_DROP\"" > /etc/capsdrop
+    info "Will drop capabilities $CAPS_INIT_DROP from init."
+fi
+
--- a/modules.d/02caps/check
+++ b/modules.d/02caps/check
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+[[ $1 = -d ]] && exit 0
+
+type -P capsh >/dev/null 2>&1 || exit 1
+
+exit 0
+
--- a/modules.d/02caps/install
+++ b/modules.d/02caps/install
@@ -0,0 +1,10 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+inst_hook pre-pivot 99 "$moddir/caps.sh"
+dracut_install capsh
+# capsh wants bash and we need bash also
+inst /bin/bash && ln -sf bash "${initdir}/bin/sh"
+
+
--- a/modules.d/02fips-aesni/check
+++ b/modules.d/02fips-aesni/check
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+[[ $1 = -d ]] && exit 0
+exit 255
+
--- a/modules.d/02fips-aesni/installkernel
+++ b/modules.d/02fips-aesni/installkernel
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+FIPSMODULES="aesni-intel"
+
+mkdir -p "${initdir}/etc/modprobe.d"
+
+for mod in $FIPSMODULES; do 
+    if hostonly='' instmods $mod; then
+        echo $mod >> "${initdir}/etc/fipsmodules"
+        echo "blacklist $mod" >> "${initdir}/etc/modprobe.d/fips.conf"
+    fi
+done
+
+# vim:ts=8:sw=4:sts=4:et
--- a/modules.d/10redhat-i18n/install
+++ b/modules.d/10redhat-i18n/install
@@ -1,8 +1,9 @@
 #!/bin/bash
+
 findkeymap () {
    local MAP=$1
    [[ ! -f $MAP ]] && \
-	MAP=$(find /lib/kbd/keymaps -type f -name $MAP -o -name $MAP.\* | head -n1)
+	MAP=$(find ${kbddir}/keymaps -type f -name $MAP -o -name $MAP.\* | head -n1)
    [[ " $KEYMAPS " = *" $MAP "* ]] && return
    KEYMAPS="$KEYMAPS $MAP"
    case $MAP in
@@ -12,52 +13,88 @@ findkeymap () {
    esac

    for INCL in $($cmd "^include " $MAP | cut -d' ' -f2 | tr -d '"'); do
-        for FN in $(find /lib/kbd/keymaps -type f -name $INCL\*); do
+        for FN in $(find ${kbddir}/keymaps -type f -name $INCL\*); do
            findkeymap $FN
        done
    done
 }

+install_local()
+{
 # FIXME: i18n stuff isn't really distro-independent :/
-if [[ -f /etc/sysconfig/keyboard || -f /etc/sysconfig/console/default.kmap ]]; then
-    if [ -f /etc/sysconfig/console/default.kmap ]; then
-        KEYMAP=/etc/sysconfig/console/default.kmap
-    else
-        . /etc/sysconfig/keyboard
-        [[ $KEYTABLE && -d /lib/kbd/keymaps ]] && KEYMAP="$KEYTABLE.map"
-    fi
-    if [[ $KEYMAP ]]; then
-        [ -f /etc/sysconfig/keyboard ] && inst /etc/sysconfig/keyboard
-        inst loadkeys
-        findkeymap $KEYMAP
+    if [[ -f /etc/sysconfig/keyboard || -f /etc/sysconfig/console/default.kmap ]]; then
+	if [ -f /etc/sysconfig/console/default.kmap ]; then
+            KEYMAP=/etc/sysconfig/console/default.kmap
+	else
+            . /etc/sysconfig/keyboard
+	    if [[ $KEYTABLE && -d ${kbddir}/keymaps ]]; then
+		[[ $KEYTABLE =~ *.uni ]] && UNIKEYMAP="$KEYTABLE.map" \
+		    || UNIKEYMAP="$KEYTABLE.uni.map"
+		KEYMAP="$KEYTABLE.map"
+	    fi
+	fi
+	if [[ $KEYMAP ]]; then
+            [ -f /etc/sysconfig/keyboard ] && inst /etc/sysconfig/keyboard
+            inst loadkeys
+            findkeymap $KEYMAP
+            [[ $UNIKEYMAP ]] && findkeymap $UNIKEYMAP
+	    [[ $GRP_TOGGLE ]] && findkeymap $GRP_TOGGLE.map
+	    findkeymap delete.map
+	    findkeymap backspace.map

-        for FN in $KEYMAPS; do
-            inst $FN
+            for FN in $KEYMAPS; do
+		if [ -L $FN ]; then
+		    TARGET=$(readlink -f $FN)
+		    TG=$(echo $TARGET | sed -e 's/\.gz$//' -e 's/\.bz2$//')
+		    LN=$(echo $FN | sed -e 's/\.gz$//' -e 's/\.bz2$//')
+                    mkdir -p "$initdir/$(dirname $LN)"
+                    ln -s "$TG" "$initdir/$LN"
+                    FN=$TARGET
+		fi
+		inst $FN
+		case $FN in
+                    *.gz) gzip -d "$initdir$FN" ;;
+                    *.bz2) bzip2 -d "$initdir$FN" ;;
+		esac
+            done
+	fi
+    fi
+
+    if [ -f /etc/sysconfig/i18n ]; then
+	. /etc/sysconfig/i18n
+	inst /etc/sysconfig/i18n
+	[[ $SYSFONT ]] || SYSFONT=latarcyrheb-sun16
+	inst setfont
+
+	for FN in ${kbddir}/consolefonts/$SYSFONT.* ; do
+            inst "$FN"
            case $FN in
-                *.gz) gzip -d "$initdir$FN" ;;
-                *.bz2) bzip2 -d "$initdir$FN" ;;
+		*.gz) gzip -d "$initdir$FN" ;;
+		*.bz2) bzip2 -d "$initdir$FN" ;;
            esac
-        done
+	done
+	[[ $SYSFONTACM ]] && inst ${kbddir}/consoletrans/$SYSFONTACM
+	[[ $UNIMAP ]] && inst ${kbddir}/unimaps/$UNIMAP
    fi
-fi
+}

-if [ -f /etc/sysconfig/i18n ]; then
-    . /etc/sysconfig/i18n
-    inst /etc/sysconfig/i18n
-    [[ $SYSFONT ]] || SYSFONT=latarcyrheb-sun16
-    inst setfont
+for kbddir in /usr/lib/kbd /lib/kbd; do
+	[[ -d ${kbddir} ]] && break
+done

-    for FN in /lib/kbd/consolefonts/$SYSFONT.* ; do
-        inst "$FN"
-        case $FN in
-            *.gz) gzip -d "$initdir$FN" ;;
-            *.bz2) bzip2 -d "$initdir$FN" ;;
-        esac
+if [[ $hostonly ]]; then 
+    install_local
+else
+    for i in $(find ${kbddir} -type f -print); do
+	dracut_install $i
    done
-    [[ $SYSFONTACM ]] && inst /lib/kbd/consoletrans/$SYSFONTACM
-    [[ $UNIMAP ]] && inst /lib/kbd/unimaps/$UNIMAP
+    # remove unnecessary files
+    rm -f "$initdir${kbddir}/consoletrans/utflist" 2>/dev/null
+    find "$initdir${kbddir}/" -name README\* -exec rm -f '{}' \;
+    dracut_install gzip bzip2
 fi

-dracut_install /lib/udev/console_*
+[ -x /lib/udev/console_init ] && dracut_install /lib/udev/console_init 
+dracut_install setfont loadkeys
 inst_rules 10-console.rules
-
+inst_hook cmdline 20 "$moddir/parse-i18n.sh"
--- a/modules.d/10redhat-i18n/parse-i18n.sh
+++ b/modules.d/10redhat-i18n/parse-i18n.sh
@@ -0,0 +1,20 @@
+inst_key_val()
+{
+    local value
+    value=$(getarg $1)
+    [ -n "$value" ] && printf '%s="%s"\n' $1 $value >> $2
+}
+
+mkdir -p /etc/sysconfig
+inst_key_val KEYBOARDTYPE /etc/sysconfig/keyboard
+inst_key_val KEYTABLE /etc/sysconfig/keyboard
+inst_key_val SYSFONT /etc/sysconfig/i18n
+inst_key_val SYSFONTACM /etc/sysconfig/i18n
+inst_key_val UNIMAP /etc/sysconfig/i18n
+inst_key_val LANG /etc/sysconfig/i18n
+
+if [ -f /etc/sysconfig/i18n ]; then
+    . /etc/sysconfig/i18n
+    export LANG
+fi
+
--- a/modules.d/10rpmversion/check
+++ b/modules.d/10rpmversion/check
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -f /etc/redhat-release ]
+
--- a/modules.d/10rpmversion/install
+++ b/modules.d/10rpmversion/install
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ -e "$moddir/dracut-version" ]; then
+    dracut_rpm_version=$(cat "$moddir/dracut-version")
+    inst "$moddir/dracut-version" /$dracut_rpm_version
+else
+    if rpm -qf $(which $0) &>/dev/null; then
+        dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(which $0) | { ver="";while read line;do ver=$line;done;echo $ver;} )
+        echo $dracut_rpm_version > $initdir/$dracut_rpm_version
+    fi
+fi
+inst_hook cmdline 01 "$moddir/version.sh"
+
--- a/modules.d/10rpmversion/version.sh
+++ b/modules.d/10rpmversion/version.sh
@@ -0,0 +1,6 @@
+for i in dracut-*; do
+    if [ -f $i ]; then
+        vinfo < $i
+    fi
+done
+unset i
--- a/modules.d/40network/check
+++ b/modules.d/40network/check
@@ -1,4 +1,27 @@
-#!/bin/sh
-which ip dhclient hostname >/dev/null 2>&1 || exit 1
+#!/bin/bash
+
+if [[ $1 = -d ]]; then
+  [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg
+  exit 0
+fi
+
+. $dracutfunctions
+
+for program in ip arping; do 
+  which $program >/dev/null 2>&1
+  if [ $? -ne 0 ]; then
+    dwarning "Could not find program \"$program\" required by network." 
+    exit 1
+  fi
+done
+for program in dhclient brctl ifenslave tr; do
+  which $program >/dev/null 2>&1
+  if [ $? -ne 0 ]; then
+    dwarning "Could not find program \"$program\" it might be required by network." 
+  fi
+done
+
+
+
 exit 255

--- a/modules.d/40network/dhclient-script
+++ b/modules.d/40network/dhclient-script
@@ -7,61 +7,73 @@ setup_interface() {
    bcast=$new_broadcast_address
    gw=${new_routers%%,*}
    domain=$new_domain_name
-    search=$new_domain_search
+    search=$(printf "$new_domain_search")
    namesrv=$new_domain_name_servers
    hostname=$new_host_name

    [ -f /tmp/net.$netif.override ] && . /tmp/net.$netif.override

-    if [ -n "$mtu" ] ; then
-	echo ip link set $netif down
-	echo ip link set $netif mtu $mtu
-	echo ip link set $netif up
-    fi > /tmp/net.$netif.up
+    # 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
+	    ip link set $netif up
+	    wait_for_if_up $netif
+	fi
+    fi

-    echo ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} dev $netif >> /tmp/net.$netif.up
+    ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} dev $netif
+
+    > /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
+    [ -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

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

 PATH=$PATH:/sbin:/usr/sbin

+export PS4="dhclient.$interface.$$ + "
+exec >>/dev/initlog.pipe 2>>/dev/initlog.pipe
 . /lib/dracut-lib.sh

-if getarg rdnetdebug ; then
-    exec >/tmp/dhclient.$interface.$$.out
-    exec 2>>/tmp/dhclient.$interface.$$.out
-    set -x
-fi
-
 # 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
+	/sbin/initqueue --onetime --name netroot-$netif  /sbin/netroot $netif 
 	;;
-    *) ;;
+    *) echo "dhcp: $reason";;
 esac

 exit 0
--- a/modules.d/40network/dhcp-root.sh
+++ b/modules.d/40network/dhcp-root.sh
@@ -7,14 +7,17 @@
 [ -z "$root" ] && root=$(getarg root=)
 [ -z "$netroot" ] && netroot=$(getarg netroot=)

-if [ "$root" = "dhcp" ] || [ "$netroot" = "dhcp" ] ; then
+if [ "$root" = "dhcp" ] || [ "$root" = "dhcp6" ] || [ "$netroot" = "dhcp" ] ; then
    # Tell ip= checker that we need dhcp
    NEEDDHCP="1"

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

    # Shut up init error check
    [ -z "$root" ] && root="dhcp"
+    echo '[ -d $NEWROOT/proc -o -e /dev/root ]' > /initqueue-finished/dhcp.sh
 fi
--- a/modules.d/40network/ifname-genrules.sh
+++ b/modules.d/40network/ifname-genrules.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# if there are no ifname parameters, just use NAME=KERNEL
+if ! getarg ifname= >/dev/null ; then
+    return
+fi
+
+{
+
+    echo 'SUBSYSTEM!="net",  GOTO="ifname_end"'
+    echo 'ACTION!="add", GOTO="ifname_end"'
+    echo 'ATTR{type}!="1", GOTO="ifname_end"'
+
+    for p in $(getargs ifname=); do
+        parse_ifname_opts $p
+	printf 'DRIVERS=="?*", ATTR{address}=="%s", NAME="%s", GOTO="ifname_end"\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 'DRIVERS=="?*", ATTR{address}!="%s", KERNEL=="%s", NAME="rename$attr{ifindex}", GOTO="ifname_end"\n' "$ifname_mac"  "$ifname_if"
+    done
+
+    echo 'LABEL="ifname_end"'
+
+} > /etc/udev/rules.d/50-ifname.rules
--- a/modules.d/40network/ifup
+++ b/modules.d/40network/ifup
@@ -3,56 +3,111 @@
 # We don't need to check for ip= errors here, that is handled by the
 # cmdline parser script
 #
+PATH=$PATH:/sbin:/usr/sbin

-# Sadly there's no easy way to split ':' separated lines into variables
-ip_to_var() {
-    local v=${1}:
-    set --
-    while [ -n "$v" ]; do
-	set -- "$@" "${v%%:*}"
-	v=${v#*:}
-    done
+export PS4="ifup.$1.$$ + "

-    unset ip srv gw mask hostname dev autoconf
-    case $# in
-    0)	autoconf="error" ;;
-    1)	autoconf=$1 ;;
-    2)	dev=$1; autoconf=$2 ;;
-    *)	ip=$1; srv=$2; gw=$3; mask=$4; hostname=$5; dev=$6; autoconf=$7 ;;
-    esac
-}
+. /lib/dracut-lib.sh
+
+[ "$RDDEBUG" = "yes" ] \
+    && [ -e /dev/initlog.pipe ] \
+    && exec >>/dev/initlog.pipe 2>>/dev/initlog.pipe

 # Run dhclient
 do_dhcp() {
    # /sbin/dhclient-script will mark the netif up and generate the online
    # event for nfsroot
    # XXX add -V vendor class and option parsing per kernel
-    dhclient -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid -lf /tmp/dhclient.$netif.lease $netif
+    #echo "Starting dhcp for interface $netif"
+    ip link set $netif up
+    wait_for_if_up $netif
+    [ -n "$macaddr" ] && ip link set address $macaddr dev $netif
+    [ -n "$mtu" ] && ip link set mtu $mtu dev $netif
+    dhclient "$@" -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid -lf /tmp/dhclient.$netif.lease $netif &
+
+    # increase wait time for DHCP
+    echo '[ $(($RDRETRY-$main_loop)) -lt 720 ] && RDRETRY=$(($main_loop+720)); rm -f "$job"' > /initqueue/rd_retry_inc_dhclient.$netif.sh
+
+    #|| 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
+	ip link set $netif up 
+	wait_for_if_up $netif
+        [ -n "$macaddr" ] && ip link set address $macaddr dev $netif
+        [ -n "$mtu" ] && ip link set mtu $mtu dev $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
+    /sbin/initqueue --onetime --name netroot-$netif  /sbin/netroot $netif 
 }

 # Handle static ip configuration
 do_static() {
-{
-	echo ip link set $netif up 
-	echo ip addr flush dev $netif
-	echo ip addr add $ip/$mask dev $netif
-    } > /tmp/net.$netif.up
+    strstr $ip '*:*:*' && load_ipv6
+
+    {
+	ip link set $netif up 
+	wait_for_if_up $netif
+        [ -n "$macaddr" ] && ip link set address $macaddr dev $netif
+        [ -n "$mtu" ] && ip link set mtu $mtu dev $netif
+	# do not flush addr for ipv6
+	#strstr $ip '*:*:*' || \
+	#    ip addr flush dev $netif
+	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 hostname $hostname > /tmp/net.$netif.hostname
+    [ -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
+    /sbin/initqueue --onetime --name netroot-$netif  /sbin/netroot $netif 
 }

-PATH=$PATH:/sbin:/usr/sbin
-
-. /lib/dracut-lib.sh
-
-if getarg rdnetdebug ; then
-    exec >/tmp/ifup.$1.$$.out
-    exec 2>>/tmp/ifup.$1.$$.out
-    set -x
-fi
+get_vid() {
+    case "$1" in
+        vlan*)
+            echo ${1#vlan}
+            ;;
+        *.*)
+            echo ${1##*.}
+            ;;
+    esac
+}

 # Huh? No $1?
 [ -z "$1" ] && exit 1
@@ -60,6 +115,47 @@ fi
 # $netif reads easier than $1
 netif=$1

+# check, if we need VLAN's for this interface
+if [ -z "$DO_VLAN_PHY" ] && [ -e /tmp/vlan.${netif}.phy ]; then
+    NO_AUTO_DHCP=yes DO_VLAN_PHY=yes ifup "$netif"
+    modprobe -b -q 8021q
+
+    for i in /tmp/vlan.*.${netif}; do
+        [ -e "$i" ] || continue
+        read vlanname < "$i"
+        if [ -n "$vlanname" ]; then
+            ip link set "$netif" up
+            wait_for_if_up "$netif"
+            ip link add dev "$vlanname" link "$netif" type vlan id "$(get_vid $vlanname)"
+            ifup "$vlanname"
+        fi
+    done
+    exit 0
+fi
+
+# 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
@@ -75,31 +171,121 @@ if [ "$netif" = "lo" ] ; then
    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
+        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
+
+        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 /sbin/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)
-[ -z "$ip" ] && do_dhcp;
+
+if [ -z "$NO_AUTO_DHCP" ] && [ -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
-[ "$CMDLINE" ] || read CMDLINE </proc/cmdline;
-for p in $CMDLINE; do
-    [ -n "${p%ip=*}" ] && continue
-    ip_to_var ${p#ip=}
-	
+for p in $(getargs ip=); do
+    ip_to_var $p
+
    # If this option isn't directed at our interface, skip it
    [ -n "$dev" ] && [ "$dev" != "$netif" ] && continue

+    # skip ibft
+    if [ "$autoconf" = "ibft" ]; then
+        if [ -n "$mtu" ] || mtu=$(getarg "mtu="); then
+            ip link set mtu $mtu dev $netif
+        fi
+        continue
+    fi
+
    # Store config for later use
-    for i in ip srv gw mask hostname; do
+    for i in ip srv gw mask hostname macaddr mtu; do
 	eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
    done > /tmp/net.$netif.override

-    case $autoconf in
-	dhcp|on|any)	 do_dhcp ;;
-        *) do_static ;;
-    esac
+    OLDIFS="$IFS"
+    IFS=,
+    set -- $autoconf
+    IFS="$OLDIFS"
+
+    for autoconf in "$@"; do
+	case $autoconf in
+	    dhcp|on|any)
+		do_dhcp -4 ;;
+	    dhcp6)
+		do_dhcp -6 ;;
+	    auto6)
+		do_ipv6auto ;;
+            *)
+		do_static ;;
+	esac
+    done
    break
 done
+
 exit 0
--- a/modules.d/40network/install
+++ b/modules.d/40network/install
@@ -1,27 +1,36 @@
 #!/bin/bash
-dracut_install ip dhclient hostname
-# Include wired net drivers, excluding wireless
-for modname in $(find "/lib/modules/$kernel/kernel/drivers" -name '*.ko'); do
-  if nm -uPA $modname | grep -q eth_type_trans; then
-    if echo "$modname" | grep -q wireless; then
-      continue
-    else
-      instmods $modname 
-    fi
-  fi
-done
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+dracut_install ip dhclient brctl arping ifenslave tr
+
 inst "$moddir/ifup" "/sbin/ifup"
 inst "$moddir/netroot" "/sbin/netroot"
 inst "$moddir/dhclient-script" "/sbin/dhclient-script"
-inst "$moddir/dhclient.conf" "/etc/dhclient.conf" 
-instmods ecb arc4
+inst "$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 94 "$moddir/parse-ibft.sh"
+inst_hook cmdline 95 "$moddir/parse-vlan.sh"
+inst_hook cmdline 97 "$moddir/parse-bond.sh"
+inst_hook cmdline 98 "$moddir/parse-bridge.sh"
 inst_hook cmdline 99 "$moddir/parse-ip-opts.sh"
+
+inst_hook cmdline 99 "$moddir/parse-ifname.sh"
 inst_hook pre-pivot 10 "$moddir/kill-dhclient.sh"

-# TODO ifcfg config style is redhat specific, this should probably
-# go into its own module at one time
-inst_hook pre-pivot 20 "$moddir/write-ifcfg.sh"
+if ldd $(which sh) 2>/dev/null | grep -q lib64; then
+    LIBDIR="/lib64"
+else
+    LIBDIR="/lib"
+fi
+
+ARCH=$(uname -m)
+
+for dir in /usr/$LIBDIR/tls/$ARCH/ /usr/$LIBDIR/tls/ /usr/$LIBDIR/$ARCH/ /usr/$LIBDIR/ /$LIBDIR/; do
+    for i in $(ls $dir/libnss_dns.so.* $dir/libnss_mdns4_minimal.so.* 2>/dev/null); do
+	dracut_install $i
+    done
+done

-mkdir -p "${initdir}/var/run"
--- a/modules.d/40network/installkernel
+++ b/modules.d/40network/installkernel
@@ -0,0 +1,23 @@
+#!/bin/bash
+# Include wired net drivers, excluding wireless
+
+net_module_test() {
+    local net_drivers='eth_type_trans|register_virtio_device'
+    local unwanted_drivers='/(wireless|isdn|uwb)/'
+    egrep -q $net_drivers "$1" && \
+	egrep -qv 'iw_handler_get_spy' "$1" && \
+	[[ ! $1 =~ $unwanted_drivers ]]
+}
+
+instmods $(filter_kernel_modules net_module_test)
+
+instmods ecb arc4
+# bridge modules
+instmods bridge stp llc
+instmods ipv6
+# vlan
+instmods 8021q
+# bonding
+instmods bonding
+# hyperv
+hostonly='' instmods hv_netvsc
--- a/modules.d/40network/net-genrules.sh
+++ b/modules.d/40network/net-genrules.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

 # pxelinux provides macaddr '-' separated, but we need ':'
 fix_bootif() {
@@ -6,7 +8,9 @@ fix_bootif() {
    local IFS='-'
    macaddr=$(for i in ${macaddr} ; do echo -n $i:; done)
    macaddr=${macaddr%:}
-    echo $macaddr
+    # strip hardware type field from pxelinux
+    [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:}
+    echo $macaddr | tr '[:upper:]' '[:lower:]'
 }

 # Don't continue if we don't need network
@@ -14,25 +18,39 @@ fix_bootif() {

 # Write udev rules
 {
+    # bridge: attempt only the defined interface
+    if [ -e /tmp/bridge.info ]; then
+        . /tmp/bridge.info
+        IFACES="$IFACES $ethname"
+    fi
+
+    for i in /tmp/vlan.*.phy; do
+        [ -e "$i" ] || continue
+        IFACES="$IFACES $(cat "$i")"
+    done
+
+    # bond: attempt only the defined interface (override bridge defines)
+    if [ -e /tmp/bond.info ]; then
+        . /tmp/bond.info
+        # It is enough to fire up only one
+        IFACES=${bondslaves%% *}
+    fi

    # BOOTIF says everything, use only that one
    BOOTIF=$(getarg 'BOOTIF=')
    if [ -n "$BOOTIF" ] ; then
 	BOOTIF=$(fix_bootif "$BOOTIF")
-	printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", RUN+="/sbin/ifup $env{INTERFACE}"\n' "$BOOTIF"
+	printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", RUN+="/sbin/initqueue --onetime --unique --name ifup-$env{INTERFACE} /sbin/ifup $env{INTERFACE}"\n' "$BOOTIF"

    # If we have to handle multiple interfaces, handle only them.
    elif [ -n "$IFACES" ] ; then
 	for iface in $IFACES ; do
-	    printf 'ACTION=="add", SUBSYSTEM=="net", KERNEL=="%s", RUN+="/sbin/ifup $env{INTERFACE}"\n' "$iface"
+	    printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", RUN+="/sbin/initqueue --onetime --unique --name ifup-$env{INTERFACE} /sbin/ifup $env{INTERFACE}"\n' "$iface"
 	done

    # Default: We don't know the interface to use, handle all
    else
-	printf 'ACTION=="add", SUBSYSTEM=="net", RUN+="/sbin/ifup $env{INTERFACE}"\n'
+	printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="?*", RUN+="/sbin/initqueue --onetime --unique --name ifup-$env{INTERFACE} /sbin/ifup $env{INTERFACE}"\n'
    fi

-    # Udev event 'online' only gets fired from ifup/dhclient-script.
-    # No special rules required
-    printf 'ACTION=="online", SUBSYSTEM=="net", RUN+="/sbin/netroot $env{INTERFACE}"\n'
 } > /etc/udev/rules.d/60-net.rules
--- a/modules.d/40network/netroot
+++ b/modules.d/40network/netroot
@@ -4,33 +4,17 @@ PATH=$PATH:/sbin:/usr/sbin

 . /lib/dracut-lib.sh

-if getarg rdnetdebug ; then
-    exec >/tmp/netroot.$1.$$.out
-    exec 2>>/tmp/netroot.$1.$$.out
-    set -x
-fi
+[ "$RDDEBUG" = "yes" ] \
+    && [ -e /dev/initlog.pipe ] \
+    && exec >>/dev/initlog.pipe 2>>/dev/initlog.pipe

 # Huh? Empty $1?
 [ -z "$1" ] && exit 1

-# Huh? No interface config?
-[ ! -e /tmp/net.$1.up ] && exit 1
-
-# Only try to configure from one network interface at a time
-#
-if [ -z "$NETROOT_LOCKED" ] ; then
-    NETROOT_LOCKED=true
-    export NETROOT_LOCKED
-    exec flock -xo /tmp/netroot.lock -c "$0 $*"
-    exit 1
-fi
-
 # 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
-[ -d $NEWROOT/proc ] && exit 0
-[ -z "$netroot" ] && exit 1

 # Let's see if we have to wait for other interfaces
 # Note: exit works just fine, since the last interface to be 
@@ -42,11 +26,15 @@ done

 # Set or override primary interface 
 netif=$1
-[ -e "/tmp/net.bootdev" ] && read netif < /tmp/net.bootdev
+if [ -e "/tmp/net.bootdev" ]; then
+    read netif < /tmp/net.bootdev
+    # only boot from $netif
+    [ -n "$1" ] && [ -n "$netif"] && [ "$netif" != "$1" ] && exit 1
+fi

 # Figure out the handler for root=dhcp by recalling all netroot cmdline 
 # handlers
-if [ "$netroot" = "dhcp" ] ; then
+if [ "$netroot" = "dhcp" ] || [ "$netroot" = "dhcp6" ] ; then
    # Unset root so we can check later
    unset root

@@ -71,6 +59,37 @@ else
    rootok="1"
 fi

+# We're here, so we can assume that upping interfaces is now ok
+[ -z "$IFACES" ] && IFACES="$netif"
+
+[ -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 default router 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
+[ -n "$new_routers" ] && dest=${new_routers%%,*}
+[ -n "$gw" ] && dest=$gw
+if [ -z "$dest" ] ; then
+    dummy=${netroot#*:}
+    dummy=${dummy%%:*}
+    case "$dummy" in
+       [0-9]*\.[0-9]*\.[0-9]*\.[0-9]*) dest=$dummy;;
+    esac
+fi
+[ -n "$dest" ] && arping -q -f -w 60 -I $netif $dest
+
+[ -d $NEWROOT/proc ] && exit 0
+[ -z "$netroot" ] && exit 1
+
 # 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'"
@@ -82,16 +101,6 @@ if [ -z "$netroot" ] || [ ! -e "$handler" ] ; then
    die "No handler for netroot type '$netroot'"
 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
-
 # Source netroot hooks before we start the handler
 source_all netroot

@@ -100,20 +109,20 @@ source_all netroot
 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
+	[ -s /tmp/dhclient.$iface.lease ] &&    cp /tmp/dhclient.$iface.lease    /tmp/net.$iface.lease
+	[ -s /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"
+    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
+#    if [ -z "$BOOTDEV" ] ; then
+#	ip link set $netif down
+#	ip addr flush dev $netif
+#	echo "#empty" > /etc/resolv.conf
+#    fi
 fi
 exit 0
--- a/modules.d/40network/parse-bond.sh
+++ b/modules.d/40network/parse-bond.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+#
+# Format:
+#       bond=<bondname>[:<bondslaves>:[:<options>]]
+#
+#       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 include 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
+#
+
+# return if bond already parsed
+[ -n "$bondname" ] && return
+
+# Check if bond parameter is valid 
+if getarg bond= >/dev/null ; then
+    if [ -z "$netroot" ] ; then
+        die "No netboot configured, bond is invalid"
+    fi
+fi
+
+# We translate list of slaves to space-separated here to mwke it easier to loop over them in ifup
+# Ditto for bonding options
+parsebond() {
+    local v=${1}:
+    set --
+    while [ -n "$v" ]; do
+        set -- "$@" "${v%%:*}"
+        v=${v#*:}
+    done
+
+    unset bondname bondslaves bondoptions
+    case $# in
+    0)  bondname=bond0; bondslaves="eth0 eth1" ;;
+    1)  bondname=$1; bondslaves="eth0 eth1" ;;
+    2)  bondname=$1; bondslaves=$(echo $2|tr "," " ") ;;
+    3)  bondname=$1; bondslaves=$(echo $2|tr "," " "); bondoptions=$(echo $3|tr "," " ") ;;
+    *)  die "bond= requires zero to four parameters" ;;
+    esac
+}
+
+unset bondname bondslaves bondoptions
+
+# Parse bond for bondname, bondslaves, bondmode and bondoptions
+if getarg bond >/dev/null; then
+    # Read bond= parameters if they exist
+    bond="$(getarg bond=)"
+    if [ ! "$bond" = "bond" ]; then 
+        parsebond "$(getarg bond=)"
+    fi
+    # Simple default bond
+    if [ -z "$bondname" ]; then
+        bondname=bond0
+        bondslaves="eth0 eth1"
+    fi
+    # Make it suitable for initscripts export
+    bondoptions=$(echo $bondoptions|tr ";" ",")
+    echo "bondname=$bondname" > /tmp/bond.info
+    echo "bondslaves=\"$bondslaves\"" >> /tmp/bond.info
+    echo "bondoptions=\"$bondoptions\"" >> /tmp/bond.info
+    return
+fi
--- a/modules.d/40network/parse-bridge.sh
+++ b/modules.d/40network/parse-bridge.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Format:
+#	bridge=<bridgename>:<ethname>
+#
+#	bridge without parameters assumes bridge=br0:eth0
+#
+
+# return if bridge already parsed
+[ -n "$bridgename" ] && return
+
+# Check if bridge parameter is valid 
+if getarg bridge= >/dev/null ; then
+    if [ -z "$netroot" ] ; then
+	die "No netboot configured, bridge is invalid"
+    fi
+fi
+
+parsebridge() {
+    local v=${1}:
+    set --
+    while [ -n "$v" ]; do
+        set -- "$@" "${v%%:*}"
+        v=${v#*:}
+    done
+
+    unset bridgename ethname
+    case $# in
+        0)  bridgename=br0; ethname=$iface ;;
+        1)  die "bridge= requires two parameters" ;;
+        2)  bridgename=$1; ethname=$2 ;;
+        *)  die "bridge= requires two parameters" ;;
+    esac
+}
+
+unset bridgename ethname
+
+iface=eth0
+if [ -e /tmp/bond.info ]; then
+    . /tmp/bond.info
+    if [ -n "$bondname" ] ; then
+        iface=$bondname
+    fi
+fi
+
+# Parse bridge for bridgename and ethname
+if getarg bridge >/dev/null; then
+    # Read bridge= parameters if they exist
+    bridge="$(getarg bridge=)"
+    if [ ! "$bridge" = "bridge" ]; then
+        parsebridge "$(getarg bridge=)"
+    fi
+    # Simple default bridge
+    if [ -z "$bridgename" ]; then
+        bridgename=br0
+        ethname=$iface
+    fi
+    echo "bridgename=$bridgename" > /tmp/bridge.info
+    echo "ethname=$ethname" >> /tmp/bridge.info
+    return
+fi
--- a/modules.d/40network/parse-ibft.sh
+++ b/modules.d/40network/parse-ibft.sh
@@ -0,0 +1,85 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+. /lib/dracut-lib.sh
+
+for p in $(getargs ip=); do
+    [ "ibft" = "$p" ] || continue
+
+    modprobe iscsi_ibft
+    num=0
+    (
+        for iface in /sys/firmware/ibft/ethernet*; do
+            unset ifname_mac
+            unset ifname_if
+            unset dhcp
+            unset ip
+            unset gw
+            unset mask
+            unset hostname
+            unset vlan
+            unset dns1
+            unset dns2
+            [ -e ${iface}/mac ] || continue
+            ifname_mac=$(read a < ${iface}/mac; echo $a)
+            [ -z "$ifname_mac" ] && continue
+            unset dev
+            for ifname in $(getargs ifname=); do
+                if strstr "$ifname" "$ifname_mac"; then
+                    dev=${ifname%%:*}
+                    break
+                fi
+            done
+
+            if [ -z "$dev" ]; then
+                ifname_if=ibft$num
+                num=$(( $num + 1 ))
+                echo "ifname=$ifname_if:$ifname_mac"
+                dev=$ifname_if
+            fi
+
+            if [ -e ${iface}/vlan ]; then
+                vlan=$(read a < ${iface}/vlan; echo $a)
+                if [ "$vlan" -ne "0" ]; then
+                    case "$vlan" in
+                        [0-9]*)
+                            [ -e /tmp/net.${dev}.${vlan}.has_ibft_config ] && continue
+                            echo "vlan=$dev.$vlan:$dev"
+                            dev="${dev}.${vlan}"
+                            ;;
+                        *)
+                            [ -e /tmp/net.${vlan}.has_ibft_config ] && continue
+                            echo "vlan=$vlan:$dev"
+                            dev="${vlan}"
+                            ;;
+                    esac
+                fi
+            fi
+
+            [ -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"
+            else
+                [ -e ${iface}/ip-addr ] && ip=$(read a < ${iface}/ip-addr; echo $a)
+                [ "$ip" = "0.0.0.0" ] && unset ip
+                [ -e ${iface}/gateway ] && gw=$(read a < ${iface}/gateway; echo $a)
+                [ -e ${iface}/subnet-mask ] && mask=$(read a < ${iface}/subnet-mask; echo $a)
+                [ -e ${iface}/hostname ] && hostname=$(read a < ${iface}/hostname; echo $a)
+                [ -n "$ip" ] && echo "ip=$ip::$gw:$mask:$hostname:$dev:none"
+
+                [ -e ${iface}/primary-dns ] && dns1=$(read a < ${iface}/primary-dns; echo $a) \
+                                                   && echo "nameserver=${dns1}"
+                [ -e ${iface}/secondary-dns ] && dns2=$(read a < ${iface}/secondary-dns; echo $a) \
+                                                   && echo "nameserver=${dns2}"
+            fi
+
+            echo $mac > /tmp/net.${dev}.has_ibft_config
+        done
+    ) >> /etc/cmdline
+    # reread cmdline
+    unset CMDLINE
+done
--- a/modules.d/40network/parse-ifname.sh
+++ b/modules.d/40network/parse-ifname.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Format:
+#	ifname=<interface>:<mac>
+#
+#
+# Examples:
+# ifname=eth0:4a:3f:4c:04:f8:d7
+#
+# Note when using ifname= to get persistent interface names, you must specify
+# an ifname= argument for each interface used in an ip= or fcoe= argument
+
+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 | tr '[:upper:]' '[:lower:]')
+            ;;
+        *)
+            die "Invalid arguments for ifname="
+            ;;
+    esac
+}
+
+# check if there are any ifname parameters
+if ! getarg ifname= >/dev/null ; then
+    return
+fi
+
+# Check ifname= lines
+for p in $(getargs ifname=); do
+    parse_ifname_opts $p
+done
--- a/modules.d/40network/parse-ip-opts.sh
+++ b/modules.d/40network/parse-ip-opts.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
 #
 # Format:
 #	ip=[dhcp|on|any]
@@ -12,23 +14,7 @@
 # routing,dns,dhcp-options,etc.
 #

-# Sadly there's no easy way to split ':' separated lines into variables
-ip_to_var() {
-    local v=${1}:
-    set --
-    while [ -n "$v" ]; do
-	set -- "$@" "${v%%:*}"
-	v=${v#*:}
-    done
-
-    unset ip srv gw mask hostname dev autoconf
-    case $# in
-    0)	autoconf="error" ;;
-    1)	autoconf=$1 ;;
-    2)	dev=$1; autoconf=$2 ;;
-    *)	ip=$1; srv=$2; gw=$3; mask=$4; hostname=$5; dev=$6; autoconf=$7 ;;
-    esac
-}
+. /lib/dracut-lib.sh

 # Check if ip= lines should be used
 if getarg ip= >/dev/null ; then
@@ -45,35 +31,36 @@ getarg ip= >/dev/null && getarg BOOTIF= >/dev/null && \
 # No more parsing stuff, BOOTIF says everything
 [ -n "$(getarg BOOTIF)" ] && return

-# Warn if defaulting to ip=dhcp
 if [ -n "$netroot" ] && [ -z "$(getarg ip=)" ] ; then
-    warn "No ip= argument(s) for netroot provided, defaulting to DHCP"
+    # No ip= argument(s) for netroot provided, defaulting to DHCP
    return;
 fi

 # Count ip= lines to decide whether we need bootdev= or not
-if [ -z "$NEEDBOOTDEV" ] ; then
-    [ "$CMDLINE" ] || read CMDLINE < /proc/cmdline
-    local count=0
-    for p in $CMDLINE; do
-	[ "${p%%=*}" = "ip" ] && count=$(( $count + 1 ))
-    done
-    [ $count -gt 1 ] && NEEDBOOTDEV=1
+if [ "$netroot" = "dhcp" ] || [ "$netroot" = "dhcp6" ]; then
+    if [ -z "$NEEDBOOTDEV" ] ; then
+	local count=0
+	for p in $(getargs ip=); do
+	    count=$(( $count + 1 ))
+	done
+	[ $count -gt 1 ] && NEEDBOOTDEV=1
+    fi
 fi

 # If needed, check if bootdev= contains anything usable
+BOOTDEV=$(getarg bootdev=)
+
 if [ -n "$NEEDBOOTDEV" ] ; then
-    BOOTDEV=$(getarg bootdev=) || die "Please supply bootdev argument for multiple ip= lines"
-    [ -z "$BOOTDEV" ] && die "Bootdev argument is empty"
+    [ -z "$BOOTDEV" ] && warn "Please supply bootdev argument for multiple ip= lines"
 fi

 # Check ip= lines
 # XXX Would be nice if we could errorcheck ip addresses here as well
-[ "$CMDLINE" ] || read CMDLINE < /proc/cmdline
-for p in $CMDLINE; do
-    [ -n "${p%ip=*}" ] && continue
+for p in $(getargs ip=); do
+    ip_to_var $p

-    ip_to_var ${p#ip=}
+    # skip ibft
+    [ "$autoconf" = "ibft" ] && continue

    # We need to have an ip= line for the specified bootdev
    [ -n "$NEEDBOOTDEV" ] && [ "$dev" = "$BOOTDEV" ] && BOOTDEVOK=1
@@ -83,40 +70,44 @@ for p in $CMDLINE; do
 	warn "Empty autoconf values default to dhcp"
 	autoconf="dhcp"
    fi
-
-    # Error checking for autoconf in combination with other values
-    case $autoconf in
-	error) die "Error parsing option '$p'";;
-	bootp|rarp|both) die "Sorry, ip=$autoconf is currenty unsupported";;
-	none|off) \
-	    [ -z "$ip" ] && \
-		die "For argument '$p'\nValue '$autoconf' without static configuration does not make sense"
-	    [ -z "$mask" ] && \
-		die "Sorry, automatic calculation of netmask is not yet supported"
-	    ;;
-	dhcp|on|any) \
-	    [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
-	        die "Sorry, '$p' does not make sense for multiple interface configurations"
-	    [ -n "$ip" ] && \
-		die "For argument '$p'\nSorry, setting client-ip does not make sense for '$autoconf'"
-	    ;;
-	*) die "For argument '$p'\nSorry, unknown value '$autoconf'";;
-    esac
+    OLDIFS="$IFS"
+    IFS=,
+    set -- $autoconf
+    IFS="$OLDIFS"
+    for autoconf in "$@"; do
+        # Error checking for autoconf in combination with other values
+        case $autoconf in
+	    error) die "Error parsing option 'ip=$p'";;
+	    bootp|rarp|both) die "Sorry, ip=$autoconf is currenty unsupported";;
+	    none|off) \
+	        [ -z "$ip" ] && \
+		die "For argument 'ip=$p'\nValue '$autoconf' without static configuration does not make sense"
+	        [ -z "$mask" ] && \
+		    die "Sorry, automatic calculation of netmask is not yet supported"
+	        ;;
+	    auto6);;
+	    dhcp|dhcp6|on|any) \
+	        [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
+	        die "Sorry, 'ip=$p' does not make sense for multiple interface configurations"
+	        [ -n "$ip" ] && \
+		    die "For argument 'ip=$p'\nSorry, setting client-ip does not make sense for '$autoconf'"
+	        ;;
+	    *) die "For argument 'ip=$p'\nSorry, unknown value '$autoconf'";;
+        esac
+        _part=${_part%,*}
+    done

    if [ -n "$dev" ] ; then
        # We don't like duplicate device configs
 	if [ -n "$IFACES" ] ; then
 	    for i in $IFACES ; do
-		[ "$dev" = "$i" ] && die "For argument '$p'\nDuplication configurations for '$dev'"
+		[ "$dev" = "$i" ] && warn "For argument 'ip=$p'\nDuplication configurations for '$dev'"
 	    done
 	fi
 	# IFACES list for later use
 	IFACES="$IFACES $dev"
    fi

-    # Small optimization for udev rules
-    [ -z "$NEEDBOOTDEV" ] && [ -n "$dev" ] && BOOTDEV=$dev
-
    # Do we need to check for specific options?
    if [ -n "$NEEDDHCP" ] || [ -n "$DHCPORSERVER" ] ; then
 	# Correct device? (Empty is ok as well)
@@ -143,4 +134,4 @@ fi
 [ -n "$IFACES" ]  && echo $IFACES > /tmp/net.ifaces

 # We need a ip= line for the configured bootdev= 
-[ -n "$NEEDBOOTDEV" ] && [ -z "$BOOTDEVOK" ] && die "Bootdev Argument '$BOOTDEV' not found"
+[ -n "$NEEDBOOTDEV" ] && [ -z "$BOOTDEVOK" ] && die "Bootdev Argument '$BOOTDEV' not found"
--- a/modules.d/40network/parse-vlan.sh
+++ b/modules.d/40network/parse-vlan.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# Format:
+#	vlan=<vlanname>:<phydevice>
+#
+
+parsevlan() {
+    local v=${1}:
+    set --
+    while [ -n "$v" ]; do
+        set -- "$@" "${v%%:*}"
+        v=${v#*:}
+    done
+
+    case $# in
+    2)  vlanname=$1; phydevice=$2 ; return 0 ;;
+    *)  die "vlan= requires two parameters" ;;
+    esac
+    return 1
+}
+
+unset vlanname phydevice
+
+for vlan in $(getargs vlan); do
+    [ "$vlan" = "vlan" ] && continue
+    unset vlanname phydevice
+    if parsevlan "$(getarg vlan=)"; then
+        echo "$phydevice" > /tmp/vlan.${phydevice}.phy
+        echo "$phydevice" >> /tmp/net.ifaces
+        echo "$vlanname" > /tmp/vlan.${vlanname}.${phydevice}
+    fi
+done
--- a/modules.d/40network/write-ifcfg.sh
+++ b/modules.d/40network/write-ifcfg.sh
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Don't write anything if we don't know our bootdev
-[ -f /tmp/net.ifaces ] || return 1
-
-read IFACES < /tmp/net.ifaces
-
-for netif in $IFACES ; do
-    cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
-    echo "# Generated by dracut initrd" > /tmp/net.$netif.ifcfg
-    echo "DEVICE=$netif" >> /tmp/net.$netif.ifcfg
-    echo "HWADDR=$(cat /sys/class/net/$netif/address)" >> /tmp/net.$netif.ifcfg
-    echo "TYPE=Ethernet" >> /tmp/net.$netif.ifcfg
-    echo "ONBOOT=yes" >> /tmp/net.$netif.ifcfg
-    if [ -f /tmp/net.$netif.lease ]; then
-	echo "BOOTPROTO=dhcp" >> /tmp/net.$netif.ifcfg
-    else
-	echo "BOOTPROTO=none" >> /tmp/net.$netif.ifcfg
-        # If we've booted with static ip= lines, the override file is there
-	. /tmp/net.$netif.override 
-	echo "IPADDR=$ip" >> /tmp/net.$netif.ifcfg
-	echo "NETMASK=$mask" >> /tmp/net.$netif.ifcfg
-	[ -n "$gw" ] && echo "GATEWAY=$gw" >> /tmp/net.$netif.ifcfg
-    fi
-done
--- a/modules.d/45ifcfg/check
+++ b/modules.d/45ifcfg/check
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# ifcfg is required by network
+#[[ $1 = -d ]] && echo network
+
+exit 255
--- a/modules.d/45ifcfg/install
+++ b/modules.d/45ifcfg/install
@@ -0,0 +1,2 @@
+#!/bin/bash
+inst_hook pre-pivot 85 "$moddir/write-ifcfg.sh"
--- a/modules.d/45ifcfg/write-ifcfg.sh
+++ b/modules.d/45ifcfg/write-ifcfg.sh
@@ -0,0 +1,168 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+# NFS root might have reached here before /tmp/net.ifaces was written
+udevadm settle --timeout=30
+# Don't write anything if we don't know our bootdev
+[ -f /tmp/net.ifaces ] || return 1
+
+read IFACES < /tmp/net.ifaces
+
+if [ -e /tmp/bond.info ]; then
+    . /tmp/bond.info
+fi
+
+if [ -e /tmp/bridge.info ]; then
+    . /tmp/bridge.info
+fi
+
+mkdir -p /tmp/ifcfg/
+
+for netif in $IFACES ; do
+    unset bridge
+    unset bond
+    unset vlan
+    unset phydevice
+    unset vlanname
+    unset uuid
+    unset ip
+    unset gw
+    unset mtu
+    unset mask
+    unset macaddr
+
+    # bridge?
+    if [ "$netif" = "$bridgename" ]; then
+        bridge=yes
+    elif [ "$netif" = "$bondname" ]; then
+    # $netif can't be bridge and bond at the same time
+        bond=yes
+    fi
+
+    for i in /tmp/vlan.${netif}.*; do
+        [ ! -e "$i" ] && continue
+        . "$i"
+        vlan=yes
+        break
+    done
+
+    cat /sys/class/net/$netif/address > /tmp/net.${netif}.hwaddr
+    {
+        echo "# Generated by dracut initrd"
+        echo "DEVICE=$netif"
+        echo "ONBOOT=yes"
+        echo "NETBOOT=yes"
+        if [ -f /tmp/dhclient.${netif}.dhcpopts ]; then
+            strstr "$ip" '*:*:*' && echo "DHCPV6C=yes"
+            echo "BOOTPROTO=dhcp"
+	    [ -f /tmp/dhclient.${netif}.lease ] &&    cp /tmp/dhclient.${netif}.lease    /tmp/net.${netif}.lease
+	    [ -f /tmp/dhclient.${netif}.dhcpopts ] && cp /tmp/dhclient.${netif}.dhcpopts /tmp/net.${netif}.dhcpopts
+        else
+            echo "BOOTPROTO=none"
+            # If we've booted with static ip= lines, the override file is there
+            [ -e /tmp/net.${netif}.override ] && . /tmp/net.${netif}.override
+            echo "IPADDR=$ip"
+            echo "NETMASK=$mask"
+            [ -n "$gw" ] && echo "GATEWAY=$gw"
+        fi
+    } > /tmp/ifcfg/ifcfg-$netif
+
+    # bridge needs different things written to ifcfg
+    if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ]; then
+        # standard interface
+        {
+            echo "HWADDR=$(cat /sys/class/net/$netif/address)"
+            echo "TYPE=Ethernet"
+            echo "NAME=\"Boot Disk\""
+        } >> /tmp/ifcfg/ifcfg-$netif
+    fi
+
+    if [ -n "$vlan" ] ; then
+        {
+            echo "TYPE=Vlan"
+            echo "NAME=\"$netif\""
+            echo "VLAN=yes"
+            echo "PHYSDEV=\"$phydevice\""
+        } >> /tmp/ifcfg/ifcfg-$netif
+    fi
+
+    if [ -n "$bond" ] ; then
+        # bond interface
+        {
+            # This variable is an indicator of a bond interface for initscripts
+            echo "BONDING_OPTS=\"$bondoptions\""
+            echo "NAME=\"Boot Disk\""
+        } >> /tmp/ifcfg/ifcfg-$netif
+
+        for slave in $bondslaves ; do
+            # write separate ifcfg file for the raw eth interface
+            {
+                echo "# Generated by dracut initrd"
+                echo "DEVICE=$slave"
+                echo "TYPE=Ethernet"
+                echo "ONBOOT=yes"
+                echo "NETBOOT=yes"
+                echo "HWADDR=$(cat /sys/class/net/$slave/address)"
+                echo "SLAVE=yes"
+                echo "MASTER=$netif"
+                echo "NAME=$slave"
+            } >> /tmp/ifcfg/ifcfg-$slave
+        done
+    fi
+
+    if [ -n "$bridge" ] ; then
+        # bridge
+        {
+            echo "TYPE=Bridge"
+            echo "NAME=\"Boot Disk\""
+        } >> /tmp/ifcfg/ifcfg-$netif
+        if [ "$ethname" = "$bondname" ] ; then
+            {
+                # This variable is an indicator of a bond interface for initscripts
+                echo "# Generated by dracut initrd"
+                echo "DEVICE=$bondname"
+                echo "ONBOOT=yes"
+                echo "NETBOOT=yes"
+                echo "BONDING_OPTS=\"$bondoptions\""
+                echo "BRIDGE=$netif"
+                echo "NAME=\"$bondname\""
+            } >> /tmp/ifcfg/ifcfg-$bondname
+            for slave in $bondslaves ; do
+                # write separate ifcfg file for the raw eth interface
+                # yes, duplicated code at this moment
+                {
+                    echo "# Generated by dracut initrd"
+                    echo "DEVICE=$slave"
+                    echo "TYPE=Ethernet"
+                    echo "ONBOOT=yes"
+                    echo "NETBOOT=yes"
+                    echo "HWADDR=$(cat /sys/class/net/$slave/address)"
+                    echo "SLAVE=yes"
+                    echo "MASTER=$bondname"
+                    echo "NAME=$slave"
+                } >> /tmp/ifcfg/ifcfg-$slave
+            done
+        else
+            # write separate ifcfg file for the raw eth interface
+            {
+                echo "# Generated by dracut initrd"
+                echo "DEVICE=$ethname"
+                echo "TYPE=Ethernet"
+                echo "ONBOOT=yes"
+                echo "NETBOOT=yes"
+                echo "HWADDR=$(cat /sys/class/net/$ethname/address)"
+                echo "BRIDGE=$netif"
+                echo "NAME=$ethname"
+            } >> /tmp/ifcfg/ifcfg-$ethname
+        fi
+    fi
+done
+
+# Pass network opts
+mkdir /dev/.initramfs/
+cp /tmp/net.* /dev/.initramfs/ >/dev/null 2>&1
+mkdir -p /dev/.initramfs/state/etc/sysconfig/network-scripts/
+cp /tmp/net.$netif.resolv.conf /dev/.initramfs/state/etc/ >/dev/null 2>&1
+echo "files /etc/sysconfig/network-scripts" > /dev/.initramfs/rwtab
+cp -a /tmp/ifcfg/* /dev/.initramfs/state/etc/sysconfig/network-scripts/ >/dev/null 2>&1
--- a/modules.d/50plymouth-pre0.7/63-luks.rules
+++ b/modules.d/50plymouth-pre0.7/63-luks.rules
@@ -1,11 +0,0 @@
-# hacky rules to try to try unlocking dm-crypt devs
-#
-# Copyright 2008, Red Hat, Inc.
-# Jeremy Katz <katzj@redhat.com>
-
-
-SUBSYSTEM!="block", GOTO="luks_end"
-ACTION!="add|change", GOTO="luks_end"
-ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="cryptroot-ask $env{DEVNAME} luks-$env{ID_FS_UUID}"
-
-LABEL="luks_end"
--- a/modules.d/50plymouth-pre0.7/check
+++ b/modules.d/50plymouth-pre0.7/check
@@ -1,3 +0,0 @@
-#!/bin/bash
-[[ $1 = -d ]] && echo crypt
-[[ -x /sbin/plymouthd && -x /bin/plymouth && ! /usr/sbin/plymouth-set-default-theme ]]
--- a/modules.d/50plymouth-pre0.7/cryptroot-ask.sh
+++ b/modules.d/50plymouth-pre0.7/cryptroot-ask.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -b /dev/mapper/$2 ] || exec /bin/plymouth ask-for-password --command="/sbin/cryptsetup luksOpen -T1 $1 $2"
-
--- a/modules.d/50plymouth-pre0.7/install
+++ b/modules.d/50plymouth-pre0.7/install
@@ -1,8 +0,0 @@
-#!/bin/bash
-. "$moddir"/plymouth-populate-initrd
-inst_hook pre-udev 10 "$moddir"/plymouth-start.sh
-inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
-inst_rules "$moddir/63-luks.rules"
-inst "$moddir"/cryptroot-ask.sh /lib/udev/cryptroot-ask
-inst cryptsetup
-
--- a/modules.d/50plymouth-pre0.7/plymouth-newroot.sh
+++ b/modules.d/50plymouth-pre0.7/plymouth-newroot.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -x /bin/plymouth ] && /bin/plymouth --newroot=$NEWROOT
-
--- a/modules.d/50plymouth-pre0.7/plymouth-populate-initrd
+++ b/modules.d/50plymouth-pre0.7/plymouth-populate-initrd
@@ -1,25 +0,0 @@
-#!/bin/bash
-if ldd /sbin/plymouthd |grep -q lib64; then
-    LIBDIR="/usr/lib64"
-else
-    LIBDIR="/usr/lib"
-fi
-PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
-PLYMOUTH_PLUGIN_NAME=$(plymouth-set-default-plugin)
-
-inst /sbin/plymouthd /bin/plymouthd
-dracut_install /bin/plymouth "${LIBDIR}/plymouth/text.so" \
-    "${LIBDIR}/plymouth/details.so" "${PLYMOUTH_LOGO_FILE}" \
-    /etc/system-release "${LIBDIR}/plymouth/${PLYMOUTH_PLUGIN_NAME:=text}.so"
-mkdir -p "${initdir}/usr/share/plymouth"
-
-[[ -f ${LIBDIR}/plymouth/default.so ]] && inst ${LIBDIR}/plymouth/default.so
-
-if [[ -d /usr/share/plymouth/${PLYMOUTH_PLUGIN_NAME} ]]; then
-    for x in "/usr/share/plymouth/${PLYMOUTH_PLUGIN_NAME}"/* ; do
-        [[ -f "$x" ]] || break
-        inst $x
-    done
-fi
-
-# vim:ts=8:sw=4:sts=4:et
--- a/modules.d/50plymouth-pre0.7/plymouth-start.sh
+++ b/modules.d/50plymouth-pre0.7/plymouth-start.sh
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-[ -c /dev/null ] || mknod /dev/null c 1 3
-mknod /dev/zero c 1 5
-mknod /dev/systty c 4 0
-mknod /dev/tty c 5 0
-[ -c /dev/console ] || mknod /dev/console c 5 1
-[ -c /dev/ptmx ] || mknod /dev/ptmx c 5 2
-mknod /dev/fb c 29 0
-mknod /dev/tty0 c 4 0
-mknod /dev/tty1 c 4 1
-mknod /dev/tty2 c 4 2
-mknod /dev/tty3 c 4 3
-mknod /dev/tty4 c 4 4
-mknod /dev/tty5 c 4 5
-mknod /dev/tty6 c 4 6
-mknod /dev/tty7 c 4 7
-mknod /dev/tty8 c 4 8
-mknod /dev/tty9 c 4 9
-mknod /dev/tty10 c 4 10
-mknod /dev/tty11 c 4 11
-mknod /dev/tty12 c 4 12
-mknod /dev/ttyS0 c 4 64
-mknod /dev/ttyS1 c 4 65
-mknod /dev/ttyS2 c 4 66
-mknod /dev/ttyS3 c 4 67
-/lib/udev/console_init tty0
-
-[ -x /bin/plymouthd ] && /bin/plymouthd 
-[ -x /bin/plymouth ] && /bin/plymouth --show-splash
-
--- a/modules.d/50plymouth/63-luks.rules
+++ b/modules.d/50plymouth/63-luks.rules
@@ -1,12 +0,0 @@
-# hacky rules to try to try unlocking dm-crypt devs
-#
-# Copyright 2008, Red Hat, Inc.
-# Jeremy Katz <katzj@redhat.com>
-
-
-SUBSYSTEM!="block", GOTO="luks_end"
-ACTION!="add|change", GOTO="luks_end"
-
-ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/sbin/cryptroot-ask $env{DEVNAME} luks-$env{ID_FS_UUID}"
-
-LABEL="luks_end"
--- a/modules.d/50plymouth/check
+++ b/modules.d/50plymouth/check
@@ -1,3 +1,3 @@
 #!/bin/bash
-[[ $1 = -d ]] && echo crypt
+[[ $1 = -d ]] && which cryptsetup &>/dev/null && echo crypt
 [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
--- a/modules.d/50plymouth/cryptroot-ask.sh
+++ b/modules.d/50plymouth/cryptroot-ask.sh
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# do not ask, if we already have root
-[ -f /sysroot/proc ] && exit 0
-# check if destination already exists
-[ -b /dev/mapper/$2 ] && exit 0
-
-# flock against other interactive activities
-{ flock -s 9; 
-/bin/plymouth ask-for-password --prompt "$1 is password protected" --command="/sbin/cryptsetup luksOpen -T1 $1 $2"
-} 9>/.console.lock
-
-exit 0
-
--- a/modules.d/50plymouth/install
+++ b/modules.d/50plymouth/install
@@ -1,10 +1,15 @@
 #!/bin/bash
-. "$moddir"/plymouth-populate-initrd
+
+if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
+   || ! grep -q PLYMOUTH_POPULATE_SOURCE_FUNCTIONS /usr/libexec/plymouth/plymouth-populate-initrd \
+   || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
+    . "$moddir"/plymouth-populate-initrd
+else
+    PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
+        /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir
+fi
+
 inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
 inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
-inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
-inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
-# Include KMS capable drm drivers
-for modname in $(find "/lib/modules/$kernel/kernel/drivers/gpu/drm" -name '*.ko'); do
-    nm -uPA $modname | grep -q drm_crtc_init && instmods $modname
-done
+inst_hook emergency 00 "$moddir"/plymouth-emergency.sh
+inst readlink
--- a/modules.d/50plymouth/installkernel
+++ b/modules.d/50plymouth/installkernel
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Include KMS capable drm drivers
+for modname in $(find "$srcmods/kernel/drivers/gpu/drm" -name '*.ko' 2>/dev/null); do
+    grep -q drm_crtc_init  $modname && instmods $modname
+done
+
+hostonly='' instmods hyperv_fb
--- a/modules.d/50plymouth/plymouth-populate-initrd
+++ b/modules.d/50plymouth/plymouth-populate-initrd
@@ -1,5 +1,5 @@
 #!/bin/bash
-if ldd /sbin/plymouthd |grep -q lib64; then
+if ldd /sbin/plymouthd 2>/dev/null | grep -q lib64; then
    LIBDIR="/usr/lib64"
 else
    LIBDIR="/usr/lib"
@@ -8,31 +8,47 @@ PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
 PLYMOUTH_THEME=$(plymouth-set-default-theme)

 inst /sbin/plymouthd /bin/plymouthd
-dracut_install /bin/plymouth "${LIBDIR}/plymouth/text.so" \
-    "${LIBDIR}/plymouth/details.so" \
-    "/usr/share/plymouth/themes/details/details.plymouth" \
-    "/usr/share/plymouth/themes/text/text.plymouth" \
+dracut_install /bin/plymouth \
    "${PLYMOUTH_LOGO_FILE}" \
    /etc/system-release 

-if [[ -f "${LIBDIR}/plymouth/${PLYMOUTH_THEME:=text}.so" ]]; then
-    dracut_install "${LIBDIR}/plymouth/${PLYMOUTH_THEME:=text}.so" 
-fi
-
 mkdir -p "${initdir}/usr/share/plymouth"

-if [[ -d /usr/share/plymouth/themes/${PLYMOUTH_THEME} ]]; then
-    for x in "/usr/share/plymouth/themes/${PLYMOUTH_THEME}"/* ; do
-        [[ -f "$x" ]] || break
-        inst $x
-    done
-fi
+if [[ $hostonly ]]; then 
+    dracut_install "${LIBDIR}/plymouth/text.so" \
+	"${LIBDIR}/plymouth/details.so" \
+	"/usr/share/plymouth/themes/details/details.plymouth" \
+	"/usr/share/plymouth/themes/text/text.plymouth" \

-if [ -L /usr/share/plymouth/themes/default.plymouth ]; then
-    inst /usr/share/plymouth/themes/default.plymouth
-    # Install plugin for this theme
-    PLYMOUTH_PLUGIN=$(grep "^ModuleName=" /usr/share/plymouth/themes/default.plymouth |awk -F= {'print $2'})
-    inst ${LIBDIR}/plymouth/${PLYMOUTH_PLUGIN}.so
+    if [[ -d /usr/share/plymouth/themes/${PLYMOUTH_THEME} ]]; then
+	for x in "/usr/share/plymouth/themes/${PLYMOUTH_THEME}"/* ; do
+            [[ -f "$x" ]] || break
+            inst $x
+	done
+    fi
+
+    if [ -L /usr/share/plymouth/themes/default.plymouth ]; then
+	inst /usr/share/plymouth/themes/default.plymouth
+        # Install plugin for this theme
+	PLYMOUTH_PLUGIN=$(grep "^ModuleName=" /usr/share/plymouth/themes/default.plymouth | while read a b c; do echo $b; done;)
+	inst ${LIBDIR}/plymouth/${PLYMOUTH_PLUGIN}.so
+    fi
+else
+    for x in /usr/share/plymouth/themes/{text,details}/* ; do
+        [[ -f "$x" ]] || continue
+	THEME_DIR=$(dirname "$x")
+	mkdir -p "${initdir}/$THEME_DIR"
+        dracut_install "$x"
+    done
+    for x in ${LIBDIR}/plymouth/{text,details}.so ; do
+        [[ -f "$x" ]] || continue
+        [[ "$x" != "${x%%/label.so}" ]] && continue
+        dracut_install "$x"
+    done
+    (
+	cd ${initdir}/usr/share/plymouth/themes;
+	ln -s text/text.plymouth default.plymouth 2>&1;       
+    )
 fi

 # vim:ts=8:sw=4:sts=4:et
--- a/modules.d/50plymouth/plymouth-pretrigger.sh
+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
@@ -1,21 +1,28 @@
 #!/bin/sh

-# first trigger graphics subsystem
-udevadm trigger --attr-match=class=0x030000
-# first trigger graphics and tty subsystem
-udevadm trigger --subsystem-match=graphics --subsystem-match=tty >/dev/null 2>&1
-# add nomatch for full trigger
-udevtriggeropts="$udevtriggeropts --subsystem-nomatch=graphics --subsystem-nomatch=tty"
+if ! getarg rd_NO_PLYMOUTH; then
+    [ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3
+    # first trigger graphics subsystem
+    udevadm trigger --attr-match=class=0x030000 >/dev/null 2>&1
+    # first trigger graphics and tty subsystem
+    udevadm trigger --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty --subsystem-match=acpi >/dev/null 2>&1

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

-[ -x /bin/plymouthd ] && /bin/plymouthd
+    info "Starting plymouth daemon"
+    consoledev=$(getarg console= | sed -e 's/,.*//')
+    consoledev=${consoledev:-tty0}
+    [ -x /lib/udev/console_init ] && /lib/udev/console_init "/dev/$consoledev"
+ 
+    [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session
+    /bin/plymouth --show-splash 2>&1 | vinfo
+fi

-/lib/udev/console_init tty0
-/bin/plymouth --show-splash

+# vim:ts=8:sw=4:sts=4:et
--- a/modules.d/60xen/check
+++ b/modules.d/60xen/check
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# No Xen-detect? Boo!!
+XENDETECT=$(which xen-detect 2>/dev/null)
+[ -z "$XENDETECT" ] && [ -d "/usr/lib/xen-default" ] && XENDETECT="/usr/lib/xen-default/bin/xen-detect"
+[ -z "$XENDETECT" ] && exit 1
+
+. $dracutfunctions
+[[ $debug ]] && set -x
+
+# Yes, we are under Xen PV env.
+$XENDETECT | egrep -q -v 'PV' || exit 0
+
+exit 1
--- a/modules.d/60xen/install
+++ b/modules.d/60xen/install
@@ -0,0 +1,6 @@
+#!/bin/bash
+XENDETECT=$(which xen-detect)
+[ -z "$XENDETECT" ] && [ -d "/usr/lib/xen-default" ] && XENDETECT="/usr/lib/xen-default/bin/xen-detect"
+inst $XENDETECT /sbin/xen-detect
+inst_hook pre-udev 40 "$moddir/xen-pre-udev.sh"
+
--- a/modules.d/60xen/installkernel
+++ b/modules.d/60xen/installkernel
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for i in \
+    xenbus_probe_frontend xen-pcifront \
+    xen-fbfront xen-kbdfront xen-blkfront xen-netfront \
+    ; do
+    modinfo -k $kernel $i >/dev/null 2>&1 && instmods $i
+done
+
--- a/modules.d/60xen/xen-pre-udev.sh
+++ b/modules.d/60xen/xen-pre-udev.sh
@@ -0,0 +1,10 @@
+xen-detect
+RC=$?
+if [ "$RC" = "1" ] ; then
+        modprobe xenbus_probe_frontend
+        modprobe xen-kbdfront
+        modprobe xen-fbfront
+        modprobe xen-blkfront
+        modprobe xen-netfront
+        modprobe xen-pcifront
+fi
--- a/modules.d/90btrfs/40-btrfs.rules
+++ b/modules.d/90btrfs/40-btrfs.rules
@@ -0,0 +1,8 @@
+SUBSYSTEM!="block", GOTO="btrfs_end"
+ACTION!="add|change", GOTO="btrfs_end"
+
+ENV{ID_FS_TYPE}=="btrfs", RUN+="/sbin/modprobe btrfs"
+ENV{ID_FS_TYPE}=="btrfs", RUN+="/sbin/btrfsctl -A $env{DEVNAME}"
+
+LABEL="btrfs_end"
+
--- 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;`