Version 006

credits go to V. Lowther

.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)>

AUTHORS

@@ -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>

Makefile

@@ -1,38 +1,57 @@
-VERSION=001
+VERSION=006
 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)
 
 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{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 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 */*~
+	rm -f */*/*~
 	rm -f modules.d/99base/switch_root
 	rm -f test-*.img
 	rm -f dracut-*.rpm dracut-*.tar.bz2
@@ -58,7 +77,7 @@ gitrpm: dracut-$(VERSION)-$(GITVERSION).tar.bz2
 	cat dracut.spec >> dracut.spec.git
 	mv dracut.spec dracut.spec.bak
 	mv dracut.spec.git dracut.spec
-	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" --define "gittag $(GITVERSION)" -ba dracut.spec
+	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" --define "gittag $(GITVERSION)" -ba dracut.spec || :
 	mv dracut.spec.bak dracut.spec
 	rm -fr BUILD BUILDROOT
 
@@ -77,9 +96,10 @@ testimages: all
 	@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

NEWS

@@ -1,3 +1,109 @@
+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
+- boot from LVM mirrors and snapshots
+- iscsi: add support for multiple netroot=iscsi:
+- Support old version of module-init-tools
+- got rid of rdnetdebug
+- fixed "ip=auto6"
+- dracut.conf: use "+=" as default for config variables
+- bugfixes
+
+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

README.kernel

@@ -1,6 +1,3 @@
-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.
+"dracut --kernel-only" is to build an initrd with only kernel modules and firmware files.
+"dracut --kernel-only" only executes "installkernel" in the modules subdirectories.
 

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

debian/compat

@@ -0,0 +1 @@
+5

debian/control

@@ -0,0 +1,41 @@
+Source: dracut
+Section: utils
+Priority: optional
+Maintainer: Philippe Seewer <philippe.seewer@bfh.ch>
+Build-Depends: debhelper (>= 5.0), cdbs
+Standards-Version: 3.8.4
+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
+Suggests: dracut-network
+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.
+

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'.

debian/dracut-network.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

debian/dracut-network.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

debian/dracut.dirs

@@ -0,0 +1,25 @@
+usr/share/dracut
+usr/share/dracut/modules.d/00dash
+usr/share/dracut/modules.d/01fips
+usr/share/dracut/modules.d/60xen
+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/95uswsusp
+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
+/etc/dracut.conf.d

debian/dracut.docs

@@ -0,0 +1,4 @@
+HACKING
+README.generic
+README.kernel
+README.modules

debian/dracut.install

@@ -0,0 +1,28 @@
+dracut			usr/sbin
+dracut-catimages	usr/sbin
+dracut-update-initramfs	usr/sbin
+dracut-gencmdline	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/60xen			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/95uswsusp		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

debian/dracut.manpages

@@ -0,0 +1,4 @@
+dracut.8
+dracut.conf.5
+dracut-catimages.8
+dracut-gencmdline.8

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#

debian/dracut.triggers

@@ -0,0 +1 @@
+interest update-initramfs

debian/rules

@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk

dracut

@@ -34,15 +34,24 @@ Creates initial ramdisk images for preloading modules
   -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.
+  --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
+  --strip               Strip binaries in the initramfs
+  --nostrip             Do not strip binaries in the initramfs (default)
+  --mdadmconf           Include local /etc/mdadm.conf
+  --nomdadmconf         Do not include local /etc/mdadm.conf
+  --lvmconf             Include local /etc/lvm/lvm.conf
+  --nolvmconf             Do not include local /etc/lvm/lvm.conf
   -h, --help            This message
   --debug               Output debug information of the build process
   -v, --verbose         Verbose output during the build process
@@ -69,16 +78,23 @@ while (($# > 0)); do
 	-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;;
+	--filesystems) filesystems_l="$2"; shift;;
 	-k|--kmoddir) drivers_dir_l="$2"; shift;;
 	--fwdir) fw_dir_l="$2"; shift;;
-	--kernel-only) kernel_only="yes"; nokernel="no";;
+	--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_l="yes" ;;
 	-i|--include) include_src="$2"; include_target="$3"; shift 2;;
@@ -89,47 +105,72 @@ while (($# > 0)); do
     shift
 done
 
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+export PATH
 
 [[ $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"
+
 # these options override the stuff in the config file
 [[ $dracutmodules_l ]] && dracutmodules=$dracutmodules_l
 [[ $omit_dracutmodules_l ]] && omit_dracutmodules=$omit_dracutmodules_l
-[[ $add_dracutmodules_l ]] && add_dracutmodules="$add_dracutmodules $add_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
+[[ $do_strip ]] || do_strip=no
 # eliminate IFS hackery when messing with fw_dir
 fw_dir=${fw_dir//:/ }
 
 [[ $hostonly = yes ]] && hostonly="-h"
+[[ $hostonly != "-h" ]] && unset hostonly
 
-[[ $allowlocal && -f "$(dirname $0)/dracut-functions" ]] && dsrc="$(dirname $0)" || dsrc=$dracutbasedir
-
-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
 
 # This is kinda legacy -- eventually it should go away.
@@ -138,10 +179,17 @@ case $dracutmodules in
 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"
+[[ $drivers_dir ]] && {
+    if vercmp $(modprobe --version | cut -d' ' -f3) lt 3.7; then
+        derror 'To use --kmoddir option module-init-tools >= 3.7 is required.'
+        exit 1
+    fi
+    srcmods="$drivers_dir"
+}
 export srcmods
 
 if [[ -f $outfile && ! $force ]]; then
@@ -149,21 +197,41 @@ if [[ -f $outfile && ! $force ]]; then
     exit 1
 fi
 
+outdir=$(dirname "$outfile")
+if ! [[ -d "$outdir" ]]; then
+    echo "Can't write $outfile: Directory $outdir does not exist."
+    exit 1
+fi
+
+if ! [[ -w "$outdir" ]]; then
+    echo "No permission to write $outdir."
+    exit 1
+fi
+
+if [[ -f "$outfile" ]] &&  ! [[ -w "$outfile" ]]; then
+    echo "No permission to write $outfile."
+    exit 1
+fi
+
 hookdirs="cmdline pre-udev pre-trigger netroot pre-mount pre-pivot mount emergency"
 
+[[ -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 \
-    fw_dir drivers_dir debug beverbose no_kernel kernel_only
+export initdir hookdirs dracutbasedir dracutmodules drivers \
+    fw_dir drivers_dir debug beverbose no_kernel kernel_only \
+    add_drivers mdadmconf lvmconf filesystems
 
 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/run; do 
-	mkdir -p "$initdir/$d"; 
+	inst_dir "/$d"; 
     done
 fi
 
@@ -171,8 +239,8 @@ fi
 # 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
+# source our modules.
+for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
     mod=${moddir##*/}; mod=${mod#[0-9][0-9]}
     if strstr "$mods_to_load" " $mod "; then
 	if [[ $kernel_only = yes ]]; then
@@ -187,21 +255,17 @@ for moddir in "$dsrc/modules.d"/[0-9][0-9]*; do
     fi
 done
 unset moddir
-echo $mods_to_load
 
 ## final stuff that has to happen
 
 # generate module dependencies for the initrd
 if [[ -d $initdir/lib/modules/$kernel ]]; then
     if ! depmod -a -b "$initdir" $kernel; then
-        echo "\"depmod -a $kernel\" failed."
+        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"/*
@@ -212,11 +276,15 @@ for item in $install_items; do
 done
 unset item
 
+# 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()"
+
 [[ $beverbose = yes ]] && (du -c "$initdir" | sort -n)
 
 # strip binaries 
 if [[ $do_strip = yes ]] ; then
-    for p in strip objdump sed grep find; do 
+    for p in strip grep find; do 
 	if ! which $p >/dev/null 2>&1; then
 	    derror "Could not find '$p'. You should run $0 with '--nostrip'."
 	    do_strip=no
@@ -225,11 +293,9 @@ if [[ $do_strip = yes ]] ; then
 fi
 
 if [[ $do_strip = yes ]] ; then
-    for f in $(find "$initdir" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | 
-	grep -v ' shared object,' | 
-	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped/\1/p'); do
+    for f in $(find "$initdir" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 -or -path '/lib/modules/*.ko' \) ); do
 	dinfo "Stripping $f"
-	strip -g "$f" || :
+	strip -g "$f" 2>/dev/null|| :
         #
         # FIXME: only strip -g for now
         #
@@ -243,7 +309,12 @@ if [[ $do_strip = yes ]] ; then
     done
 fi
 
-( cd "$initdir"; find . |cpio -R 0:0 -H newc -o |gzip -9 > "$outfile"; )
+type pigz &>/dev/null && gzip=pigz || gzip=gzip
+( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet |$gzip -9 > "$outfile"; ) 
+if [ $? -ne 0 ]; then
+    derror "dracut: creation of $outfile failed"
+    exit 1
+fi 
 
 [[ $beverbose = yes ]] && ls -lh "$outfile"
 

dracut-catimages

@@ -102,7 +102,8 @@ fi
 if [[ ! $no_overlay ]]; then
     ofile="$imagedir/90-overlay.img"
     dinfo "Creating image $ofile from directory $overlay"
-    ( cd "$overlay"; find . |cpio --quiet -H newc -o  |gzip -9 > "$ofile"; )
+    type pigz &>/dev/null && gzip=pigz || gzip=gzip
+    ( cd "$overlay"; find . |cpio --quiet -H newc -o |$gzip -9 > "$ofile"; )
 fi
 
 if [[ ! $no_imagedir ]]; then

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)

dracut-functions

@@ -24,9 +24,36 @@ IF_dynamic=""
 # Generic substring function.  If $2 is in $1, return 0.
 strstr() { [[ $1 =~ $2 ]]; }
 
+# Version comparision function.  Assumes Linux style version scheme.
+# $1 = version a
+# $2 = comparision op (gt, ge, eq, le, lt, ne)
+# $3 = version b
+vercmp() {
+    local n1=(${1//./ }) op=$2 n2=(${3//./ }) i res
+
+    for ((i=0; ; i++))
+    do
+        if [[ ! ${n1[i]}${n2[i]} ]]; then res=0
+        elif ((${n1[i]:-0} > ${n2[i]:-0})); then res=1
+        elif ((${n1[i]:-0} < ${n2[i]:-0})); then res=2
+        else continue
+        fi
+        break
+    done
+
+    case $op in
+        gt) ((res == 1));;
+        ge) ((res != 2));;
+        eq) ((res == 0));;
+        le) ((res != 1));;
+        lt) ((res == 2));;
+        ne) ((res != 0));;
+    esac
+}
+
 # Log initrd creation.
 if ! [[ $dracutlogfile ]]; then
-    [[ $dsrc = /usr/share/dracut ]] && \
+    [[ $dracutbasedir = /usr/share/dracut ]] && \
 	dracutlogfile=/var/log/dracut.log || \
 	dracutlogfile=/tmp/dracut.log
 #    [[ -w $dracutlogfile ]] || dracutlogfile=/tmp/dracut.log
@@ -51,6 +78,9 @@ derror() {
 }
 
 get_fs_env() {
+    eval $(udevadm info --query=env --name=$1|egrep 'ID_FS_(TYPE|UUID)=')
+    [[ $ID_FS_TYPE ]] && return
+
     if [[ -x /lib/udev/vol_id ]]; then
 	eval $(/lib/udev/vol_id --export $1)
     elif find_binary blkid >/dev/null; then
@@ -94,6 +124,9 @@ check_block_and_slaves() {
     [[ -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
@@ -111,7 +144,7 @@ get_numeric_dev() {
 # 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 needes.
+# 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)
@@ -131,6 +164,36 @@ check_vol_slaves() {
     return 1
 }
 
+# Install a directory, keeping symlinks as on the original system.
+# Example: if /lib64 points to /lib on the host, "inst_dir /lib/file"
+# will create ${initdir}/lib64, ${initdir}/lib64/file,
+# and a symlink ${initdir}/lib -> lib64.
+inst_dir() {
+    local dir="$1"
+    [[ -e "${initdir}$dir" ]] && return 0
+
+    # iterate over parent directories
+    local file=""
+    local IFS="/"
+    for part in $dir; do
+        [ -z "$part" ] && continue
+        file="$file/$part"
+        [[ -e "${initdir}$file" ]] && continue
+
+        if [ -L "$file" ]; then
+            # create link as the original
+            local target=$(readlink "$file")
+            ln -sfn "$target" "${initdir}$file" || return 1
+            # resolve relative path and recursively install destionation
+            [[ "$target" = "${target##*/}" ]] && target="${file%/*}/$target"
+            inst_dir "$target"
+        else
+            # create directory
+            mkdir -p "${initdir}$file" || return 1
+        fi
+    done
+}
+
 # $1 = file to copy to ramdisk
 # $2 (optional) Name for the file on the ramdisk
 # Location of the image dir is assumed to be $initdir
@@ -138,24 +201,26 @@ check_vol_slaves() {
 inst_simple() {
     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
     dinfo "Installing $src" 
-    cp -pfL "$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")
 	lib=${src##*/}
 	inst_simple "$reallib" "$reallib"
-	mkdir -p "${initdir}${dest%/*}"
+	inst_dir "${dest%/*}"
 	(cd "${initdir}${dest%/*}" && ln -s "$reallib" "$lib")
     else
 	inst_simple "$src" "$dest"
@@ -179,8 +244,9 @@ 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
 	[[ $line = 'not a dynamic executable' ]] && return 1
@@ -193,7 +259,7 @@ inst_binary() {
 	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.
 	lib_regex='^(/lib[^/]*).*'
 	if [[ $FILE =~ $lib_regex ]]; then
@@ -201,7 +267,7 @@ inst_binary() {
             BASE=${FILE##*/}
 	    # prefer nosegneg libs, then unoptimized ones.
 	    for f in "$TLIBDIR/i686/nosegneg" "$TLIBDIR"; do
-		[[ -f $f/$BASE ]] || continue
+		[[ -e $f/$BASE ]] || continue
 		FILE=$f/$BASE
 		break
 	    done
@@ -237,10 +303,10 @@ inst_symlink() {
     inst "$realsrc" && ln -s "$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
@@ -250,7 +316,8 @@ find_rule() {
 # 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"
+    inst_dir "/lib/udev/rules.d"
+    inst_dir "$target"
     for rule in "$@"; do 
 	rule=$(find_rule "$rule") && \
 	    inst_simple "$rule" "$target/${rule##*/}"
@@ -260,10 +327,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
@@ -308,7 +386,7 @@ check_module_deps() {
     # if we are already set to be loaded, we do not have to be checked again.
     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
@@ -336,13 +414,15 @@ should_source_module() {
     "$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
@@ -356,13 +436,21 @@ check_modules() {
         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 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}
+    modname=${modname%.ko*}
     inst_simple "$1" "/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" || \
 	return 0 # no need to go further if the module is already installed
     for fw in $(modinfo -k $kernel -F firmware $1 2>/dev/null); do
@@ -374,7 +462,7 @@ install_kmod_with_fw() {
 	    fi
 	done
 	if [[ $found != yes ]]; then
-	    dwarning "Possible missing firmware ${fw} for module ${mod}.ko"
+	    dinfo "Possible missing firmware \"${fw}\" for kernel module \"${mod}.ko\""
 	fi
     done
 }
@@ -395,7 +483,7 @@ for_each_kmod_dep() {
     done
 }
 
-# filter kernel modules to install certian modules that meet specific
+# 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.
@@ -404,22 +492,31 @@ for_each_kmod_dep() {
 # 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" -name "*.ko"'
+    if ! [[ $hostonly ]]; then
+	filtercmd='find "$srcmods/kernel/drivers" -name "*.ko" -o -name "*.ko.gz"'
     else
 	filtercmd='cut -d " " -f 1 </proc/modules|xargs modinfo -F filename -k $kernel'
     fi
     for modname in $(eval $filtercmd); do
-	"$1" "$modname" && echo "$modname"
+        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 mod mpargs modpath modname cmd moddirname
     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.
@@ -445,13 +542,21 @@ instmods() {
 	        [[ -f $initdir/$1 ]] && { shift; continue; }
 		# 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; 
 		}
+
+		# We use '-d' option in modprobe only if modules prefix path
+		# differs from default '/'.  This allows us to use Dracut with
+		# old version of modprobe which doesn't have '-d' option.
+		moddirname=${srcmods%%/lib/modules/*}
+		[[ -n ${moddirname} ]] && moddirname="-d ${moddirname}/"
+
 		# 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/*}/
+		    --set-version $kernel ${moddirname}
 		;;
 	esac      
 	shift

dracut-gencmdline

@@ -19,6 +19,39 @@
 #
 #. /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
@@ -119,13 +152,21 @@ qpopd() {
     popd >/dev/null 2>&1
 }
 
-resolve_device_name() {
-    echo "$1" 
-#    echo "resolve_device_name $1"  1>&2
-}
 
 freadlink() {
-    /usr/bin/readlink -f "$1"
+    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() {
@@ -171,7 +212,7 @@ findstoragedriverinsys () {
         sysfs=$(freadlink ${sysfs%/*})
     fi
 
-    if [[ ! "$sysfs" =~ '^/sys/.*block/.*$' ]]; then
+    if [[ ! "$sysfs" =~ ^/sys/.*block/.*$ ]]; then
         #error "WARNING: $sysfs is a not a block sysfs path, skipping"
         return
     fi
@@ -182,12 +223,12 @@ findstoragedriverinsys () {
         *) handleddevices="$handleddevices $sysfs" ;;
     esac
 
-    if [[ "$sysfs" =~ '^/sys/.*block/md[0-9]+$' ]]; then
+    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
+    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
@@ -571,9 +612,7 @@ done
     else
         # check if it's root by label
         rdev=$rootdev
-        if [[ "$rdev" =~ ^(UUID=|LABEL=) ]]; then
-            rdev=$(resolve_device_name "$rdev")
-        fi
+        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
@@ -582,9 +621,7 @@ done
     [ -z "$thawdev" ] && thawdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; exit }}' $fstab)
     swsuspdev="$thawdev"
     if [ -n "$swsuspdev" ]; then
-        if [[ "$swsuspdev" =~ ^(UUID=|LABEL=) ]]; then
-            swsuspdev=$(resolve_device_name "$swsuspdev")
-        fi
+        swsuspdev=$(resolve_device_name "$swsuspdev")
 	findstoragedriver "$swsuspdev"
     fi
 
@@ -629,35 +666,37 @@ emitcrypto()
     echo -n "rd_LUKS_UUID=$luksuuid "
 }
 
-for cryptdev in ${!cryptopart@} ; do
-    emitcrypto `eval echo '$'$cryptdev`
-done
-
 if [ -n "$raiddevices" ]; then
     for dev in $raiddevices; do
-        uid=$(udevadm info --query=all --name=/dev/${dev}|grep  MD_UUID)
-        uid=$(IFS="=";set $uid;echo $2)
-        echo -n "rd_MD_UUID=$uid "
+        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
 
-for cryptdev in ${!cryptoraid@} ; do
-    emitcrypto `eval echo '$'$cryptdev`
-done
-
 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
 
-for cryptdev in ${!cryptolv@} ; do
-    emitcrypto `eval echo '$'$cryptdev`
-done
+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
-. /etc/sysconfig/keyboard
-. /etc/sysconfig/i18n
+[ -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)
@@ -672,13 +711,5 @@ if [ -n "$rootdev" ]; then
     echo -n "root=$rootdev "
 fi
 
-if [ -L /usr/share/plymouth/themes/default.plymouth ]; then
-    theme=$(basename \
-	$(dirname \
-	$(readlink -f  \
-	/usr/share/plymouth/themes/default.plymouth)))
-    [ -n "$theme" ] && echo -n "rd_plytheme=$theme "
-fi
-
 echo
 # vim:ts=8:sw=4:sts=4:et

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)

dracut-update-initramfs

@@ -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

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.
@@ -28,7 +28,17 @@ omit a space-separated list of dracut modules.
 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 \-\-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
@@ -42,6 +52,12 @@ only install kernel drivers and firmware files
 .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
@@ -62,6 +78,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
@@ -79,7 +100,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
@@ -88,114 +109,208 @@ 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
-.B rootfstype=<filesystem type>
-"auto" if not specified, e.g. \fIrootfstype=ext3\fR
-.B rootflags=<mount options>
-specify additional mount options for the root filesystem
-.SH I18N
-e.g. LANG=en_US.UTF-8 SYSFONT=latarcyrheb-sun16 KEYTABLE=de-latin1-nodeadkeys
+.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
-.B KEYBOARDTYPE=sun|pc
+.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
+.B rd_NO_FSTAB
+do not honor special mount options for the root filesystem found in 
+/etc/fstab of the real root.
+
+.SS Misc
+.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.
+
+.SS Debug
+.TP
+.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
-.B KEYTABLE=<keytable filename>
+.BR KEYTABLE= "<keytable filename>"
 will be written to /etc/sysconfig/keyboard in the initramfs
 .TP
-.B SYSFONT= Console font
+.BR SYSFONT= "Console font"
 will be written to /etc/sysconfig/i18n in the initramfs
 .TP
-.B SYSFONTACM= Unicode font map
+.BR SYSFONTACM= "Unicode font map"
 will be written to /etc/sysconfig/i18n in the initramfs
 .TP
-.B UNIMAP= Unicode font map
+.BR UNIMAP= "Unicode font map"
 will be written to /etc/sysconfig/i18n in the initramfs
 .TP
-.B LANG=<locale>
+.BR LANG= <locale>
 will be written to /etc/sysconfig/i18n in the initramfs
 
-.SH Bootsplash - plymouth
+.SS LVM
 .TP
-.B rd_plytheme=<theme name>
-specify the plymouth bootsplash theme (fallback is text)
-
-.SH LVM
-.TP
-.B rd_NO_LVM
+.BR rd_NO_LVM
 disable LVM detection
 .TP
-.B rd_LVM_VG=<volume group name>
+.BR rd_LVM_VG= "<volume group name>"
 only activate the volume groups with the given name
-
-.SH crypto LUKS
+rd_LVM_VG can be specified multiple times on the kernel command line.
 .TP
-.B rd_NO_LUKS
+.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
-.B rd_LUKS_UUID=<luks uuid>
+.BR rd_LUKS_UUID= "<luks uuid>"
 only activate the LUKS partitions with the given UUID
-
-.SH MD
+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
-.B rd_NO_MD
+.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
-.B rd_NO_MDIMSM
+.BR rd_NO_MDIMSM
 no MD RAID for imsm/isw raids, use dmraid instead
 .TP
-.B rd_MD_UUID=<md uuid>
-only activate the raid sets with the given UUID
-
-.SH DMRAID
+.BR rd_NO_MDADMCONF
+ignore mdadm.conf included in initramfs
 .TP
-.B rd_NO_DM
+.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
-.B rd_DM_UUID=<dmraid uuid>
-only activate the raid sets with the given UUID
+.BR rd_DM_UUID= "<dmraid uuid>"
+only activate the raid sets with the given UUID.
+This parameter can be specified multiple times.
 
-.SH DASD
+.SS Network
 .TP
-.B dasd=....
-same syntax as the kernel module parameter (s390 only)
+.BR ip= {dhcp|on|any|dhcp6|auto6}
+dhcp|on|any: get ip from dhcp server from all interfaces. If root=dhcp, 
+loop sequentially through all interfaces (eth0, eth1, ...) and use the first 
+with a valid DHCP root-path.
 
-.SH DHCP
+auto6: do IPv6 autoconfiguration
 .TP
-.B root=dhcp
-get IP from dhcp server, root-path option from dhcp specifies root location
+.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.
 
-.SH NFS
 .TP
-.B root=[<server-ip>:]<root-dir>[:<nfs-options>]
+.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 letters in the MAC-address must be lowercase!
+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
+
+.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 ","
+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:[username:password[reverse:password]@][<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>]\::[<LUN>]\::<targetname>"
+.ad
 protocol defaults to "6", LUN defaults to "0".
 
 If the "servername" field is provided by BOOTP or DHCP, then that
@@ -208,96 +323,115 @@ associated fields.
 http://tools.ietf.org/html/rfc4173
 
 .TP
-.B root=iscsi:[username:password[:reverse:password]@][<servername>]:[<protocol>]:[<port>]:[<LUN>]:<targetname>
+.ad l
+.BR root= "\%iscsi:[username:password\:[:reverse:password]@]\:[<servername>]\::[<protocol>]\::[<port>]\::[<LUN>]\::<targetname>"
+.ad
 e.g. root=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0
 .TP
-.B root=??? netroot=iscsi:[username:password[:reverse:password]@][<servername>]:[<protocol>]:[<port>]:[<LUN>]:<targetname> ...
+.ad l
+.BR root= ??? " netroot=" "\%iscsi:[username:password[:reverse:password]@]\:[<servername>]\::[<protocol>]\::[<port>]\::[<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
+
 .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= ??? " iscsi_firmware"
 will read the iscsi parameter from the BIOS firmware
 
-.SH NBD
+.SS FCoE
 .TP
-.B root=nbd:<server>:<port>[:<fstype>][:<mountopts>]
+.BR netroot= fcoe:<interface|MAC>:<dcb|nodcb>
+Try to connect to a FCoE SAN through the NIC specified by <interface> or <MAC>,
+for the second argument, currently only nodcb is supported. Note letters in
+the MAC-address must be lowercase!
+
+.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>:[<server-id>]:<gateway-IP-number>:<netmask>:<client-hostname>:<interface>:{none|off}
-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 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
-.TP
-.B rdbreak
-drop to a shell at the end
-.TP
-.B rdbreak={cmdline|pre-udev|pre-trigger|initqueue|pre-mount|mount|pre-pivot}
-drop to a 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 /tmp/dracut.log
+see \fBdracut.conf\fR(5)
+.TP
+.B /etc/dracut.conf
+.SS "Configuration in the Initramfs"
 .TP 
 .B /conf/conf.d/
 Any files found in /conf/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)

dracut.conf

@@ -1,13 +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="-h"
+#hostonly="yes"
+#
+
+# install local /etc/mdadm.conf
+mdadmconf="yes"
+
+# install local /etc/lvm/lvm.conf
+lvmconf="yes"

dracut.conf.5

@@ -0,0 +1,68 @@
+.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 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)
+
+.SH SEE ALSO
+.BR dracut (8)
+

dracut.spec

@@ -1,8 +1,15 @@
-%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
+# nbd in Fedora only
+%if 0%{?rhel} >= 6
+%define with_nbd 0
+%endif
 
 %if %{defined gittag}
 %define rdist .git%{gittag}%{?dist}
@@ -12,54 +19,69 @@
 %endif
 
 Name: dracut
-Version: 001
+Version: 006
 Release: 1%{?rdist}
 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
+# Source can be generated by 
+# http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=snapshot;h=%{?dashgittag};sf=tgz
 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: udev
-Requires: util-linux-ng
-Requires: module-init-tools >= 3.7-9
-Requires: cpio
-Requires: coreutils
-Requires: findutils
-Requires: binutils
-Requires: grep
-Requires: which
-Requires: mktemp >= 1.5-5
-Requires: mount
+
+%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
+Obsoletes: dracut-kernel < 005
+Provides:  dracut-kernel = %{version}-%{release}
+
 Requires: bash
-Requires: dash
-Requires: /bin/sh 
-Requires: fileutils, gzip, tar
-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
-Requires: file
 Requires: bzip2
-Requires: policycoreutils
-Requires: dmraid
+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: sed
+Requires: tar
+Requires: udev
+Requires: util-linux-ng >= 2.16
+Requires: which
 
 %if ! 0%{?with_switch_root}
-Requires: util-linux-ng >= 2.16
 BuildArch: noarch
 %endif
 
 %description
-dracut is a new, event-driven initramfs infrastructure based around udev.
+Dracut contains tools to create a bootable initramfs for 2.6 Linux kernels. 
+Unlike existing implementations, dracut does hard-code as little as possible 
+into the initramfs. Dracut contains various modules which are driven by the 
+event-based udev. Having root on MD, DM, LVM2, LUKS is supported as well as 
+NFS, iSCSI, NBD, FCoE with the dracut-network package.
 
 %package network
-Summary: dracut modules to build a dracut initramfs with network support
+Summary: Dracut modules to build a dracut initramfs with network support
 Requires: %{name} = %{version}-%{release}
 Requires: rpcbind nfs-utils 
 Requires: iscsi-initiator-utils
+Requires: dhclient
+%if %{with_nbd}
 Requires: nbd
+%endif
 Requires: net-tools iproute
 Requires: bridge-utils
 
@@ -67,6 +89,22 @@ Requires: bridge-utils
 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
+%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
+
+%description fips
+This package requires everything which is needed to build an
+all purpose initramfs with dracut, which does an integrity check.
+
 %package generic
 Summary: Metapackage to build a generic initramfs with dracut
 Requires: %{name} = %{version}-%{release}
@@ -76,24 +114,10 @@ Requires: %{name}-network = %{version}-%{release}
 This package requires everything which is needed to build a generic
 all purpose initramfs with dracut.
 
-
-%package kernel
-Summary: Metapackage to build generic initramfs with dracut with only kernel modules
-Requires: %{name} = %{version}-%{release}
-Requires: ql2100-firmware
-Requires: ql2200-firmware
-Requires: ql23xx-firmware
-Requires: ql2400-firmware
-Requires: ql2500-firmware
-
-%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
+Summary: Dracut tools to build the local initramfs
 Requires: coreutils cryptsetup-luks device-mapper
-Requires: diffutils dmraid findutils gawk grep lvm2
+Requires: diffutils dmraid findutils grep lvm2 gawk
 Requires: module-init-tools sed
 Requires: cpio gzip
 
@@ -104,20 +128,25 @@ This package contains tools to assemble the local initrd and host configuration.
 %setup -q -n %{name}-%{version}%{?dashgittag}
 
 %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}
+     sysconfdir=/etc mandir=%{_mandir} WITH_SWITCH_ROOT=0%{?with_switch_root}
 
-%if ! 0%{?with_switch_root}
-rm -f $RPM_BUILD_ROOT/sbin/switch_root
-%endif
+echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
+rm $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/01fips/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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -129,41 +158,61 @@ rm -rf $RPM_BUILD_ROOT
 %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
 %config(noreplace) /etc/dracut.conf
+%dir /etc/dracut.conf.d
 %{_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/95resume
 %{_datadir}/dracut/modules.d/95rootfs-block
-%{_datadir}/dracut/modules.d/95s390
+%{_datadir}/dracut/modules.d/95dasd
+%{_datadir}/dracut/modules.d/95dasd_mod
+%{_datadir}/dracut/modules.d/95zfcp
 %{_datadir}/dracut/modules.d/95terminfo
 %{_datadir}/dracut/modules.d/95udev-rules
-%{_datadir}/dracut/modules.d/95udev-rules.ub810
+%{_datadir}/dracut/modules.d/95uswsusp
+%{_datadir}/dracut/modules.d/98selinux
 %{_datadir}/dracut/modules.d/98syslog
 %{_datadir}/dracut/modules.d/99base
+# logfile needs no logrotate, because it gets overwritten
+# for every dracut run
+%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
+%{_datadir}/dracut/modules.d/95znet
 
-%files kernel 
+%files fips
 %defattr(-,root,root,0755)
-%doc README.kernel
+%doc COPYING
+%{_datadir}/dracut/modules.d/01fips
 
 %files generic
 %defattr(-,root,root,0755)
@@ -172,6 +221,8 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -179,6 +230,279 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Jun 17 2010 Harald Hoyer <harald@redhat.com> 006-1
+- version 006
+
+* Fri Jun 11 2010 Harald Hoyer <harald@redhat.com>
+- Remove requirements, which are not really needed
+Resolves: rhbz#598509
+- fixed copy of network config to /dev/.initramfs/ (patch 146)
+Resolves: rhbz#594649
+- more password beauty (patch 142)
+Resolves: rhbz#561092
+- support multiple iSCSI disks (patch 143)
+Resolves: rbhz#580190
+- fixed selinux=0 (patch 130)
+Resolves: rhbz#593080
+- add support for booting LVM snapshot root volume (patch 145)
+Resolves: rbhz#602723
+- remove hardware field from BOOTIF= (patch 148)
+Resolves: rhbz#599593
+- add aes kernel modules and fix crypt handling (patch 137, patch 140 and patch 147)
+Resolves: rhbz#600170
+
+* Thu May 27 2010 Harald Hoyer <harald@redhat.com> 
+- fixed Requirements
+- fixed autoip6 
+Resolves: rhbz#538388
+- fixed multipath
+Resolves: rhbz#595719
+
+* Thu May 06 2010 Harald Hoyer <harald@redhat.com> 
+- only display short password messages
+Resolves: rhbz#561092
+
+* Thu May 06 2010 Harald Hoyer <harald@redhat.com>
+- fixed dracut manpages 
+Resolves: rhbz#589109
+- use ccw-init and ccw rules from s390utils
+Resolves: rhbz#533494
+- fixed fcoe
+Resolves: rhbz#486244
+- various other bugfixes seen in Fedora
+
+* Tue Apr 20 2010 Harald Hoyer <harald@redhat.com> 
+- fixed network with multiple nics
+- fixed nfsidmap paths
+- do not run blkid on non active container raids
+- fixed cdrom polling mechanism
+- update to latest git
+
+* Thu Apr 15 2010 Harald Hoyer <harald@redhat.com>
+- fixed dracut manpages
+- dmraid parse different error messages
+- add cdrom polling mechanism for slow cdroms
+- add module btrfs
+- 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
+
+* Thu Mar 25 2010 Harald Hoyer <harald@redhat.com> 
+- removed firmware requirements (rhbz#572634)
+- add /etc/dracut.conf.d
+- Resolves: rhbz#572634
+
+* Fri Mar 19 2010 Harald Hoyer <harald@redhat.com> 
+- version 005
+
+* Fri Mar 19 2010 Harald Hoyer <harald@redhat.com> 
+- fixed rpmlint errors (rhbz#570547)
+- removed firmware package from dracut-kernel (rhbz#572634)
+- add dcb support to dracut's FCoE support (rhbz#563794)
+- force install some modules in hostonly mode (rhbz#573094)
+- various other bugfixes
+- Resolves: rhbz#570547, rhbz#572634, rhbz#563794, rhbz#573094
+
+* Thu Feb 18 2010 Harald Hoyer <harald@redhat.com> 004-15
+- fixed "selinux=0" booting (rhbz#566376)
+- fixed internal IFS handling
+- Resolves: rhbz#566376
+
+* Fri Jan 29 2010 Harald Hoyer <harald@redhat.com> 004-5
+- fixed firmware.sh bug (#559975 #559597)
+
+* Tue Jan 26 2010 Harald Hoyer <harald@redhat.com> 004-4
+- add multipath check
+
+* Tue Jan 26 2010 Harald Hoyer <harald@redhat.com> 004-3
+- fix selinux handling if .autorelabel is present
+- Resolves: rhbz#557744
+
+* Wed Jan 20 2010 Harald Hoyer <harald@redhat.com> 004-2
+- fix emergency_shell argument parsing
+- Related: rhbz#543948
+
+* Fri Jan 15 2010 Harald Hoyer <harald@redhat.com> 004-1
+- version 004
+- Resolves: rhbz#529339 rhbz#533494 rhbz#548550 
+- Resolves: rhbz#548555 rhbz#553195
+
+* Wed Jan 13 2010 Harald Hoyer <harald@redhat.com> 003-3
+- add Obsoletes of mkinitrd/nash/libbdevid-python
+- Related: rhbz#543948
+
+* Wed Jan 13 2010 Warren Togami <wtogami@redhat.com> 003-2
+- nbd is Fedora only
+
+* Fri Nov 27 2009 Harald Hoyer <harald@redhat.com> 003-1
+- version 003
+
+* Mon Nov 23 2009 Harald Hoyer <harald@redhat.com> 002-26
+- add WITH_SWITCH_ROOT make flag
+- add fips requirement conditional
+- add more device mapper modules (bug #539656)
+
+* Fri Nov 20 2009 Dennis Gregorovic <dgregor@redhat.com> - 002-25.1
+- nss changes for Alpha 3
+
+* Thu Nov 19 2009 Harald Hoyer <harald@redhat.com> 002-25
+- add more requirements for dracut-fips (bug #539257)
+
+* Tue Nov 17 2009 Harald Hoyer <harald@redhat.com> 002-24
+- put fips module in a subpackage (bug #537619)
+
+* Tue Nov 17 2009 Harald Hoyer <harald@redhat.com> 002-23
+- install xdr utils for multipath (bug #463458)
+
+* Thu Nov 12 2009 Harald Hoyer <harald@redhat.com> 002-22
+- add module 90multipath
+- add module 01fips
+- renamed module 95ccw to 95znet (bug #533833)
+- crypt: ignore devices in /etc/crypttab (root is not in there)
+- dasd: only install /etc/dasd.conf in hostonly mode (bug #533833)
+- zfcp: only install /etc/zfcp.conf in hostonly mode (bug #533833)
+- kernel-modules: add scsi_dh scsi_dh_rdac scsi_dh_emc (bug #527750)
+- dasd: use dasdconf.sh from s390utils (bug #533833)
+
+* Fri Nov 06 2009 Harald Hoyer <harald@redhat.com> 002-21
+- fix rd_DASD argument handling (bug #531720)
+- Resolves: rhbz#531720
+
+* Wed Nov 04 2009 Harald Hoyer <harald@redhat.com> 002-20
+- fix rd_DASD argument handling (bug #531720)
+- Resolves: rhbz#531720
+
+* Tue Nov 03 2009 Harald Hoyer <harald@redhat.com> 002-19
+- changed rd_DASD to rd_DASD_MOD (bug #531720)
+- Resolves: rhbz#531720
+
+* Tue Oct 27 2009 Harald Hoyer <harald@redhat.com> 002-18
+- renamed lvm/device-mapper udev rules according to upstream changes
+- fixed dracut search path issue
+
+* Mon Oct 26 2009 Harald Hoyer <harald@redhat.com> 002-17
+- load dm_mod module (bug #530540)
+
+* Fri Oct 09 2009 Jesse Keating <jkeating@redhat.com> - 002-16
+- Upgrade plymouth to Requires(pre) to make it show up before kernel
+
+* Thu Oct 08 2009 Harald Hoyer <harald@redhat.com> 002-15
+- s390 ccw: s/layer1/layer2/g
+
+* Thu Oct 08 2009 Harald Hoyer <harald@redhat.com> 002-14
+- add multinic support
+- add s390 zfcp support
+- add s390 network support
+
+* Wed Oct 07 2009 Harald Hoyer <harald@redhat.com> 002-13
+- fixed init=<command> handling
+- kill loginit if "rdinitdebug" specified
+- run dmsquash-live-root after udev has settled (bug #527514)
+
+* Tue Oct 06 2009 Harald Hoyer <harald@redhat.com> 002-12
+- add missing loginit helper
+- corrected dracut manpage
+
+* Thu Oct 01 2009 Harald Hoyer <harald@redhat.com> 002-11
+- fixed dracut-gencmdline for root=UUID or LABEL
+
+* Thu Oct 01 2009 Harald Hoyer <harald@redhat.com> 002-10
+- 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
+- stop udev before killing it
+- add ghost /var/log/dracut.log
+- dmsquash: use info() and die() rather than echo
+- 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
+
+* Tue Sep 29 2009 Harald Hoyer <harald@redhat.com> 002-9
+- make install of new dm/lvm udev rules optionally
+- correct dasd module typo
+
+* Fri Sep 25 2009 Warren Togami <wtogami@redhat.com> 002-8
+- revert back to dracut-002-5 tarball 845dd502
+  lvm2 was reverted to pre-udev
+
+* Wed Sep 23 2009 Harald Hoyer <harald@redhat.com> 002-7
+- build with the correct tarball
+
+* Wed Sep 23 2009 Harald Hoyer <harald@redhat.com> 002-6
+- add new device mapper udev rules and dmeventd 
+  bug 525319, 525015
+
+* Wed Sep 23 2009 Warren Togami <wtogami@redaht.com> 002-5
+- Revert back to -3, Add umount back to initrd
+  This makes no functional difference to LiveCD.  See Bug #525319
+
+* Mon Sep 21 2009 Warren Togami <wtogami@redhat.com> 002-4
+- Fix LiveCD boot regression
+
+* Mon Sep 21 2009 Harald Hoyer <harald@redhat.com> 002-3
+- bail out if selinux policy could not be loaded and 
+  selinux=0 not specified on kernel command line 
+  (bug #524113)
+- set finished criteria for dmsquash live images
+
+* Fri Sep 18 2009 Harald Hoyer <harald@redhat.com> 002-2
+- do not cleanup dmraids
+- copy over lvm.conf
+
+* Thu Sep 17 2009 Harald Hoyer <harald@redhat.com> 002-1
+- version 002
+- set correct PATH
+- workaround for broken mdmon implementation
+
+* Wed Sep 16 2009 Harald Hoyer <harald@redhat.com> 001-12
+- removed lvm/mdraid/dmraid lock files
+- add missing ifname= files
+
+* Wed Sep 16 2009 Harald Hoyer <harald@redhat.com> 001-11
+- generate dracut-version during rpm build time
+
+* Tue Sep 15 2009 Harald Hoyer <harald@redhat.com> 001-10
+- 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
+
+* Wed Sep 09 2009 Harald Hoyer <harald@redhat.com> 001-9
+- added Requires: plymouth-scripts
+
+* Wed Sep 09 2009 Harald Hoyer <harald@redhat.com> 001-8
+- plymouth: use plymouth-populate-initrd
+- add add_drivers for dracut and dracut.conf
+- do not mount /proc and /selinux manually in selinux-load-policy
+
+* Wed Sep 09 2009 Harald Hoyer <harald@redhat.com> 001-7
+- add scsi_wait_scan to be sure everything was scanned
+
+* Tue Sep 08 2009 Harald Hoyer <harald@redhat.com> 001-6
+- fixed several problems with md raid containers
+- fixed selinux policy loading
+
+* Tue Sep 08 2009 Harald Hoyer <harald@redhat.com> 001-5
+- patch does not honor file modes, fixed them manually
+
+* Mon Sep 07 2009 Harald Hoyer <harald@redhat.com> 001-4
+- fixed mdraid for IMSM
+
+* Mon Sep 07 2009 Harald Hoyer <harald@redhat.com> 001-3
+- fixed bug, which prevents installing 61-persistent-storage.rules (bug #520109)
+
+* Thu Sep 03 2009 Harald Hoyer <harald@redhat.com> 001-2
+- fixed missing grep for md
+- reorder cleanup
+
 * Wed Sep 02 2009 Harald Hoyer <harald@redhat.com> 001-1
 - version 001
 - see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS

lsinitrd

@@ -0,0 +1,11 @@
+#!/bin/bash 
+
+[[ $# -eq 1 ]] || { echo "Usage: $(basename $0) <initramfs file>" ; exit 1 ; }
+[[ -f $1 ]]    || { echo "$1 does not exist" ; exit 1 ; }
+
+echo "$1:"
+echo "========================================================================"
+zcat $1 | cpio --extract --verbose --quiet --to-stdout 'dracut-*' 2>/dev/null
+echo "========================================================================"
+zcat $1 | cpio --extract --verbose --quiet --list
+echo "========================================================================"

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)
+            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 -H $dracut_args --add-drivers "$basicmodules" "$target" "$kernel"
+else
+	dracut -H $dracut_args "$target" "$kernel"
+fi
+
+# vim:ts=8:sw=4:sts=4:et

modules.d/01fips/check

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+. $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; 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
+

modules.d/01fips/fips.sh

@@ -0,0 +1,70 @@
+#!/bin/sh
+do_fips()
+{
+    FIPSMODULES=$(cat /etc/fipsmodules)
+    BOOT=$(getarg boot=)
+    KERNEL=$(uname -r)
+    udevadm trigger >/dev/null 2>&1
+    case "$boot" in
+    block:LABEL=*|LABEL=*)
+        boot="${boot#block:}"
+        boot="$(echo $boot | sed 's,/,\\x2f,g')"
+        boot="/dev/disk/by-label/${boot#LABEL=}"
+        bootok=1 ;;
+    block:UUID=*|UUID=*)
+        boot="${boot#block:}"
+        boot="/dev/disk/by-uuid/${root#UUID=}"
+        bootok=1 ;;
+    /dev/*)
+        bootok=1 ;;
+    esac
+
+    [ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
+
+    if [ $UDEVVERSION -ge 143 ]; then
+        udevadm settle --exit-if-exists=$boot
+    else
+        udevadm settle --timeout=30
+    fi
+
+    [ -e "$boot" ]
+
+    mkdir /boot
+    info "Mounting $boot as /boot"
+    mount -oro "$boot" /boot
+
+    info "Checking integrity of kernel"
+
+    if ! [ -e "/boot/.vmlinuz-${KERNEL}.hmac" ]; then
+        warn "/boot/.vmlinuz-${KERNEL}.hmac does not exist"
+        return 1
+    fi
+
+    sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1
+
+    info "Umounting /boot"
+    umount /boot
+
+    info "Loading and integrity checking all crypto modules"
+    for module in $FIPSMODULES; do
+        if [ "$module" != "tcrypt" ]; then
+            modprobe ${module} || return 1
+        fi
+    done
+    info "Self testing crypto algorithms"
+    modprobe tcrypt noexit=1 || return 1
+    rmmod tcrypt
+    info "All initrd crypto checks done"  
+
+    return 0
+}
+
+if ! fipsmode=$(getarg fips) || [ $fipsmode == "0" ]; then
+    rm -f /etc/modprobe.d/fips.conf >/dev/null 2>&1
+else
+    set -e
+    do_fips || die "FIPS integrity test failed"
+    set +e
+fi
+
+# vim:ts=8:sw=4:sts=4:et

modules.d/01fips/install

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+inst_hook pre-trigger 01 "$moddir/fips.sh"
+dracut_install sha512hmac rmmod insmod mount uname umount
+
+libdir="lib"
+if ldd $(find_binary sha512hmac) |grep -q /lib64/; then
+    libdir="lib64"
+fi
+
+if [ -e /usr/$libdir/libsoftokn3.so ]; then
+    dracut_install \
+        /usr/$libdir/libsoftokn3.so /usr/$libdir/libsoftokn3.chk \
+        /usr/$libdir/libfreebl3.so /usr/$libdir/libfreebl3.chk 
+else
+    dracut_install \
+        /$libdir/libsoftokn3.so /$libdir/libsoftokn3.chk \
+        /$libdir/libfreebl3.so /$libdir/libfreebl3.chk 
+fi
+
+dracut_install /usr/$libdir/hmaccalc/sha512hmac.hmac
+
+# vim:ts=8:sw=4:sts=4:et

modules.d/01fips/installkernel

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+FIPSMODULES="aead aes_generic aes-x86_64 ansi_cprng cbc ccm chainiv ctr"
+FIPSMODULES="$FIPSMODULES des deflate ecb eseqiv hmac seqiv sha256 sha512"
+FIPSMODULES="$FIPSMODULES cryptomgr crypto_null tcrypt" 
+
+mkdir -p "${initdir}/etc/modprobe.d"
+
+for mod in $FIPSMODULES; do 
+    if 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

modules.d/10redhat-i18n/install

@@ -3,7 +3,7 @@
 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
@@ -13,7 +13,7 @@ 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
@@ -27,12 +27,20 @@ install_local()
             KEYMAP=/etc/sysconfig/console/default.kmap
 	else
             . /etc/sysconfig/keyboard
-            [[ $KEYTABLE && -d /lib/kbd/keymaps ]] && KEYMAP="$KEYTABLE.map"
+	    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
 		if [ -L $FN ]; then
@@ -58,27 +66,31 @@ install_local()
 	[[ $SYSFONT ]] || SYSFONT=latarcyrheb-sun16
 	inst setfont
 
-	for FN in /lib/kbd/consolefonts/$SYSFONT.* ; do
+	for FN in ${kbddir}/consolefonts/$SYSFONT.* ; do
             inst "$FN"
             case $FN in
 		*.gz) gzip -d "$initdir$FN" ;;
 		*.bz2) bzip2 -d "$initdir$FN" ;;
             esac
 	done
-	[[ $SYSFONTACM ]] && inst /lib/kbd/consoletrans/$SYSFONTACM
-	[[ $UNIMAP ]] && inst /lib/kbd/unimaps/$UNIMAP
+	[[ $SYSFONTACM ]] && inst ${kbddir}/consoletrans/$SYSFONTACM
+	[[ $UNIMAP ]] && inst ${kbddir}/unimaps/$UNIMAP
     fi
 }
 
+for kbddir in /usr/lib/kbd /lib/kbd; do
+	[[ -d ${kbddir} ]] && break
+done
+
 if [[ $hostonly ]]; then 
     install_local
 else
-    for i in $(find /lib/kbd -type f -print); do
+    for i in $(find ${kbddir} -type f -print); do
 	dracut_install $i
     done
     # remove unnecessary files
-    rm -f "$initdir/lib/kbd/consoletrans/utflist" 2>/dev/null
-    find "$initdir/lib/kbd/" -name README\* -exec rm -f '{}' \;
+    rm -f "$initdir${kbddir}/consoletrans/utflist" 2>/dev/null
+    find "$initdir${kbddir}/" -name README\* -exec rm -f '{}' \;
     dracut_install gzip bzip2
 fi
 

modules.d/10redhat-i18n/parse-i18n.sh

@@ -3,7 +3,6 @@ inst_key_val()
     local value
     value=$(getarg $1)
     [ -n "$value" ] && printf '%s="%s"\n' $1 $value >> $2
-    initrdargs="$initrdargs $1" 
 }
 
 mkdir -p /etc/sysconfig

modules.d/10rpmversion/install

@@ -1,8 +1,13 @@
+#!/bin/bash
 
-dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}' $(which $0))
-if [ $? -eq 0 ]; then
-	echo $dracut_rpm_version > $initdir/$dracut_rpm_version
+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"
 

modules.d/40network/check

@@ -1,8 +1,13 @@
 #!/bin/bash
 
+if [[ $1 = -d ]]; then
+  [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg
+  exit 0
+fi
+
 . $dracutfunctions
 
-for program in ip hostname; do 
+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." 
@@ -15,5 +20,8 @@ for program in dhclient brctl; do
     dwarning "Could not find program \"$program\" it might be required by network." 
   fi
 done
+
+
+
 exit 255
 

modules.d/40network/dhclient-script

@@ -13,36 +13,41 @@ setup_interface() {
 
     [ -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
+    # Taken from debian dhclient-script:
+    # The 576 MTU is only used for X.25 and dialup connections
+    # where the admin wants low latency.  Such a low MTU can cause
+    # problems with UDP traffic, among other things.  As such,
+    # disallow MTUs from 576 and below by default, so that broken
+    # MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
+    if [ -n "$mtu" ] && [ $mtu -gt 576 ] ; then
+	echo "if ! ip link set $netif mtu $mtu ; then"
+	echo "ip link set $netif down"
+	echo "ip link set $netif mtu $mtu"
+	echo "ip link set $netif up"
+	echo wait_for_if_up $netif
+	echo "fi"
     fi > /tmp/net.$netif.up
 
     echo ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} dev $netif >> /tmp/net.$netif.up
 
     [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
 
-    [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/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/resolv.conf
+    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
 
@@ -51,17 +56,25 @@ netif=$interface
 
 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

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

modules.d/40network/ifname-genrules.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# if there are no ifname parameters, just use NAME=KERNEL
+if ! getarg ifname= >/dev/null ; then
+    return
+fi
+
+{
+    for p in $(getargs ifname=); do
+        parse_ifname_opts $p
+	printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="%s", ATTR{type}=="1", NAME="%s"\n' "$ifname_mac" "$ifname_if"
+    done
+
+    # Rename non named interfaces out of the way for named ones.
+    for p in $(getargs ifname=); do
+        parse_ifname_opts $p
+	printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="?*", ATTR{type}=="1", NAME!="?*", KERNEL=="%s", NAME="%%k-renamed"\n' "$ifname_if"
+    done
+} > /etc/udev/rules.d/50-ifname.rules

modules.d/40network/ifup

@@ -3,57 +3,87 @@
 # 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
-
-    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
 
 # 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"
+    dhclient "$@" -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid -lf /tmp/dhclient.$netif.lease $netif \
+    || echo "dhcp failed"
+}
+
+load_ipv6() {
+    modprobe ipv6
+    i=0
+    while [ ! -d /proc/sys/net/ipv6 ]; do
+	i=$(($i+1))
+	[ $i -gt 10 ] && break
+	sleep 0.1
+    done
+}
+
+do_ipv6auto() {
+    load_ipv6
+    {
+        echo 0 > /proc/sys/net/ipv6/conf/$netif/forwarding 
+        echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra
+        echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects
+	echo ip link set $netif up 
+	echo wait_for_if_up $netif
+    } > /tmp/net.$netif.up
+
+    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+
+    namesrv=$(getargs nameserver)
+    if  [ -n "$namesrv" ] ; then
+	for s in $namesrv; do
+	    echo nameserver $s 
+	done
+    fi >> /tmp/net.$netif.resolv.conf
+
+
+    echo online > /sys/class/net/$netif/uevent
+    /sbin/initqueue --onetime --name netroot-$netif  /sbin/netroot $netif 
 }
 
 # Handle static ip configuration
 do_static() {
-{
+    strstr $ip '*:*:*' && load_ipv6
+
+    {
 	echo ip link set $netif up 
-	echo ip addr flush dev $netif
+	echo wait_for_if_up $netif
+	# do not flush addr for ipv6
+	strstr $ip '*:*:*' || \
+	    echo ip addr flush dev $netif
 	echo ip addr add $ip/$mask 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
 
+export PS4="ifup.$1.$$ + "
+exec >>/dev/initlog.pipe 2>>/dev/initlog.pipe
 . /lib/dracut-lib.sh
 
-if getarg rdnetdebug ; then
-    exec >/tmp/ifup.$1.$$.out
-    exec 2>>/tmp/ifup.$1.$$.out
-    set -x
-fi
-
 # Huh? No $1?
 [ -z "$1" ] && exit 1
 
@@ -88,6 +118,7 @@ fi
 # start bridge if necessary
 if [ "$netif" = "$bridgename" ] && [ ! -e /tmp/net.$bridgename.up ]; then
     ip link set $ethname up
+    wait_for_if_up $ethname
     # Create bridge and add eth to bridge
     brctl addbr $bridgename
     brctl setfd $bridgename 0
@@ -96,7 +127,14 @@ fi
 
 # No ip lines default to dhcp
 ip=$(getarg ip)
-[ -z "$ip" ] && do_dhcp;
+
+if [ -z "$ip" ]; then
+    if [ "$netroot" = "dhcp6" ]; then
+	do_dhcp -6
+    else
+	do_dhcp -4
+    fi
+fi
 
 # Specific configuration, spin through the kernel command line
 # looking for ip= lines
@@ -112,9 +150,16 @@ for p in $(getargs ip=); do
     done > /tmp/net.$netif.override
 
     case $autoconf in
-	dhcp|on|any)	 do_dhcp ;;
-        *) do_static ;;
+	dhcp|on|any)
+	    do_dhcp -4 ;;
+	dhcp6)
+	    do_dhcp -6 ;;
+	auto6)
+	    do_ipv6auto ;;
+        *) 
+	    do_static ;;
     esac
     break
 done
+
 exit 0

modules.d/40network/install

@@ -1,17 +1,28 @@
 #!/bin/bash
-dracut_install ip dhclient hostname brctl
+dracut_install ip dhclient brctl arping
 inst "$moddir/ifup" "/sbin/ifup"
 inst "$moddir/netroot" "/sbin/netroot"
 inst "$moddir/dhclient-script" "/sbin/dhclient-script"
 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 99 "$moddir/parse-ip-opts.sh"
 inst_hook cmdline 98 "$moddir/parse-bridge.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 85 "$moddir/write-ifcfg.sh"
+if ldd $(which sh) | 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"

modules.d/40network/installkernel

@@ -4,8 +4,8 @@
 net_module_test() {
     local net_drivers='eth_type_trans|register_virtio_device'
     local unwanted_drivers='/(wireless|isdn|uwb)/'
-    nm -uPA "$1" | egrep -q $net_drivers && \
-	nm -uPA "$1" | egrep -qv 'iw_handler_get_spy' && \
+    egrep -q $net_drivers "$1" && \
+	egrep -qv 'iw_handler_get_spy' "$1" && \
 	[[ ! $1 =~ $unwanted_drivers ]]
 }
 
@@ -14,3 +14,4 @@ instmods $(filter_kernel_modules net_module_test)
 instmods ecb arc4
 # bridge modules
 instmods bridge stp llc
+instmods ipv6

modules.d/40network/net-genrules.sh

@@ -6,6 +6,8 @@ fix_bootif() {
     local IFS='-'
     macaddr=$(for i in ${macaddr} ; do echo -n $i:; done)
     macaddr=${macaddr%:}
+    # strip hardware type field from pxelinux
+    [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:}
     echo $macaddr
 }
 
@@ -29,7 +31,7 @@ fix_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 'ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="%s", RUN+="/sbin/ifup $env{INTERFACE}"\n' "$iface"
 	done
 
     # Default: We don't know the interface to use, handle all
@@ -37,7 +39,4 @@ fix_bootif() {
 	printf 'ACTION=="add", SUBSYSTEM=="net", RUN+="/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

modules.d/40network/netroot

@@ -4,27 +4,12 @@ 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
-
 # 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
@@ -46,7 +31,7 @@ netif=$1
 
 # 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
 
@@ -90,7 +75,30 @@ done
 
 [ -e /tmp/net.$netif.gw ]          && . /tmp/net.$netif.gw
 [ -e /tmp/net.$netif.hostname ]    && . /tmp/net.$netif.hostname
-[ -e /tmp/resolv.conf ] && cp -f /tmp/resolv.conf /etc/resolv.conf
+[ -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
+if [ -n "$dest" ] && ! arping -q -f -w 60 -I $netif $dest ; then
+    die "Resolving $dest via ARP on $netif failed"
+fi
 
 # Source netroot hooks before we start the handler
 source_all netroot

modules.d/40network/parse-bridge.sh

@@ -10,7 +10,7 @@
 [ -n "$bridgename" ] && return
 
 # Check if bridge parameter is valid 
-if getarg ip= >/dev/null ; then
+if getarg bridge= >/dev/null ; then
     if [ -z "$netroot" ] ; then
 	die "No netboot configured, bridge is invalid"
     fi
@@ -37,7 +37,6 @@ unset bridgename ethname
 
 # Parse bridge for bridgename and ethname
 if getarg bridge >/dev/null; then
-    initrdargs="$initrdargs bridge" 
     # Read bridge= parameters if they exist
     bridge="$(getarg bridge=)"
     if [ ! "$bridge" = "bridge" ]; then 

modules.d/40network/parse-ifname.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Format:
+#	ifname=<interface>:<mac>
+#
+# Note letters in the macaddress must be lowercase!
+#
+# 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
+
+# check if there are any ifname parameters
+if ! getarg ifname= >/dev/null ; then
+    return
+fi
+
+parse_ifname_opts() {
+    local IFS=:
+    set $1
+
+    case $# in
+        7)
+            ifname_if=$1
+            ifname_mac=$2:$3:$4:$5:$6:$7
+            ;;
+        *)
+            die "Invalid arguments for ifname="
+            ;;
+    esac
+}
+
+# Check ifname= lines
+for p in $(getargs ifname=); do
+    parse_ifname_opts $p
+done

modules.d/40network/parse-ip-opts.sh

@@ -12,23 +12,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
@@ -89,6 +73,7 @@ for p in $(getargs ip=); do
 	    [ -z "$mask" ] && \
 		die "Sorry, automatic calculation of netmask is not yet supported"
 	    ;;
+	auto6);;
 	dhcp|on|any) \
 	    [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
 	        die "Sorry, 'ip=$p' does not make sense for multiple interface configurations"

modules.d/40network/write-ifcfg.sh

@@ -1,52 +0,0 @@
-#!/bin/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
-
-for netif in $IFACES ; do
-    mkdir -p /tmp/ifcfg/
-    # bridge?
-    unset bridge
-    if [ "$netif" = "$bridgename" ]; then
-        bridge=yes
-    fi
-    cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
-    echo "# Generated by dracut initrd" > /tmp/ifcfg/ifcfg-$netif
-    echo "DEVICE=$netif" >> /tmp/ifcfg/ifcfg-$netif
-    echo "ONBOOT=yes" >> /tmp/ifcfg/ifcfg-$netif
-    echo "NETBOOT=yes" >> /tmp/ifcfg/ifcfg-$netif
-    if [ -f /tmp/net.$netif.lease ]; then
-	echo "BOOTPROTO=dhcp" >> /tmp/ifcfg/ifcfg-$netif
-    else
-	echo "BOOTPROTO=none" >> /tmp/ifcfg/ifcfg-$netif
-        # If we've booted with static ip= lines, the override file is there
-	. /tmp/net.$netif.override 
-	echo "IPADDR=$ip" >> /tmp/ifcfg/ifcfg-$netif
-	echo "NETMASK=$mask" >> /tmp/ifcfg/ifcfg-$netif
-	[ -n "$gw" ] && echo "GATEWAY=$gw" >> /tmp/ifcfg/ifcfg-$netif
-    fi
-
-    # bridge needs differente things written to ifcfg
-    if [ -z "$bridge" ]; then
-        # standard interface
-        echo "HWADDR=$(cat /sys/class/net/$netif/address)" >> /tmp/ifcfg/ifcfg-$netif
-        echo "TYPE=Ethernet" >> /tmp/ifcfg/ifcfg-$netif
-        echo "NAME=\"Boot Disk\"" >> /tmp/ifcfg/ifcfg-$netif
-    else
-        # bridge
-	echo "TYPE=Bridge" >> /tmp/ifcfg/ifcfg-$netif
-        echo "NAME=\"Boot Disk\"" >> /tmp/ifcfg/ifcfg-$netif
-        # write separate ifcfg file for the raw eth interface
-        echo "DEVICE=$ethname" >> /tmp/ifcfg/ifcfg-$ethname
-        echo "TYPE=Ethernet" >> /tmp/ifcfg/ifcfg-$ethname
-        echo "ONBOOT=yes" >> /tmp/ifcfg/ifcfg-$ethname
-        echo "NETBOOT=yes" >> /tmp/ifcfg/ifcfg-$ethname
-        echo "HWADDR=$(cat /sys/class/net/$ethname/address)" >> /tmp/ifcfg/ifcfg-$ethname
-        echo "BRIDGE=$netif" >> /tmp/ifcfg/ifcfg-$ethname
-        echo "NAME=$ethname" >> /tmp/ifcfg/ifcfg-$ethname
-    fi
-done

modules.d/45ifcfg/check

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# ifcfg is required by network
+#[[ $1 = -d ]] && echo network
+
+exit 255

modules.d/45ifcfg/install

@@ -0,0 +1,2 @@
+#!/bin/bash
+inst_hook pre-pivot 85 "$moddir/write-ifcfg.sh"

modules.d/45ifcfg/write-ifcfg.sh

@@ -0,0 +1,70 @@
+#!/bin/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
+
+for netif in $IFACES ; do
+    mkdir -p /tmp/ifcfg/
+    # bridge?
+    unset bridge
+    if [ "$netif" = "$bridgename" ]; then
+        bridge=yes
+    fi
+    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/net.$netif.lease ]; then
+	    strstr "$ip" '*:*:*' &&
+	    echo "DHCPV6C=yes" 
+	    echo "BOOTPROTO=dhcp" 
+	else
+	    echo "BOOTPROTO=none" 
+        # If we've booted with static ip= lines, the override file is there
+	    . /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" ]; then
+        # standard interface
+	{
+            echo "HWADDR=$(cat /sys/class/net/$netif/address)"
+            echo "TYPE=Ethernet"
+            echo "NAME=\"Boot Disk\"" 
+	} >> /tmp/ifcfg/ifcfg-$netif
+    else
+        # bridge
+	{
+	    echo "TYPE=Bridge"
+            echo "NAME=\"Boot Disk\"" 
+	} >> /tmp/ifcfg/ifcfg-$netif
+        # write separate ifcfg file for the raw eth interface
+	{
+            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
+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

modules.d/50plymouth/cryptroot-ask.sh

@@ -10,36 +10,86 @@
 [ -f /tmp/cryptroot-asked-$2 ] && exit 0
 
 . /lib/dracut-lib.sh
+
+# default luksname - luks-UUID
+luksname=$2
+
+# if device name is /dev/dm-X, convert to /dev/mapper/name
+if [ "${1##/dev/dm-}" != "$1" ]; then
+    device="/dev/mapper/$(dmsetup info -c --noheadings -o name "$1")"
+else
+    device="$1"
+fi
+
+if [ -f /etc/crypttab ] && ! getargs rd_NO_CRYPTTAB; then
+    while read name dev rest; do
+	# ignore blank lines and comments
+	if [ -z "$name" -o "${name#\#}" != "$name" ]; then
+	    continue
+	fi
+
+	# UUID used in crypttab
+	if [ "${dev%%=*}" = "UUID" ]; then
+	    if [ "luks-${dev##UUID=}" = "$2" ]; then
+		luksname="$name"
+		break
+	    fi
+	
+	# path used in crypttab
+	else
+	    cdev=$(readlink -f $dev)
+	    mdev=$(readlink -f $device)
+	    if [ "$cdev" = "$mdev" ]; then
+		luksname="$name"
+		break
+	    fi
+	fi
+    done < /etc/crypttab
+    unset name dev rest
+fi
+
 LUKS=$(getargs rd_LUKS_UUID=)
 ask=1
-
+num=0
 if [ -n "$LUKS" ]; then
     ask=0
     luuid=${2##luks-}
     for luks in $LUKS; do
-	if [ "${luuid##$luks}" != "$2" ]; then
+        num=$(($num+1))
+	luks=${luks##luks-}
+	if [ "${luuid##$luks}" != "$luuid" ] || [ "$luksname" = "$luks" ]; then
 	    ask=1
 	fi
+        [ $num -ge 2 -a "$ask" = "1" ] && break
     done
 fi
+unset LUKS luks luuid
 
 if [ $ask -gt 0 ]; then
-    info "luksOpen $1 $2"
+    info "luksOpen $device $luksname"
+    if [ $num -eq 1 ]; then
+         prompt="Password for filesystem"
+    else
+         prompt="Password [$device ($luksname)]:" 
+         if [ ${#luksname} -gt 8 ]; then
+	     sluksname=${sluksname##luks-}
+             sluksname=${luksname%%${luksname##????????}}
+             prompt="Password for $device ($sluksname...)"
+         fi
+    fi
     # 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"
+	    --prompt "$prompt" \
+	    --command="/sbin/cryptsetup luksOpen -T1 $device $luksname"
     } 9>/.console.lock
 fi
+unset ask device luksname
 
 # mark device as asked
 >> /tmp/cryptroot-asked-$2
 
 udevsettle
 
-unset LUKS
-unset ask
-unset luks
 exit 0
-
+# vim:ts=8:sw=4:sts=4:et

modules.d/50plymouth/install

@@ -1,7 +1,16 @@
 #!/bin/bash
-. "$moddir"/plymouth-populate-initrd
-inst_hook cmdline 30 "$moddir/parse-plymouth.sh"
+
+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
+inst readlink

modules.d/50plymouth/installkernel

@@ -1,5 +1,5 @@
 #!/bin/bash
 # Include KMS capable drm drivers
-for modname in $(find "$srcmods/kernel/drivers/gpu/drm" -name '*.ko'); do
-    nm -uPA $modname | grep -q drm_crtc_init && instmods $modname
+for modname in $(find "$srcmods/kernel/drivers/gpu/drm" -name '*.ko' 2>/dev/null); do
+    grep -q drm_crtc_init  $modname && instmods $modname
 done

modules.d/50plymouth/parse-plymouth.sh

@@ -1,19 +0,0 @@
-initrdargs="$initrdargs rd_plytheme" 
-
-PLYMOUTH_THEMEDIR=/usr/share/plymouth/themes
-PLYMOUTH_THEME=$(getarg rd_plytheme=)
-if [ -n "$PLYMOUTH_THEME" ]; then
-    if [ -f "${PLYMOUTH_THEMEDIR}/${PLYMOUTH_THEME}/${PLYMOUTH_THEME}.plymouth" ]; then
-	info "Setting theme $PLYMOUTH_THEME"
-	(
-	    cd $PLYMOUTH_THEMEDIR;
-	    ln -fs "${PLYMOUTH_THEME}/${PLYMOUTH_THEME}.plymouth" default.plymouth 2>&1 | vinfo;       
-	)
-    else
-	warn "Theme $PLYMOUTH_THEME not found!"
-    fi
-fi
-
-unset PLYMOUTH_THEME
-unset PLYMOUTH_THEMEDIR
-

modules.d/50plymouth/plymouth-populate-initrd

@@ -30,7 +30,7 @@ if [[ $hostonly ]]; then
     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'})
+	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

modules.d/50plymouth/plymouth-pretrigger.sh

@@ -1,18 +1,23 @@
 #!/bin/sh
 
-[ -c /dev/null ] || mknod /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 >/dev/null 2>&1
+if ! getarg rd_NO_PLYMOUTH; then
+    [ -c /dev/null ] || mknod /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 >/dev/null 2>&1
 
-udevadm settle --timeout=30 2>&1 | vinfo
-[ -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 2>&1 | vinfo
+    [ -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
 
-info "Starting plymouth daemon"
-[ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session
-/bin/plymouth --show-splash 2>&1 | vinfo
+    info "Starting plymouth daemon"
+    [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session
+    /lib/udev/console_init tty0
+    /bin/plymouth --show-splash 2>&1 | vinfo
+fi
 
+
+# vim:ts=8:sw=4:sts=4:et

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

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"
+

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
+

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

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"
+

modules.d/90btrfs/check

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# We depend on udev-rules being loaded
+[ "$1" = "-d" ] && exit 0
+
+# if we don't have btrfs (btrfsctl) installed on the host system,
+# no point in trying to support it in the initramfs.
+which btrfsctl >/dev/null 2>&1 || exit 1
+
+exit 0

modules.d/90btrfs/install

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+inst_rules "$moddir/40-btrfs.rules"
+dracut_install btrfsctl

modules.d/90crypt/70-luks.rules

@@ -7,6 +7,6 @@
 SUBSYSTEM!="block", GOTO="luks_end"
 ACTION!="add|change", GOTO="luks_end"
 
-ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/sbin/initqueue --onetime /sbin/cryptroot-ask $env{DEVNAME} luks-$env{ID_FS_UUID}"
+ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/sbin/initqueue --unique --onetime --name cryptroot-ask-%k /sbin/cryptroot-ask $env{DEVNAME} luks-$env{ID_FS_UUID}"
 
 LABEL="luks_end"

modules.d/90crypt/check

@@ -19,7 +19,7 @@ is_crypt() { [[ $(get_fs_type /dev/block/$1) = crypto_LUKS ]]; }
 	check_block_and_slaves is_crypt "$rootdev" || exit 1
     else
 	# root is not on a block device, use the shotgun approach
-	blkid | grep -q crypt_LUKS || exit 1
+	blkid | grep -q crypto\?_LUKS || exit 1
     fi
 }
 

modules.d/90crypt/crypt-cleanup.sh

@@ -1,3 +1,4 @@
+#!/bin/sh
 # close everything which is not busy
 for i in /dev/mapper/luks-*; do
     cryptsetup luksClose $i >/dev/null 2>&1

modules.d/90crypt/cryptroot-ask.sh

@@ -9,32 +9,74 @@
 # we already asked for this device
 [ -f /tmp/cryptroot-asked-$2 ] && exit 0
 
+# load dm_crypt if it is not already loaded
+[ -d /sys/module/dm_crypt ] || modprobe dm_crypt
+
 . /lib/dracut-lib.sh
+
+# default luksname - luks-UUID
+luksname=$2
+
+# if device name is /dev/dm-X, convert to /dev/mapper/name
+if [ "${1##/dev/dm-}" != "$1" ]; then
+    device="/dev/mapper/$(dmsetup info -c --noheadings -o name "$1")"
+else
+    device="$1"
+fi
+
+if [ -f /etc/crypttab ] && ! getargs rd_NO_CRYPTTAB; then
+    while read name dev rest; do
+	# ignore blank lines and comments
+	if [ -z "$name" -o "${name#\#}" != "$name" ]; then
+	    continue
+	fi
+
+	# UUID used in crypttab
+	if [ "${dev%%=*}" = "UUID" ]; then
+	    if [ "luks-${dev##UUID=}" = "$2" ]; then
+		luksname="$name"
+		break
+	    fi
+	
+	# path used in crypttab
+	else
+	    cdev=$(readlink -f $dev)
+	    mdev=$(readlink -f $device)
+	    if [ "$cdev" = "$mdev" ]; then
+		luksname="$name"
+		break
+	    fi
+	fi
+    done < /etc/crypttab
+    unset name dev rest
+fi
+
 LUKS=$(getargs rd_LUKS_UUID=)
 ask=1
-
 if [ -n "$LUKS" ]; then
     ask=0
     luuid=${2##luks-}
     for luks in $LUKS; do
-	if [ "${luuid##$luks}" != "$2" ]; then
+	luks=${luks##luks-}
+	if [ "${luuid##$luks}" != "$luuid" ] || [ "$luksname" = "$luks" ]; then
 	    ask=1
+	    break
 	fi
     done
 fi
+unset LUKS luks luuid
 
 if [ $ask -gt 0 ]; then
-    info "luksOpen $1 $2"
+    info "luksOpen $device $luksname"
     # flock against other interactive activities
     { flock -s 9; 
-	echo -n "$1 is password protected " 
-	/sbin/cryptsetup luksOpen -T1 $1 $2 
+	echo -n "$device ($luksname) is password protected"
+	cryptsetup luksOpen -T1 $1 $luksname 
     } 9>/.console.lock
 fi
 
 # mark device as asked
 >> /tmp/cryptroot-asked-$2
 
-udevsettle
-
 exit 0
+# vim:ts=8:sw=4:sts=4:et

modules.d/90crypt/install

@@ -1,7 +1,8 @@
 #!/bin/bash
-inst cryptsetup
+inst cryptsetup 
 inst_rules "$moddir/70-luks.rules"
 inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
 inst_hook cmdline 30 "$moddir/parse-crypt.sh"
 inst_hook pre-pivot 30 "$moddir/crypt-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/crypt-cleanup.sh"
+inst_hook pre-pivot 31 "$moddir/crypt-cleanup.sh"
+inst /etc/crypttab

modules.d/90crypt/installkernel

@@ -1,2 +1,3 @@
 #!/bin/bash
-instmods dm_crypt cbc aes sha256 xts
+instmods dm_crypt cbc sha256 xts aes aes_generic aesni-intel aes-x86_64
+

modules.d/90crypt/parse-crypt.sh

@@ -1,5 +1,4 @@
-initrdargs="$initrdargs rd_NO_LUKS rd_LUKS_UUID" 
-
+#!/bin/sh
 if getarg rd_NO_LUKS; then
     info "rd_NO_LUKS: removing cryptoluks activation"
     rm -f /etc/udev/rules.d/70-luks.rules

modules.d/90dm/check

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+exit 255
+

modules.d/90dm/dm-pre-udev.sh

@@ -0,0 +1 @@
+modprobe dm_mod 

modules.d/90dm/install

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+modinfo -k $kernel dm_mod >/dev/null 2>&1 && \
+    inst_hook pre-udev 30 "$moddir/dm-pre-udev.sh"
+
+inst dmsetup
+
+inst dmeventd
+inst_rules 10-dm.rules 95-dm-notify.rules

modules.d/90dm/installkernel

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for i in \
+    dm-snapshot dm-delay dm-mirror dm-mod dm-queue-length \
+    dm-region-hash dm-round-robin dm-service-time dm-snapshot \
+    ; do
+    modinfo -k $kernel $i >/dev/null 2>&1 && instmods $i
+done
+

modules.d/90dmraid/61-dmraid-imsm.rules

@@ -6,14 +6,19 @@ SUBSYSTEM!="block", GOTO="dm_end"
 ACTION!="add|change", GOTO="dm_end"
 
 ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="dm_end"
-ENV{ID_FS_TYPE}=="isw_raid_member", ENV{rd_NO_MDIMSM}!="?*", GOTO="dm_end"
 
 ENV{ID_FS_TYPE}!="*_raid_member", , GOTO="dm_end"
-TEST=="/tmp/.dmraid_scan-%k", GOTO="dm_end"
 
-RUN+="/bin/sh -c '>/tmp/.dmraid_scan-%k; /bin/ln -fs /sbin/dmraid_scan /initqueue/dmraid_scan.sh'"
+ENV{ID_FS_TYPE}=="isw_raid_member", ENV{rd_NO_MDIMSM}!="?*", GOTO="dm_end"
+
+ENV{rd_NO_DM}=="?*", GOTO="dm_end"
+
+PROGRAM=="/bin/sh -c 'for i in $sys/$devpath/holders/dm-[0-9]*; do [ -e $$i ] && exit 0; done; exit 1;' ", \
+    GOTO="dm_end"
 
 ENV{DEVTYPE}!="partition", \
     RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
 
+RUN+="/sbin/initqueue --onetime --unique --settled /sbin/dmraid_scan"
+
 LABEL="dm_end"

modules.d/90dmraid/check

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# We depend on dm_mod being loaded
+[ "$1" = "-d" ] && echo dm
+
 # if we don't have dmraid installed on the host system, no point
 # in trying to support it in the initramfs.
 which dmraid >/dev/null 2>&1 || exit 1

modules.d/90dmraid/dmraid-cleanup.sh

@@ -1,2 +0,0 @@
-# close everything which is not busy
-dmraid -an >/dev/null 2>&1

modules.d/90dmraid/dmraid.sh

@@ -1,28 +1,40 @@
 #!/bin/sh
 
-if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
-    [ -h "$job" ] && rm -f "$job"
-    DM_RAIDS=$(getargs rd_DM_UUID=)
-    # run dmraid if udev has settled
-    info "Scanning for dmraid devices $DM_RAIDS"
-    if [ -n "$DM_RAIDS" ]; then
-	# only activate specified DM RAIDS
-	SETS=$(dmraid -c -s)
-	info "Found dmraid sets:"
-	echo $SETS|vinfo
-	for r in $DM_RAIDS; do 
-	    for s in $SETS; do 
-		if [ "${s##$r}" != "$s" ]; then
-		    info "Activating $s"
-		    dmraid -ay $s 2>&1 | vinfo
-                    udevsettle
-		fi
-	    done
-	done
-    else 
-	# scan and activate all DM RAIDS
-	dmraid -ay 2>&1 | vinfo
-        udevsettle
-    fi
+. /lib/dracut-lib.sh
+
+DM_RAIDS=$(getargs rd_DM_UUID=)
+
+DM_CLEANUP="no"
+
+# run dmraid if udev has settled
+info "Scanning for dmraid devices $DM_RAIDS"
+SETS=$(dmraid -c -s)
+
+if [ "$SETS" = "no raid disks" -o "$SETS" = "no raid sets" ]; then
+    return
+fi
+
+info "Found dmraid sets:"
+echo $SETS|vinfo
+
+if [ -n "$DM_RAIDS" ]; then
+    # only activate specified DM RAIDS
+    for r in $DM_RAIDS; do 
+	for s in $SETS; do 
+	    if [ "${s##$r}" != "$s" ]; then
+		info "Activating $s"
+                dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
+                [ -e "/dev/mapper/$s" ] && kpartx -a -p p "/dev/mapper/$s" 2>&1 | vinfo
+                udevsettle
+	    fi
+	done
+    done
+else 
+    # scan and activate all DM RAIDS
+    for s in $SETS; do
+	info "Activating $s"
+        dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
+        [ -e "/dev/mapper/$s" ] && kpartx -a -p p "/dev/mapper/$s" 2>&1 | vinfo
+    done
 fi
 

modules.d/90dmraid/install

@@ -1,7 +1,28 @@
 #!/bin/bash
-dracut_install dmraid partx
+dracut_install dmraid partx kpartx 
+
+inst  dmeventd
+
+if ldd $(which dmraid) | grep -q lib64; then
+    LIBDIR="/lib64"
+else
+    LIBDIR="/lib"
+fi
+
+for i in $(ls /{usr,}/$LIBDIR/libdmraid-events*.so 2>/dev/null); do
+    dracut_install $i
+done
+
+
+inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 
+
 inst "$moddir/dmraid.sh" /sbin/dmraid_scan
-inst_rules 64-md-raid.rules
+
+if [ ! -x /lib/udev/vol_id ]; then
+    inst_rules 64-md-raid.rules
+fi
+
 inst_rules "$moddir/61-dmraid-imsm.rules"
-inst_hook pre-pivot 30 "$moddir/dmraid-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/dmraid-cleanup.sh"
+inst "$moddir/dmraid-cleanup.sh" /sbin/dmraid-cleanup
+inst_hook pre-trigger 30 "$moddir/parse-dm.sh"
+

modules.d/90dmraid/parse-dm.sh

@@ -1,6 +1,5 @@
-initrdargs="$initrdargs rd_DM_UUID rd_NO_DM" 
-
-if getarg rd_NO_DM; then
+# nodmraid for anaconda / rc.sysinit compatibility
+if getarg rd_NO_DM || getarg nodmraid; then
     info "rd_NO_DM: removing DM RAID activation"
-    rm /etc/udev/rules.d/61-dmraid*.rules
-fi
+    udevproperty rd_NO_DM=1
+fi

modules.d/90dmsquash-live/dmsquash-live-genrules.sh

@@ -4,10 +4,11 @@ if [ "${root%%:*}" = "live" ]; then
     	${root#live:/dev/} 
     printf 'SYMLINK=="%s", SYMLINK+="live"\n' \
 	${root#live:/dev/} 
-    printf 'KERNEL=="%s", RUN+="/sbin/initqueue --onetime /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
+    printf 'KERNEL=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
     	${root#live:/dev/} 
-    printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --onetime /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
+    printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
 	${root#live:/dev/} 
 
     ) >> /etc/udev/rules.d/99-live-mount.rules
+    echo '[ -e /dev/root ]' > /initqueue-finished/dmsquash.sh
 fi

modules.d/90dmsquash-live/dmsquash-live-root

@@ -20,6 +20,7 @@ live_dir=$(getarg live_dir)
 [ -z "$live_dir" ] && live_dir="LiveOS"
 getarg live_ram && live_ram="yes"
 getarg reset_overlay && reset_overlay="yes"
+getarg readonly_overlay && readonly_overlay="--readonly" || readonly_overlay=""
 overlay=$(getarg overlay)
 
 # FIXME: we need to be able to hide the plymouth splash for the check really
@@ -31,7 +32,7 @@ getarg check || check=""
 if [ -n "$check" ]; then
     checkisomd5 --verbose $livedev || :
     if [ $? -ne 0 ]; then
-	echo "CD check failed!"
+	die "CD check failed!"
 	exit 1
     fi
 fi
@@ -43,7 +44,7 @@ getarg rw && liverw=rw
 mount -n -t $fstype -o $liverw $livedev $NEWROOT
 RES=$?
 if [ "$RES" != "0" ]; then
-    echo "Failed to mount block device of live image"
+    die "Failed to mount block device of live image"
     exit 1
 fi
 
@@ -86,7 +87,7 @@ do_live_overlay() {
 
     if [ -z "$setup" ]; then
         if [ -n "$devspec" -a -n "$pathspec" ]; then
-           echo "Unable to find persistent overlay; using temporary"
+           warn "Unable to find persistent overlay; using temporary"
            sleep 5
         fi
 
@@ -95,7 +96,7 @@ do_live_overlay() {
     fi
 
     # set up the snapshot
-    echo 0 `blockdev --getsize $BASE_LOOPDEV` snapshot $BASE_LOOPDEV $OVERLAY_LOOPDEV p 8 | dmsetup create live-rw
+    echo 0 `blockdev --getsz $BASE_LOOPDEV` snapshot $BASE_LOOPDEV $OVERLAY_LOOPDEV p 8 | dmsetup create $readonly_overlay live-rw
 }
 
 # live cd helper function
@@ -168,10 +169,15 @@ fi
 if [ -b "$OSMIN_LOOPDEV" ]; then
     # set up the devicemapper snapshot device, which will merge
     # the normal live fs image, and the delta, into a minimzied fs image
-    echo "0 $( blockdev --getsize $BASE_LOOPDEV ) snapshot $BASE_LOOPDEV $OSMIN_LOOPDEV p 8" | dmsetup create --readonly live-osimg-min
+    echo "0 $( blockdev --getsz $BASE_LOOPDEV ) snapshot $BASE_LOOPDEV $OSMIN_LOOPDEV p 8" | dmsetup create --readonly live-osimg-min
+fi
+
+ROOTFLAGS="$(getarg rootflags)"
+if [ -n "$ROOTFLAGS" ]; then
+    ROOTFLAGS="-o $ROOTFLAGS"
 fi
 
 ln -s /dev/mapper/live-rw /dev/root
-printf '/bin/mount /dev/mapper/live-rw %s\n' "$NEWROOT" > /mount/01-$$-live.sh
+printf '/bin/mount %s /dev/mapper/live-rw %s\n' "$ROOTFLAGS" "$NEWROOT" > /mount/01-$$-live.sh
 
 exit 0

modules.d/90dmsquash-live/dmsquash-liveiso-genrules.sh

@@ -0,0 +1,7 @@
+if [ "${root%%:*}" = "liveiso" ]; then
+    (
+     printf 'KERNEL=="loop0", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root `/sbin/losetup -f --show %s`"\n' \
+	  ${root#liveiso:}
+    ) >> /etc/udev/rules.d/99-liveiso-mount.rules
+    echo '[ -e /dev/root ]' > /initqueue-finished/dmsquash.sh
+fi

modules.d/90dmsquash-live/install

@@ -1,8 +1,10 @@
 #!/bin/bash
+dracut_install umount
 inst dmsetup
 inst blkid
 inst dd
 inst losetup
+inst grep
 
 # eject might be a symlink to consolehelper
 if [ -L /usr/bin/eject ]; then
@@ -15,6 +17,7 @@ inst blockdev
 which checkisomd5 >/dev/null 2>&1 && inst checkisomd5
 inst_hook cmdline 30 "$moddir/parse-dmsquash-live.sh"
 inst_hook pre-udev 30 "$moddir/dmsquash-live-genrules.sh"
+inst_hook pre-udev 30 "$moddir/dmsquash-liveiso-genrules.sh"
 inst "$moddir/dmsquash-live-root" "/sbin/dmsquash-live-root"
 # should probably just be generally included
 inst_rules 60-cdrom_id.rules

modules.d/90dmsquash-live/parse-dmsquash-live.sh

@@ -1,3 +1,4 @@
+#!/bin/sh
 # live images are specified with
 # root=live:backingdev
 
@@ -29,12 +30,14 @@ case "$liveroot" in
 	root="${root#live:}"
 	root="live:/dev/disk/by-uuid/${root#UUID=}"
         rootok=1 ;;
-    /dev/*)
-	root="live:${root}"
+    live:/*.[Ii][Ss][Oo]|/*.[Ii][Ss][Oo])
+	root="${root#live:}"
+	root="liveiso:${root}"
+	rootok=1 ;;
+    live:/dev/*)
         rootok=1 ;;
 esac
-echo "root was $root, liveroot is now $liveroot"
-
+info "root was $root, liveroot is now $liveroot"
 
 # make sure that init doesn't complain
 [ -z "$root" ] && root="live"

modules.d/90kernel-modules/install

@@ -1,3 +1,4 @@
 #!/bin/bash
 [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf
 dracut_install $(find /etc/modprobe.d/ -type f -name '*.conf')
+inst_hook cmdline 01 "$moddir/parse-kernel.sh"

modules.d/90kernel-modules/installkernel

@@ -3,19 +3,36 @@ if [[ -z $drivers ]]; then
     block_module_test() {
 	local blockfuncs='ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device'
 
-	 nm -uPA "$1" | egrep -q "$blockfuncs"
+	egrep -q "$blockfuncs" "$1"
     }
-    instmods sd_mod $(filter_kernel_modules block_module_test)
-    # if not on hostonly mode, install all known filesystems.
-    if [[ $hostonly = '' ]]; then
-	instmods '=fs'
+    hostonly='' instmods sr_mod sd_mod scsi_dh scsi_dh_rdac scsi_dh_emc
+    hostonly='' instmods pcmcia firewire-ohci
+    hostonly='' instmods usb_storage sdhci sdhci-pci
+
+    # install keyboard support
+    hostonly='' instmods atkbd i8042 usbhid hid-apple ehci-hcd ohci-hcd uhci-hcd
+
+    instmods "=drivers/pcmcia" =ide "=drivers/usb/storage"
+    instmods $(filter_kernel_modules block_module_test) 
+    # if not on hostonly mode, install all known filesystems if the required list is not set via the filesystems variable
+    if ! [[ $hostonly ]]; then
+	if [[ -z $filesystems ]]; then
+	    instmods '=fs'
+	    # hardcoded list of exceptions
+	    # to save a lot of space
+	    rm -fr ${initdir}/lib/modules/*/kernel/fs/ocfs2
+	else
+	    instmods $filesystems
+	fi
     else
-	instmods $(get_fs_type "/dev/block/$(find_root_block_device)")
+	hostonly='' instmods $(get_fs_type "/dev/block/$(find_root_block_device)")
     fi
-    # hardcoded list of exceptions
-    rm -fr ${initdir}/lib/modules/*/kernel/fs/ocfs2
 else
-  instmods $drivers
+  hostonly='' instmods $drivers $filesystems
 fi
 
+[[ $add_drivers ]] && hostonly='' instmods $add_drivers
+
+# force install of scsi_wait_scan
+hostonly='' instmods scsi_wait_scan
 

modules.d/90kernel-modules/parse-kernel.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for p in $(getargs rdloaddriver=); do 
+	modprobe $p
+done

modules.d/90lvm/64-lvm-vol_id.rules

@@ -1,22 +0,0 @@
-# hacky rules to try to activate lvm when we get new block devs...
-#
-# Copyright 2008, Red Hat, Inc.
-# Jeremy Katz <katzj@redhat.com>
-
-
-SUBSYSTEM!="block", GOTO="lvm_end"
-ACTION!="add|change", GOTO="lvm_end"
-KERNEL=="dm-[0-9]*", ACTION!="change", GOTO="lvm_end"
-
-ENV{ID_FS_TYPE}=="LVM2_member", \
-    TEST!="/tmp/.lvm_scan-%k", \
-    RUN+="/bin/sh -c '>/tmp/.lvm_scan-%k; /bin/ln -fs /sbin/lvm_scan /initqueue/lvm_scan.sh'"
-
-KERNEL!="dm-[0-9]*", GOTO="lvm_end"
-
-OPTIONS="link_priority=-100"
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
-
-
-LABEL="lvm_end"

modules.d/90lvm/64-lvm.rules

@@ -7,9 +7,13 @@
 SUBSYSTEM!="block", GOTO="lvm_end"
 ACTION!="add|change", GOTO="lvm_end"
 KERNEL=="dm-[0-9]*", ACTION=="add", GOTO="lvm_end"
+ENV{ID_FS_TYPE}!="LVM2_member", GOTO="lvm_end"
 
-ENV{ID_FS_TYPE}=="LVM2_member", \
-    TEST!="/tmp/.lvm_scan-%k", \
-    RUN+="/bin/sh -c '>/tmp/.lvm_scan-%k; /bin/ln -fs /sbin/lvm_scan /initqueue/lvm_scan.sh'"
+
+PROGRAM=="/bin/sh -c 'for i in $sys/$devpath/holders/dm-[0-9]*; do [ -e $$i ] && exit 0; done; exit 1;' ", \
+    GOTO="lvm_end"
+
+RUN+="/sbin/initqueue --settled --onetime --unique /sbin/lvm_scan"
+RUN+="/bin/sh -c '>/tmp/.lvm_scan-%k;'"
 
 LABEL="lvm_end"

modules.d/90lvm/check

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# We depend on dm_mod being loaded
+[ "$1" = "-d" ] && echo dm
+
 # No point trying to support lvm if the binaries are missing
 which lvm >/dev/null 2>&1 || exit 1
 

modules.d/90lvm/install

@@ -1,16 +1,29 @@
 #!/bin/bash
 inst lvm
-if [ -x /lib/udev/vol_id ]; then
-    inst_rules "$moddir/64-lvm-vol_id.rules" 64-device-mapper.rules
-else
-    inst_rules "$moddir/64-lvm.rules" 64-device-mapper.rules
+
+inst_rules "$moddir/64-lvm.rules" 64-lvm.rules
+
+if [[ $hostonly ]] || [[ $lvmconf = "yes" ]]; then 
+    if [ -f /etc/lvm/lvm.conf ]; then
+	inst /etc/lvm/lvm.conf
+	# FIXME: near-term hack to establish read-only locking;
+	# use command-line lvm.conf editor once it is available
+	sed -i -e 's/\(^[[:space:]]*\)locking_type[[:space:]]*=[[:space:]]*[[:digit:]]/\1locking_type = 4/' ${initdir}/etc/lvm/lvm.conf
+    fi
 fi
 
-if [[ $hostonly ]]; then 
-    [ -f /etc/lvm/lvm.conf ] && inst /etc/lvm/lvm.conf
-fi
+inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 11-dm-lvm.rules
 
 inst "$moddir/lvm_scan.sh" /sbin/lvm_scan
 inst_hook cmdline 30 "$moddir/parse-lvm.sh"
-inst_hook pre-pivot 30 "$moddir/lvm-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/lvm-cleanup.sh"
+
+
+if ldd $(which lvm) | grep -q lib64; then
+    LIBDIR="/lib64"
+else
+    LIBDIR="/lib"
+fi
+
+for i in $(ls /{usr,}/$LIBDIR/libdevmapper-event-lvm*.so 2>/dev/null); do
+    dracut_install $i
+done

modules.d/90lvm/lvm-cleanup.sh

@@ -1,2 +0,0 @@
-# stop everything which is not busy
-lvm vgchange -a n >/dev/null 2>&1

modules.d/90lvm/lvm_scan.sh

@@ -1,38 +1,77 @@
 #!/bin/sh
 
-if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
-    [ -h "$job" ] && rm -f "$job"
-    # run lvm scan if udev has settled
+# run lvm scan if udev has settled
 
-    VGS=$(getargs rd_LVM_VG=)
+. /lib/dracut-lib.sh
 
-    [ -d /etc/lvm ] || mkdir -p /etc/lvm
-    # build a list of devices to scan
-    lvmdevs=$(
-	for f in /tmp/.lvm_scan-*; do
-	    [ -e "$f" ] || continue
-	    echo -n "${f##/tmp/.lvm_scan-} "
-	done
-	)
+VGS=$(getargs rd_LVM_VG=)
+LVS=$(getargs rd_LVM_LV=)
 
-    if [ ! -e /etc/lvm/lvm.conf ]; then 
-        {
-	    echo 'devices {';
-	    echo -n '    filter = [ '
-	    for dev in $lvmdevs; do
-		printf '"a|^/dev/%s$|", ' $dev;
-	    done;
-	    echo '"r/.*/" ]';
-	    echo 'types = [ "blkext", 1024 , "cciss0", 1024 ]'
-	    echo '}';	  
-        } > /etc/lvm/lvm.conf
-	lvmwritten=1
-    fi
-    info "Scanning devices $lvmdevs for LVM volume groups $VGS"
-    lvm vgscan 2>&1 | vinfo
-    lvm vgchange -ay $VGS 2>&1 | vinfo
-    [ "$lvmwritten" ] && rm -f /etc/lvm/lvm.conf
-    unset lvmwritten
-    udevsettle
+[ -d /etc/lvm ] || mkdir -p /etc/lvm
+# build a list of devices to scan
+lvmdevs=$(
+    for f in /tmp/.lvm_scan-*; do
+	[ -e "$f" ] || continue
+	echo -n "${f##/tmp/.lvm_scan-} "
+    done
+)
+
+if [ ! -e /etc/lvm/lvm.conf ]; then 
+    {
+	echo 'devices {';
+	echo -n '    filter = [ '
+	for dev in $lvmdevs; do
+	    printf '"a|^/dev/%s$|", ' $dev;
+	done;
+	echo '"r/.*/" ]';
+	echo '}';	  
+	# establish read-only locking
+	echo 'global {';
+	echo '    locking_type = 4';
+	echo '}';
+    } > /etc/lvm/lvm.conf
+    lvmwritten=1
 fi
 
+check_lvm_ver() {
+    # --poll is supported since 2.2.57
+    [ $1 -lt 2 ] && return 1
+    [ $1 -gt 2 ] && return 0
+    # major is 2
+    [ $2 -lt 2 ] && return 1
+    [ $2 -gt 2 ] && return 0
+    # minor is 2, check for 
+    # greater or equal 57
+    [ $3 -ge 57 ] && return 0
+    return 1
+}
+
+nopoll=$(
+    # hopefully this output format will never change, e.g.:
+    #   LVM version:     2.02.53(1) (2009-09-25)
+    lvm version 2>/dev/null | \
+	(
+	IFS=. read maj min sub; 
+	maj=${maj##*:}; 
+	sub=${sub%% *}; sub=${sub%%\(*}; 
+	check_lvm_ver $maj $min $sub && \
+	    echo " --poll n ") 2>/dev/null )
+
+if [ -n "$LVS" ] ; then
+    info "Scanning devices $lvmdevs for LVM logical volumes $LVS"
+    lvm lvscan --ignorelockingfailure 2>&1 | vinfo
+    lvm lvchange -ay --ignorelockingfailure $nopoll --ignoremonitoring $LVS 2>&1 | vinfo
+fi
+
+if [ -z "$LVS" -o -n "$VGS" ]; then
+    info "Scanning devices $lvmdevs for LVM volume groups $VGS"
+    lvm vgscan --ignorelockingfailure 2>&1 | vinfo
+    lvm vgchange -ay --ignorelockingfailure $nopoll --ignoremonitoring $VGS 2>&1 | vinfo
+fi
+
+if [ "$lvmwritten" ]; then
+    rm -f /etc/lvm/lvm.conf
+    ln -s /sbin/lvm-cleanup /pre-pivot/30-lvm-cleanup.sh 2>/dev/null
+    ln -s /sbin/lvm-cleanup /pre-pivot/31-lvm-cleanup.sh 2>/dev/null
+fi
+unset lvmwritten