version 007

10i18n/README: typo corrected

.gitignore

@@ -1,3 +1,8 @@
 test*.img
 modules.d/99base/switch_root
 *~
+dracut.kernel.7
+dracut.conf.5
+dracut.8
+dracut-catimages.8
+dracut-gencmdline.8

AUTHORS

@@ -1,13 +1,15 @@
 Harald Hoyer <harald@redhat.com>
 Victor Lowther <victor.lowther@gmail.com>
-Warren Togami <wtogami@redhat.com>
 Philippe Seewer <philippe.seewer@bfh.ch>
+Warren Togami <wtogami@redhat.com>
 Jeremy Katz <katzj@redhat.com>
 David Dillow <dave@thedillows.org>
+Amadeusz Żołnowski <aidecoe@aidecoe.name>
 Andreas Thienemann <andreas@bawue.net>
 Hans de Goede <hdegoede@redhat.com>
 Peter Jones <pjones@redhat.com>
 Luca Berra <bluca@comedia.it>
+Andrey Borzenkov <arvidjaar@mail.ru>
 Marc Grimme <grimme@atix.de>
 Bill Nottingham <notting@redhat.com>
 Daniel Drake <dsd@laptop.org>
@@ -16,15 +18,22 @@ Lance Albertson <lance@osuosl.org>
 Michael Ploujnikov <plouj@somanetworks.com>
 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
 Dan Horák <dan@danny.cz>
-Andrey Borzenkov <arvidjaar@mail.ru>
+Joey Boggs <jboggs@redhat.com>
+Alexander Todorov <atodorov@redhat.com>
+Andy Lutomirski <luto@mit.edu>
+Dan Horák <dhorak@redhat.com>
 Dave Jones <davej@redhat.com>
+Frederic Crozat <fcrozat@mandriva.com>
 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 Luca Berra <bluca@vodka.it>
+Matt <smoothsailing72@hotmail.com>
 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>
+Ville Skyttä <ville.skytta@iki.fi>
 Yanko Kaneti <yaneti@declera.com>

Makefile

@@ -1,4 +1,4 @@
-VERSION=004
+VERSION=007
 GITVERSION=$(shell [ -d .git ] && git rev-list  --abbrev-commit  -n 1 HEAD  |cut -b 1-8)
 
 prefix ?= /usr
@@ -8,6 +8,7 @@ sysconfdir ?= ${prefix}/etc
 sbindir ?= ${prefix}/sbin
 mandir ?= ${prefix}/share/man
 
+manpages = dracut.8 dracut.kernel.7 dracut.conf.5 dracut-catimages.8  dracut-gencmdline.8
 
 .PHONY: install clean archive rpm testimage test all check AUTHORS
 
@@ -17,7 +18,10 @@ else
 targets = 
 endif
 
-all: $(targets)
+all: $(targets) $(manpages)
+
+%: %.xml
+	xsltproc -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 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	
@@ -27,7 +31,7 @@ install:
 	mkdir -p $(DESTDIR)$(sbindir)
 	mkdir -p $(DESTDIR)$(sysconfdir)
 	mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
-	mkdir -p $(DESTDIR)$(mandir)/man{5,8}
+	mkdir -p $(DESTDIR)$(mandir)/man{5,7,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
@@ -37,22 +41,27 @@ 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
+	install -m 0644 dracut.kernel.7 $(DESTDIR)$(mandir)/man7
 ifeq (1,${WITH_SWITCH_ROOT})
 	rm $(DESTDIR)$(pkglibdir)/modules.d/99base/switch_root
 endif
 
 clean:
-	rm -f *~
-	rm -f modules.d/99base/switch_root
-	rm -f test-*.img
-	rm -f dracut-*.rpm dracut-*.tar.bz2
-	make -C test clean
+	$(RM) *~
+	$(RM) */*~
+	$(RM) */*/*~
+	$(RM) modules.d/99base/switch_root
+	$(RM) test-*.img
+	$(RM) dracut-*.rpm dracut-*.tar.bz2
+	$(RM) $(manpages)
+	$(MAKE) -C test clean
 
 archive: dracut-$(VERSION)-$(GITVERSION).tar.bz2
 
@@ -82,7 +91,7 @@ check: all
 	@ret=0;for i in modules.d/99base/init modules.d/*/*.sh; do \
 		dash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret
-	make -C test check
+	$(MAKE) -C test check
 
 testimage: all
 	./dracut -l -a debug -f test-$(shell uname -r).img $(shell uname -r)

NEWS

@@ -1,3 +1,47 @@
+dracut-007
+==========
+- module i18n is no longer fedora/red hat specific (Amadeusz Żołnowski)
+- distribution specific conf file
+- bootchartd support
+- debug module now has fsck
+- use "hardlink", if available, to safe some space
+- /etc/dracut.conf can be overwritten by settings in /etc/dracut.conf.d/*.conf
+- gentoo splash module
+- --ignore-kernel-modules option
+- crypto keys on external devices support
+- bugfixes
+
+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

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/control

@@ -3,13 +3,14 @@ Section: utils
 Priority: optional
 Maintainer: Philippe Seewer <philippe.seewer@bfh.ch>
 Build-Depends: debhelper (>= 5.0), cdbs
-Standards-Version: 3.8.3
+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

debian/dracut.dirs

@@ -1,6 +1,7 @@
 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
@@ -15,8 +16,10 @@ 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.install

@@ -1,10 +1,12 @@
 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
@@ -19,6 +21,7 @@ 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

debian/dracut.manpages

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

dracut

@@ -46,8 +46,12 @@ Creates initial ramdisk images for preloading modules
                         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
+  --ignore-kernel-modules
+                        Don't try to load modules. It automatically implies
+                        '--no-kernel'. It's assumed that everything needed
+                        is built into kernel.
+  --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
@@ -57,12 +61,15 @@ Creates initial ramdisk images for preloading modules
   -v, --verbose         Verbose output during the build process
   -c, --conf [FILE]     Specify configuration file to use.
                          Default: /etc/dracut.conf
+  --confdir [DIR]       Specify configuration directory to use *.conf files from.
+                         Default: /etc/dracut.conf.d
   -l, --local           Local mode. Use modules from the current working
                          directory instead of the system-wide installed in
                          /usr/share/dracut/modules.d.
                          Useful when running dracut from a git checkout.
-  -H, --hostonly          Host-Only mode: Install only what is needed for
+  -H, --hostonly        Host-Only mode: Install only what is needed for
                          booting the local host instead of a generic host.
+  --fstab               Use /etc/fstab to determine the root device.
   -i, --include [SOURCE] [TARGET]
                         Include the files in the SOURCE directory into the
                          Target directory in the final initramfs.
@@ -74,16 +81,20 @@ Creates initial ramdisk images for preloading modules
 while (($# > 0)); do
     case $1 in
 	-f|--force) force=yes;;
-	-m|--modules) dracutmodules_l="$2"; shift;;
-	-o|--omit) omit_dracutmodules_l="$2"; shift;;
-	-a|--add) add_dracutmodules_l="$2"; shift;;
-	-d|--drivers) drivers_l="$2"; shift;;
-	--add-drivers) add_drivers_l="$2"; shift;;
-	--filesystems) filesystems_l="$2"; shift;;
+	-m|--modules) dracutmodules_l="$dracutmodules_l $2"; shift;;
+	-o|--omit) omit_dracutmodules_l="$omit_dracutmodules_l $2"; shift;;
+	-a|--add) add_dracutmodules_l="$add_dracutmodules_l $2"; shift;;
+	-d|--drivers) drivers_l="$drivers_l $2"; shift;;
+	--add-drivers) add_drivers_l="$add_drivers_l $2"; shift;;
+	--filesystems) filesystems_l="$filesystems_l $2"; shift;;
 	-k|--kmoddir) drivers_dir_l="$2"; shift;;
-	--fwdir) fw_dir_l="$2"; shift;;
+	--fwdir) fw_dir_l="$fw_dir_l:$2"; shift;;
 	--kernel-only) kernel_only="yes"; no_kernel="no";;
 	--no-kernel) kernel_only="no"; no_kernel="yes";;
+    --ignore-kernel-modules) kernel_only="no"; no_kernel="yes"
+        ignore_kmodules="yes"
+        omit_dracutmodules_l+=\ kernel-modules
+        ;;
 	--strip) do_strip_l="yes";;
 	--nostrip) do_strip_l="no";;
         --mdadmconf) mdadmconf_l="yes";;
@@ -94,8 +105,10 @@ while (($# > 0)); do
 	--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" ;;
+	--fstab) use_fstab_l="yes" ;;
 	-i|--include) include_src="$2"; include_target="$3"; shift 2;;
 	-I|--install) install_items="$2"; shift;;
 	-*) printf "\nUnknown option: %s\n\n" "$1" >&2; usage; exit 1;;
@@ -122,25 +135,40 @@ if [[ ! -f $conffile ]]; then
     [[ $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 file
 [[ -f $conffile ]] && . "$conffile"
 
+# source our config dir
+if [ "$confdir" ] && [  -d "$confdir" ]; then
+    for f in "$confdir"/*.conf; do 
+	[ -e "$f" ] && . "$f"
+    done
+fi
+
+# these optins add to the stuff in the config file
+[[ $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
-[[ $add_drivers_l ]] && add_drivers=$add_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
+[[ $use_fstab_l ]] && use_fstab=$use_fstab_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//:/ }
 
@@ -164,10 +192,17 @@ case $dracutmodules in
 esac
 
 [[ $2 ]] && kernel=$2 || kernel=$(uname -r)
-[[ $1 ]] && outfile=$(readlink -f $1) || outfile="/boot/initramfs-$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
@@ -175,7 +210,18 @@ if [[ -f $outfile && ! $force ]]; then
     exit 1
 fi
 
-if ! [[ -w $(dirname $outfile) ]]; then
+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
@@ -193,7 +239,8 @@ chmod 755 "$initdir"
 
 export initdir hookdirs dracutbasedir dracutmodules drivers \
     fw_dir drivers_dir debug beverbose no_kernel kernel_only \
-    add_drivers mdadmconf lvmconf filesystems
+    add_drivers mdadmconf lvmconf filesystems ignore_kmodules \
+    use_fstab
 
 if [[ $kernel_only != yes ]]; then
     # Create some directory structure first
@@ -210,6 +257,7 @@ check_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
+	dinfo "*** Sourcing module $mod"
 	if [[ $kernel_only = yes ]]; then
 	    [[ -x $moddir/installkernel ]] && . "$moddir/installkernel"
 	else
@@ -233,9 +281,6 @@ if [[ -d $initdir/lib/modules/$kernel ]]; then
     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"/*
@@ -246,11 +291,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
@@ -259,11 +308,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 -or -path '/lib/modules/*.ko' \) -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
         #
@@ -277,7 +324,12 @@ if [[ $do_strip = yes ]] ; then
     done
 fi
 
-( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet |gzip -9 > "$outfile"; ) 
+type hardlink &>/dev/null && {
+	hardlink "$initdir" 2>&1
+}
+
+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

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

@@ -1,52 +0,0 @@
-.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-catimages.8.xml

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

dracut-functions

@@ -24,6 +24,37 @@ IF_dynamic=""
 # Generic substring function.  If $2 is in $1, return 0.
 strstr() { [[ $1 =~ $2 ]]; }
 
+# Create all subdirectories for given path without creating the last element.
+# $1 = path
+mksubdirs() { mkdir -p ${1%/*}; }
+
+# 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
     [[ $dracutbasedir = /usr/share/dracut ]] && \
@@ -50,7 +81,23 @@ derror() {
     [[ -w $dracutlogfile ]] && echo "E: $@" >>"$dracutlogfile"
 }
 
+# Function prints global variables in format name=value line by line.
+# $@ = list of global variables' name
+print_vars() {
+    local var value
+
+    for var in $@
+    do
+        value=$(eval echo \$$var)
+        [[ ${value} ]] && echo "${var}=\"${value}\""
+    done
+}
+
 get_fs_env() {
+    [[ $1 ]] || return
+    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
@@ -61,6 +108,13 @@ get_fs_env() {
 }
 
 get_fs_type() (
+    [[ $1 ]] || return
+    if [[ $1 != ${1#/dev/block/nfs:} ]] \
+	|| [[ $1 != ${1#/dev/block/nfs3:} ]] \
+	|| [[ $1 != ${1#/dev/block/nfs4:} ]]; then
+	echo "nfs"
+	return
+    fi
     get_fs_env $1 || return
     echo $ID_FS_TYPE
 )
@@ -72,15 +126,35 @@ get_fs_uuid() (
 
 # finds the major:minor of the block device backing the root filesystem.
 find_block_device() {
-    local rootdev blkdev fs type opts misc
-    while read blkdev fs type opts misc; do
-	[[ $blkdev = rootfs ]] && continue # skip rootfs entry
-	[[ $fs = $1 ]] && { rootdev=$blkdev; break; } # we have a winner!
-    done < /proc/mounts
-    [[ -b $rootdev ]] || return 1 # oops, not a block device.
-    # get major/minor for the device
-    ls -nLl "$rootdev" | \
-	(read x x x x maj min x; maj=${maj//,/}; echo $maj:$min)
+    local x mpt majmin dev fs misc maj min
+    if [[ $use_fstab != yes ]]; then	
+	while read x x majmin x mpt x x fs misc; do
+            [[ $fs = nfs ]] && { echo $dev; return 0;}
+            [[ $fs = nfs3 ]] && { echo $dev; return 0;}
+            [[ $fs = nfs4 ]] && { echo $dev; return 0;}
+	    if [[ $mpt = $1 ]] && [[ ${majmin#0:} = $majmin ]]; then
+		echo $majmin; 
+		return 0 # we have a winner!
+	    fi
+	done < /proc/self/mountinfo       
+    fi
+    # fall back to /etc/fstab    
+    while read dev mpt fs misc; do
+	if [[ $mpt = $1 ]]; then
+            [[ $fs = nfs ]] && { echo $dev; return 0;}
+            [[ $fs = nfs3 ]] && { echo $dev; return 0;}
+            [[ $fs = nfs4 ]] && { echo $dev; return 0;}
+            [[ $dev != ${dev#UUID=} ]] && dev=/dev/disk/by-uuid/${dev#UUID=}
+            [[ $dev != ${dev#LABEL=} ]] && dev=/dev/disk/by-label/${dev#LABEL=}
+	    [[ -b $dev ]] || return 1 # oops, not a block device.
+	    ls -nLl "$dev" | { 
+		read x x x x maj min x;
+		maj=${maj//,/}; 
+		echo $maj:$min; 
+	    } && return 0
+	fi
+    done < /etc/fstab
+    return 1;
 }
 
 find_root_block_device() { find_block_device /; }
@@ -94,6 +168,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
@@ -177,11 +254,36 @@ inst_simple() {
     cp -pfL "$src" "${initdir}$target"
 }
 
+# find symlinks linked to given library file
+# $1 = library file
+# Function searches for symlinks by stripping version numbers appended to
+# library filename, checks if it points to the same target and finally
+# prints the list of symlinks to stdout.
+#
+# Example:
+# rev_lib_symlinks libfoo.so.8.1
+# output: libfoo.so.8 libfoo.so
+# (Only if libfoo.so.8 and libfoo.so exists on host system.)
+rev_lib_symlinks() {
+    [[ ! $1 ]] && return 0
+
+    local fn="$1" orig="$(readlink -f "$1")" links=''
+
+    [[ ${fn} =~ .*\.so\..* ]] || return 1
+
+    until [[ ${fn##*.} == so ]]; do
+        fn="${fn%.*}"
+        [[ -L ${fn} && $(readlink -f "${fn}") == ${orig} ]] && links+=" ${fn}"
+    done
+
+    echo ${links}
+}
+
 # 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}
+    local src=$1 dest=${2:-$1} lib reallib symlink
     [[ -e $initdir$dest ]] && return 0
     if [[ -L $src ]]; then
 	reallib=$(readlink -f "$src")
@@ -192,6 +294,14 @@ inst_library() {
     else
 	inst_simple "$src" "$dest"
     fi
+
+    # Create additional symlinks.  See rev_symlinks description.
+    for symlink in $(rev_lib_symlinks $src) $(rev_lib_symlinks $reallib); do
+        [[ ! -e $initdir$symlink ]] && {
+            dinfo "Creating extra symlink: $symlink"
+            inst_symlink $symlink
+        }
+    done
 }
 
 # find a binary.  If we were not passed the full path directly,
@@ -215,7 +325,7 @@ inst_binary() {
     local LDSO NAME IO FILE ADDR I1 n f TLIBDIR
     [[ -e $initdir$target ]] && return 0
     # I love bash!
-    ldd $bin 2>/dev/null | while read line; do
+    LC_ALL=C ldd $bin 2>/dev/null | while read line; do
 	[[ $line = 'not a dynamic executable' ]] && return 1
 	if [[ $line =~ not\ found ]]; then
 	    derror "Missing a shared library required by $bin."
@@ -282,12 +392,14 @@ find_rule() {
 # udev rules always get installed in the same place, so
 # create a function to install them to make life simpler.
 inst_rules() { 
-    local target=/etc/udev/rules.d
+    local target=/etc/udev/rules.d rule found
+
     inst_dir "/lib/udev/rules.d"
     inst_dir "$target"
     for rule in "$@"; do 
-	rule=$(find_rule "$rule") && \
-	    inst_simple "$rule" "$target/${rule##*/}"
+        found=$(find_rule "$rule") && \
+            inst_simple "$found" "$target/${found##*/}" \
+            || dinfo "Skipping udev rule: $rule"
     done
 }
 
@@ -348,10 +460,58 @@ dracut_install() {
     done
 }
 
+# install function decompressing the target and handling symlinks
+# $@ = list of compressed (gz or bz2) files or symlinks pointing to such files
+#
+# Function install targets in the same paths inside overlay but decompressed
+# and without extensions (.gz, .bz2).
+inst_decompress() {
+    local src dst realsrc realdst cmd
+
+    for src in $@
+    do
+        case ${src} in
+            *.gz) cmd='gzip -d' ;;
+            *.bz2) cmd='bzip2 -d' ;;
+            *) return 1 ;;
+        esac
+
+        if [[ -L ${src} ]]
+        then
+            realsrc="$(readlink -f ${src})" # symlink target with extension
+            dst="${src%.*}" # symlink without extension
+            realdst="${realsrc%.*}" # symlink target without extension
+            mksubdirs "${initdir}/${src}"
+            # Create symlink without extension to target without extension.
+            ln -s "${realdst}" "${initdir}/${dst}"
+        fi
+
+        # If the source is symlink we operate on its target.
+        [[ ${realsrc} ]] && src=${realsrc}
+        inst ${src}
+        # Decompress with chosen tool.  We assume that tool changes name e.g.
+        # from 'name.gz' to 'name'.
+        ${cmd} "${initdir}${src}"
+    done
+}
+
+# It's similar to above, but if file is not compressed, performs standard
+# install.
+# $@ = list of files
+inst_opt_decompress() {
+    local src
+
+    for src in $@
+    do
+        inst_decompress "${src}" || inst "${src}"
+    done
+}
+
 check_module_deps() {
     local moddir dep ret
     # if we are already set to be loaded, we do not have to be checked again.
-    strstr "$mods_to_load" " $1 " && return
+    strstr " $mods_to_load " " $1 " && return
+    strstr " $omit_dracutmodules " " $1 " && return 1
     # turn a module name into a directory, if we can.
     moddir=$(echo ${dracutbasedir}/modules.d/??${1})
     [[ -d $moddir && -x $moddir/install ]] || return 1
@@ -372,35 +532,61 @@ check_module_deps() {
 
 should_source_module() {
     local dep
+    local ret
     if [[ $kernel_only = yes ]]; then
         [[ -x $1/installkernel ]] && return 0
         return 1
     fi
     [[ -x $1/install ]] || [[ -x $1/installkernel ]] || return 1
     [[ -x $1/check ]] || return 0
-    "$1/check" $hostonly || return 1
+    "$1/check" $hostonly || continue
     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() {
+    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
+	strstr " $mods_to_load " " $mod " && continue
 	# This should never happen, but...
 	[[ -d $moddir ]] || continue
-	[[ $dracutmodules != all ]] && ! strstr "$dracutmodules" "$mod" && \
-	    continue
-	strstr "$omit_dracutmodules" "$mod" && continue
-	if ! strstr "$add_dracutmodules" "$mod"; then
-	    should_source_module "$moddir" || continue
+        strstr " $omit_dracutmodules " " $mod " && continue
+
+        if ! strstr " $dracutmodules $add_dracutmodules " " $mod "; then
+            # module not in our list
+	    if [[ $dracutmodules = all ]]; then
+                # check, if we can install this module
+	        should_source_module "$moddir" || continue
+            else
+                # skip this module
+                continue
+            fi
+	else
+	    if [ -x "$moddir/check" ] \
+                && "$moddir/check" -d > /dev/null 2>&1; then
+		check_module_deps "$mod" || {
+		    dwarning "Cannot load dracut module \"$mod\", dependencies failed."
+                    continue
+                }
+            fi
         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.
@@ -419,7 +605,7 @@ install_kmod_with_fw() {
 	    fi
 	done
 	if [[ $found != yes ]]; then
-	    dinfo "Possible missing firmware ${fw} for module ${mod}.ko"
+	    dinfo "Possible missing firmware \"${fw}\" for kernel module \"${mod}.ko\""
 	fi
     done
 }
@@ -471,7 +657,7 @@ filter_kernel_modules () (
 # 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*}
 	case $mod in
@@ -499,14 +685,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 -qe "\<${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.8

@@ -1,20 +0,0 @@
-.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-gencmdline.8.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
+<!-- lifted from troff+man by doclifter -->
+<refentry id='dracutgencmdline8'>
+<refmeta>
+<refentrytitle>DRACUT-GENCMDLINE</refentrytitle>
+<manvolnum>8</manvolnum>
+<refmiscinfo class='source'>June 2009</refmiscinfo>
+<refmiscinfo class='manual'>Linux</refmiscinfo>
+</refmeta>
+<refnamediv id='name'>
+<refname>dracut-gencmdline</refname>
+<refpurpose>generates kernel command line parameters for the dracut generated initramfs</refpurpose>
+</refnamediv>
+<!-- body begins here -->
+<refsynopsisdiv id='synopsis'>
+<cmdsynopsis>
+  <command>dracut-gencmdline</command>    
+    <sbr/>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1 id='description'><title>DESCRIPTION</title>
+<para><command>dracut-gencmdline</command>
+generates kernel command line parameters for the dracut generated initramfs, which are very specific to the host system.</para>
+
+</refsect1>
+
+<refsect1 id='authors'><title>AUTHORS</title>
+<literallayout remap='.nf'>
+Harald Hoyer &lt;harald@redhat.com&gt;
+</literallayout> <!-- .fi -->
+</refsect1>
+
+<refsect1 id='availability'><title>AVAILABILITY</title>
+<para>The dracut-gencmdline command is part of the dracut package and is available from
+<ulink url='http://sourceforge.net/apps/trac/dracut/wiki'>http://sourceforge.net/apps/trac/dracut/wiki</ulink></para>
+
+</refsect1>
+
+<refsect1 id='see_also'><title>SEE ALSO</title>
+<para><citerefentry><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry></para>
+</refsect1>
+</refentry>
+

dracut.8

@@ -1,398 +0,0 @@
-.TH DRACUT 8 "June 2009" "Linux"
-.SH NAME
-dracut \- create initial ramdisk images for preloading modules
-.SH SYNOPSIS
-\fBdracut\fR [\fIOPTION\fR]... \fI<image>\fR  \fI<kernel-version>\fR
-
-.SH DESCRIPTION
-.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
-.TP
-.BR \-f ", " \-\-force
-overwrite existing initramfs file.
-.TP
-.BR \-m ", " \-\-modules " \fILIST\fR"
-specify a space-separated list of dracut modules to call 
-when building the initramfs. 
-Modules are located in 
-.IR /usr/share/dracut/modules.d .
-.TP
-.BR \-o ", " \-\-omit " \fILIST\fR"
-omit a space-separated list of dracut modules.
-.TP
-.BR \-a ", " \-\-add " \fILIST\fR"
-add a space-separated list of dracut modules.
-.TP
-.BR \-d ", " \-\-drivers " \fILIST\fR"
-specify a space-separated list of kernel modules to exclusively include in the initramfs.
-.BR \-\-add-drivers " \fILIST\fR"
-specify a space-separated list of kernel modules to add to the initramfs.
-.TP
-.BR \-\-filesystems " \fILIST\fR"
-specify a space-separated list of kernel filesystem modules to exclusively include in the generic initramfs.
-.TP
-.BR \-k ", " \-\-kmoddir " \fI{DIR}\fR   
-specify the directory, where to look for kernel modules
-.TP
-.BR " \-\-fwdir " \fI{DIR}\fR   
-specify additional directory, where to look for firmwares
-.TP
-.BR \-\-kernel-only
-only install kernel drivers and firmware files
-.TP
-.BR \-\-no-kernel
-do not install kernel drivers and firmware files
-.TP
-.BR \-\-mdadmconf
-include local /etc/mdadm.conf
-.TP
-.BR \-\-nomdadmconf
-do not include local /etc/mdadm.conf
-.TP
-.BR \-\-strip
-strip binaries in the initramfs (default)
-.TP
-.BR \-\-nostrip
-do not strip binaries in the initramfs
-.TP
-.BR \-h ", " \-\-help
-display help text and exit. 
-.TP
-.B \-\-debug
-output debug information of the build process
-.TP
-.BR \-v ", " \-\-verbose
-verbose output during the build process
-.TP
-.BR \-c ", " \-\-conf " \fIFILE\fR"
-specify configuration file to use.
-Default: 
-.IR /etc/dracut.conf
-.TP
-.BR \-l ", " \-\-local
-local mode. Use modules from the current working
-directory instead of the system-wide installed in
-.IR /usr/share/dracut/modules.d .
-Useful when running dracut from a git checkout.
-.TP
-.BR \-H ", " \-\-hostonly
-Host-Only mode: Install only what is needed for
-booting the local host instead of a generic host.
-.TP
-.BR \-i ", " \-\-include " \fISOURCE\fR" "" " \fITARGET\fR"
-include the files in the SOURCE directory into the
-target directory in the final initramfs.
-.TP
-.BR \-I ", " \-\-install " \fILIST\fR"
-install the space separated list of files into the initramfs.
-
-.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
-the initrd will search all available devices for an ext2 or ext3 filesystem
-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
-.TP
-.B init=<path to real init>
-.TP
-.B root=<path to blockdevice>
-specify blockdevice to use as root filesystem.
-e.g. \fI/dev/sda1\fR
-e.g. \fI/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1\fR
-.TP
-.B rootfstype=<filesystem type>
-"auto" if not specified, e.g. \fIrootfstype=ext3\fR
-.TP
-.B 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.
-
-.SH I18N
-.ad l
-e.g. LANG=en_US.UTF-8 SYSFONT=latarcyrheb-sun16 KEYTABLE=de-latin1-nodeadkeys
-.ad
-.TP
-.B KEYBOARDTYPE=sun|pc
-will be written to /etc/sysconfig/keyboard in the initramfs
-.TP
-.B KEYTABLE=<keytable filename>
-will be written to /etc/sysconfig/keyboard in the initramfs
-.TP
-.B SYSFONT= Console font
-will be written to /etc/sysconfig/i18n in the initramfs
-.TP
-.B SYSFONTACM= Unicode font map
-will be written to /etc/sysconfig/i18n in the initramfs
-.TP
-.B UNIMAP= Unicode font map
-will be written to /etc/sysconfig/i18n in the initramfs
-.TP
-.B LANG=<locale>
-will be written to /etc/sysconfig/i18n in the initramfs
-
-.SH LVM
-.TP
-.B rd_NO_LVM
-disable LVM detection
-.TP
-.B rd_LVM_VG=<volume group name>
-only activate the volume groups with the given name
-rd_LVM_VG can be specified multiple times on the kernel command line.
-.TP
-.B rd_LVM_LV=<logical volume name>
-only activate the volume groups with the given name
-rd_LVM_LV can be specified multiple times on the kernel command line.
-.TP
-.B rd_NO_LVMCONF
-remove any /etc/lvm/lvm.conf, which may exist in the initramfs
-
-.SH crypto LUKS
-.TP
-.B rd_NO_LUKS
-disable crypto LUKS detection
-.TP
-.B rd_LUKS_UUID=<luks uuid>
-only activate the LUKS partitions with the given UUID
-Any "luks-" of the LUKS UUID is removed before comparing to <luks uuid>.
-The comparisons also matches, if <luks uuid> is only the beginning of the 
-LUKS UUID, so you don't have to specify the full UUID.
-.B rd_NO_CRYPTTAB
-do not check if LUKS partition is in /etc/crypttab
-
-.SH MD
-.TP
-.B rd_NO_MD
-disable MD RAID detection
-.TP
-.B rd_NO_MDIMSM
-no MD RAID for imsm/isw raids, use dmraid instead
-.TP
-.B rd_NO_MDADMCONF
-ignore mdadm.conf included in initramfs
-.TP
-.B rd_MD_UUID=<md uuid>
-only activate the raid sets with the given UUID
-
-.SH DMRAID
-.TP
-.B rd_NO_DM
-disable DM RAID detection
-.TP
-.B rd_DM_UUID=<dmraid uuid>
-only activate the raid sets with the given UUID
-
-.SH DASD
-.TP
-.B rd_DASD_MOD=....
-same syntax as the kernel module parameter (s390 only)
-
-.TP
-.B rd_DASD=<dasd adaptor device bus ID>[,readonly=X][,use_diag=X][,erplog=X][,failfast=X]
-activate DASD device with the given adaptor device bus ID and setting the sysfs attributes
-to the specified values
-
-.SH ZFCP
-.TP
-.B 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
-.B rd_NO_ZFCPCONF
-ignore zfcp.conf included in the initramfs
-
-.SH CCW
-.TP
-.B rd_CCW=<nettype>,<subchannels>,<options>
-rd_CCW can be specified multiple times on the kernel command line. Examples:
-    rd_CCW=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portname=foo
-    rd_CCW=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar
-.SH DHCP
-.TP
-.B root=dhcp
-get IP from dhcp server, root-path option from dhcp specifies root location
-
-.SH NFS
-.TP
-.B 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 ","
-.TP
-.B root=nfs:[<server-ip>:]<root-dir>[:<nfs-options>] 
-.TP
-.B root=nfs4:[<server-ip>:]<root-dir>[:<nfs-options>]
-.TP
-.B root=dhcp 
-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>]
-\fBDeprecated!\fR kernel Documentation/filesystems/nfsroot.txt defines 
-this method.  
-This is supported by dracut but not recommended.
-.TP
-.B rd_NFS_DOMAIN=<NFSv4 domain name>
-Set the NFSv4 domain name. Will overwrite the settings in /etc/idmap.conf.
-
-.SH iSCSI
-.TP
-.B root=iscsi:[username:password[:reverse:password]@][<servername>]:[<protocol>]:[<port>]:[<LUN>]:<targetname>
-protocol defaults to "6", LUN defaults to "0".
-
-If the "servername" field is provided by BOOTP or DHCP, then that
-field is used in conjunction with other associated fields to contact
-the boot server in the Boot stage (Section 7).  However, if the
-"servername" field is not provided, then the "targetname" field is
-then used in the Discovery Service stage in conjunction with other
-associated fields.
-
-http://tools.ietf.org/html/rfc4173
-
-.TP
-.B root=iscsi:[username:password[:reverse:password]@][<servername>]:[<protocol>]:[<port>]:[<LUN>]:<targetname>
-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
-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!
-.ad
-.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=
-.TP
-.B root=??? iscsi_firmware
-will read the iscsi parameter from the BIOS firmware
-
-.SH FCoE
-.TP
-.B 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!
-
-.SH NBD
-.TP
-.B 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.
-
-.SH Network
-.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
-.ad l
-.B ip=<client-IP>:[<server-id>]:<gateway-IP>:<netmask>:<client\%hostname>:<interface>:{none|off}
-.ad
-explicit network configuration
-.TP
-.B 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
-.TP
-.B bootdev=<interface>
-specify network interface to use routing and netroot information from. Required if multiple ip= lines are used.
-
-.SH Plymouth Boot Splash
-.TP
-.B rd_NO_PLYMOUTH
-do not start plymouth. This will not work with encrypted partitions.
-
-.SH Misc
-.TP
-.B rdblacklist=<drivername>
-do not load kernel module <drivername>
-.TP
-.B rdloaddriver=<drivername>
-force loading kernel module <drivername>
-
-.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 and logs to dmesg, console and /init.log
-.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/
-
-.SH CONFIGURATION IN 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 FILES
-.TP
-.B /var/log/dracut.log
-.TP
-.B /tmp/dracut.log
-.TP
-.B /etc/dracut.conf
-
-.SH AUTHORS
-.nf
-Harald Hoyer <harald@redhat.com>
-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
-http://sourceforge.net/apps/trac/dracut/wiki
-
-.SH SEE ALSO
-.BR dracut.conf (5)

dracut.8.xml

@@ -0,0 +1,447 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
+<refentry>
+  <refentryinfo>
+    <title>dracut</title>
+    <productname>dracut</productname>
+    <authorgroup>
+      <author>
+        <contrib>Project Leader, Developer</contrib>
+        <firstname>Harald</firstname>
+        <surname>Hoyer</surname>
+        <email>harald@redhat.com</email>
+      </author>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Victor</firstname>
+        <surname>Lowther</surname>
+        <email>victor.lowther@gmail.com</email>
+      </author>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Warren</firstname>
+        <surname>Togami</surname>
+        <email>wtogami@redhat.com</email>
+      </author>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Jeremy</firstname>
+        <surname>Katz</surname>
+        <email>katzj@redhat.com</email>
+      </author>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Philippe</firstname>
+        <surname>Seewer</surname>
+        <email>philippe.seewer@bfh.ch</email>
+      </author>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>David</firstname>
+        <surname>Dillow</surname>
+        <email>dave@thedillows.org</email>
+      </author>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Amadeusz</firstname>
+        <surname>Żołnowski</surname>
+        <email>aidecoe@aidecoe.name</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>dracut</refentrytitle>
+    <manvolnum>8</manvolnum>
+    <refmiscinfo class="version"/>
+  </refmeta>
+  <refnamediv>
+    <refname>dracut</refname>
+    <refpurpose>create initial ramdisk images for preloading modules</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>dracut</command>
+      <arg choice="opt" rep="repeat">
+        <replaceable>OPTION</replaceable>
+      </arg>
+      <arg choice="opt">
+        <replaceable>&lt;image&gt;</replaceable>
+        <arg choice="opt">
+          <replaceable>&lt;kernel-version&gt;</replaceable>
+        </arg>
+      </arg>
+      <sbr/>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>Description</title>
+    <para><command>dracut</command>
+creates an initial image used by the kernel for
+preloading the block device modules (such as IDE, SCSI or RAID)
+which are needed to access the root filesystem.</para>
+    <para>
+For a complete list of kernel command line options see
+      <citerefentry>
+        <refentrytitle>dracut.kernel</refentrytitle>
+        <manvolnum>7</manvolnum>
+      </citerefentry>
+</para>
+    <refsect2>
+      <title>Options</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <option>-f</option>
+          </term>
+          <term>
+            <option>--force</option>
+          </term>
+          <listitem>
+            <para>overwrite existing initramfs file.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-m</option>
+          </term>
+          <term>
+            <option>--modules&nbsp;<replaceable>&lt;list of dracut modules&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>specify a space-separated list of dracut modules to call 
+when building the initramfs. 
+Modules are located in 
+<filename>/usr/share/dracut/modules.d</filename>. This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-o</option>
+          </term>
+          <term>
+            <option>--omit&nbsp;<replaceable>&lt;list of dracut modules&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>omit a space-separated list of dracut modules. This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-a</option>
+          </term>
+          <term>
+            <option>--add&nbsp;<replaceable>&lt;list of dracut modules&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>add a space-separated list of dracut modules to the default set of modules. This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-d</option>
+          </term>
+          <term>
+            <option>--drivers&nbsp;<replaceable>&lt;list of kernel modules&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>specify a space-separated list of kernel modules to exclusively include
+in the initramfs.
+The kernel modules have to be specified without the &quot;.ko&quot; suffix. This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--add-drivers&nbsp;<replaceable>&lt;list of kernel modules&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>specify a space-separated list of kernel modules to add to the initramfs.
+The kernel modules have to be specified without the &quot;.ko&quot; suffix. This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--filesystems&nbsp;<replaceable>&lt;list of filesystems&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>specify a space-separated list of kernel filesystem modules to exclusively 
+include in the generic initramfs. This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-k</option>
+          </term>
+          <term>
+            <option>--kmoddir&nbsp;<replaceable>&lt;kernel directory&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>specify the directory, where to look for kernel modules</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option> --fwdir&nbsp;<replaceable>&lt;dir&gt;[:&lt;dir&gt;...]</replaceable></option>
+          </term>
+          <listitem>
+            <para>specify additional directories, where to look for firmwares. This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--kernel-only</option>
+          </term>
+          <listitem>
+            <para>only install kernel drivers and firmware files</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--no-kernel</option>
+          </term>
+          <listitem>
+            <para>do not install kernel drivers and firmware files</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--ignore-kernel-modules</option>
+          </term>
+          <listitem>
+            <para>don&apos;t try to load modules; it automatically implies <option>--no-kernel</option>; it&apos;s
+assumed that everything needed is built into kernel</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--mdadmconf</option>
+          </term>
+          <listitem>
+            <para>include local /etc/mdadm.conf</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--nomdadmconf</option>
+          </term>
+          <listitem>
+            <para>do not include local /etc/mdadm.conf</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--strip</option>
+          </term>
+          <listitem>
+            <para>strip binaries in the initramfs (default)</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--nostrip</option>
+          </term>
+          <listitem>
+            <para>do not strip binaries in the initramfs</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-h</option>
+          </term>
+          <term>
+            <option>--help</option>
+          </term>
+          <listitem>
+            <para>display help text and exit.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--debug</option>
+          </term>
+          <listitem>
+            <para>output debug information of the build process</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-v</option>
+          </term>
+          <term>
+            <option>--verbose</option>
+          </term>
+          <listitem>
+            <para>verbose output during the build process</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-c</option>
+          </term>
+          <term>
+            <option>--conf&nbsp;<replaceable>&lt;dracut configuration file&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>specify configuration file to use.
+Default: 
+<filename>/etc/dracut.conf</filename></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--confdir&nbsp;<replaceable>&lt;configuration directory&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>specify configuration directory to use.
+Default: 
+<filename>/etc/dracut.conf.d</filename></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-l</option>
+          </term>
+          <term>
+            <option>--local</option>
+          </term>
+          <listitem>
+            <para>activates the local mode. Dracut will use modules from the current working
+directory instead of the system-wide installed modules in
+<filename>/usr/share/dracut/modules.d</filename>.
+Thsi is useful when running dracut from a git checkout.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-H</option>
+          </term>
+          <term>
+            <option>--hostonly</option>
+          </term>
+          <listitem>
+            <para>Host-Only mode: Install only what is needed for booting 
+the local host instead of a generic host. 
+     <warning>
+                <para>If chrooted to another root other than the real root device, use &quot;--fstab&quot; and provide a valid /etc/fstab.</para>
+              </warning>
+     </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--fstab</option>
+          </term>
+          <listitem>
+            <para>Use <filename>/etc/fstab</filename> instead of <filename>/proc/self/mountinfo</filename>.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-i</option>
+          </term>
+          <term>
+            <option>--include&nbsp;<replaceable>&lt;source directory&gt;</replaceable>&nbsp;<replaceable>&lt;target directory&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>include the files in the source directory into the
+target directory in the final initramfs.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>-I</option>
+          </term>
+          <term>
+            <option>--install&nbsp;<replaceable>&lt;file list&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>install the space separated list of files into the initramfs.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+  </refsect1>
+  <refsect1>
+    <title>Files</title>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <filename>/var/log/dracut.log</filename>
+        </term>
+        <listitem>
+          <para>logfile of initramfs image creation</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>/tmp/dracut.log</filename>
+        </term>
+        <listitem>
+          <para>logfile of initramfs image creation, if <filename>/var/log/dracut.log</filename> is not writable</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>/etc/dracut.conf</filename>
+        </term>
+        <listitem>
+          <para>see <citerefentry>
+              <refentrytitle>dracut.conf</refentrytitle>
+              <manvolnum>5</manvolnum>
+            </citerefentry></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>/etc/dracut.conf.d/*.conf</filename>
+        </term>
+        <listitem>
+          <para>see <citerefentry>
+              <refentrytitle>dracut.conf</refentrytitle>
+              <manvolnum>5</manvolnum>
+            </citerefentry></para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <refsect2>
+      <title>Configuration in the Initramfs</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <filename>/conf/conf.d/</filename>
+          </term>
+          <listitem>
+            <para>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.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <filename>/etc/cmdline</filename>
+          </term>
+          <listitem>
+            <para>Can contain additional command line options.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+  </refsect1>
+  <refsect1>
+    <title>Availability</title>
+    <para>The dracut command is part of the dracut package and is available from
+<ulink url="http://sourceforge.net/apps/trac/dracut/wiki">http://sourceforge.net/apps/trac/dracut/wiki</ulink></para>
+  </refsect1>
+  <refsect1>
+    <title>See Also</title>
+    <para>
+      <citerefentry>
+        <refentrytitle>dracut.kernel</refentrytitle>
+        <manvolnum>7</manvolnum>
+      </citerefentry>
+      <citerefentry>
+        <refentrytitle>dracut.conf</refentrytitle>
+        <manvolnum>5</manvolnum>
+      </citerefentry>
+    </para>
+  </refsect1>
+</refentry>

dracut.conf

@@ -1,16 +1,19 @@
 # Sample dracut config file
 
 # Specific list of dracut modules to use
-#dracutmodules=""
+#dracutmodules+=""
 
 # Dracut modules to omit
-#omit_dracutmodules=""
+#omit_dracutmodules+=""
+
+# Dracut modules to add to the default
+#add_dracutmodules+=""
 
 # additional kernel modules to the default
-#add_drivers=""
+#add_drivers+=""
 
 # list of kernel filesystem modules to be included in the generic initramfs
-#filesystems=""
+#filesystems+=""
 
 # build initrd only to boot current hardware
 #hostonly="yes"

dracut.conf.5

@@ -1,66 +0,0 @@
-.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.
-.TP
-.BR add_drivers="[LIST]"
-Specify a space-separated list of kernel 
-modules to add to the initramfs.
-.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.conf.5.xml

@@ -0,0 +1,200 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
+<refentry id="dracutconf5">
+  <refentryinfo>
+    <title>dracut.conf</title>
+    <productname>dracut</productname>
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Harald</firstname>
+        <surname>Hoyer</surname>
+        <email>harald@redhat.com</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>dracut.conf</refentrytitle>
+    <manvolnum>5</manvolnum>
+  </refmeta>
+  <refnamediv>
+    <refname>dracut.conf</refname>
+    <refpurpose>configuration file(s) for dracut</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>/etc/dracut.conf</command>
+      <arg choice="plain">
+        <replaceable>/etc/dracut.conf.d/*.conf</replaceable>
+      </arg>
+      <sbr/>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>Description</title>
+    <para><emphasis>dracut.conf</emphasis>
+is loaded during the initialisation phase of dracut.
+Command line parameter will overwrite any values set here.
+<emphasis>dracut.conf.d/*.conf files are read in alphanumerical order and will</emphasis>
+overwrite parameters set in /etc/dracut.conf. Each line specifies an attribute and a value. A &apos;#&apos; indicates the beginning of a comment; following characters, up to the end of the line are not interpreted.</para>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <envar>dracutmodules+=&quot;&nbsp;<replaceable>&lt;dracut modules&gt;</replaceable>&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Specify a space-separated list of dracut modules to
+call when building the initramfs. Modules are located
+in /usr/share/dracut/modules.d.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>omit_dracutmodules+=&quot;&nbsp;<replaceable>&lt;dracut modules&gt;</replaceable>&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Omit a space-separated list of dracut modules.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>add_dracutmodules+=&quot;&nbsp;<replaceable>&lt;dracut modules&gt;</replaceable>&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Add a space-separated list of dracut modules.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>drivers+=&quot;&nbsp;<replaceable>&lt;kernel modules&gt;</replaceable>&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Specify a space-separated list of kernel modules to
+exclusively include in the initramfs.
+The kernel modules have to be specified without the &quot;.ko&quot; suffix.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>add_drivers+=&quot;&nbsp;<replaceable>&lt;kernel modules&gt;</replaceable>&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Specify a space-separated list of kernel 
+modules to add to the initramfs.
+The kernel modules have to be specified without the &quot;.ko&quot; suffix.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>filesystems+=&quot;&nbsp;<replaceable>&lt;filesystem names&gt;</replaceable>&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Specify a space-separated list of kernel filesystem
+modules to exclusively include in the generic
+initramfs.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>drivers_dir=&quot;<replaceable>&lt;kernel modules directory&gt;</replaceable>&quot;</envar>
+        </term>
+        <listitem>
+          <para>Specify the directory, where to look for kernel modules</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>fw_dir+=&quot;&#160;:<replaceable>&lt;dir&gt;</replaceable>[:<replaceable>&lt;dir&gt;</replaceable>&nbsp;...]&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Specify additional directories, where to look for firmwares, separated by :</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>do_strip=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
+        </term>
+        <listitem>
+          <para>Strip binaries in the initramfs (default=yes)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>hostonly=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
+        </term>
+        <listitem>
+          <para>Host-Only mode: Install only what is needed for booting 
+	  the local host instead of a generic host.
+	  <warning><para>If chrooted to another root other than the real root device, use "--fstab" and provide a valid /etc/fstab.</para></warning>
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>use_fstab=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
+        </term>
+        <listitem>
+          <para>Use /etc/fstab instead of /proc/self/mountinfo.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>mdadmconf=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
+        </term>
+        <listitem>
+          <para>Include local /etc/mdadm.conf (default=yes)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>lvmconf=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
+        </term>
+        <listitem>
+          <para>Include local /etc/lvm/lvm.conf (default=yes)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>kernel_only=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
+        </term>
+        <listitem>
+          <para>Only install kernel drivers and firmware files. (default=no)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>no_kernel=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
+        </term>
+        <listitem>
+          <para>Do not install kernel drivers and firmware files (default=no)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>Files</title>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <filename>/etc/dracut/conf.d/</filename>
+        </term>
+        <listitem>
+          <para>Any /etc/dracut/conf.d/*.conf file can overwrite the values in /etc/dracut.conf.
+The configuration files are read in alphanumerical order.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>See Also</title>
+    <para><citerefentry>
+        <refentrytitle>dracut</refentrytitle>
+        <manvolnum>8</manvolnum>
+      </citerefentry>
+      <citerefentry>
+        <refentrytitle>dracut.kernel</refentrytitle>
+        <manvolnum>7</manvolnum>
+      </citerefentry>
+    </para>
+  </refsect1>
+</refentry>

dracut.conf.d/fedora.conf.example

@@ -0,0 +1,6 @@
+# /etc/dracut.conf.d/redhat.conf
+# Dracut config file customized for RedHat/Fedora.
+
+# i18n
+keyboard_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP"
+i18n_vars="/etc/sysconfig/i18n:SYSFONT,SYSFONTACM-CONTRANS,UNIMAP"

dracut.conf.d/gentoo-openrc.conf.example

@@ -0,0 +1,10 @@
+# /etc/dracut.conf.d/gentoo-openrc.conf
+# Dracut config file customized for Gentoo Base System release 2
+
+#
+# Modules
+#
+
+# i18n
+keyboard_vars="/etc/conf.d/keymaps:keymap-KEYMAP,extended_keymaps-EXT_KEYMAPS"
+i18n_vars="/etc/conf.d/consolefont:consolefont-SYSFONT,consoletranslation-CONTRANS /etc/rc.conf:unicode-UNICODE"

dracut.conf.d/gentoo.conf.example

@@ -0,0 +1,10 @@
+# /etc/dracut.conf.d/gentoo.conf
+# Dracut config file customized for Gentoo Base System release 1
+
+#
+# Modules
+#
+
+# i18n
+keyboard_vars="/etc/conf.d/keymaps:KEYMAP,EXTENDED_KEYMAPS-EXT_KEYMAPS"
+i18n_vars="/etc/conf.d/consolefont:CONSOLEFONT-SYSFONT,CONSOLETRANSLATION-CONTRANS /etc/rc.conf:UNICODE"

dracut.kernel.7.xml

@@ -0,0 +1,790 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<refentry>
+  <refentryinfo>
+    <title>dracut.kernel</title>
+    <productname>dracut</productname>
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Harald</firstname>
+        <surname>Hoyer</surname>
+        <email>harald@redhat.com</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>dracut.kernel</refentrytitle>
+    <manvolnum>7</manvolnum>
+    <refmiscinfo class="version"/>
+  </refmeta>
+  <refnamediv>
+    <refname>dracut.kernel</refname>
+    <refpurpose>dracut kernel command line options</refpurpose>
+  </refnamediv>
+  <refsect1>
+    <title>Description</title>
+    <para>The root filesystem used by the kernel is specified in the boot configuration
+file, as always. The traditional <emphasis remap="B">root=/dev/hda1</emphasis> style device 
+specification is allowed. If a label is used, as in <emphasis remap="B">root=LABEL=rootPart</emphasis>
+the initramfs will search all available devices for an ext2 or ext3 filesystem
+with the appropriate label, and mount that device as the root filesystem.
+<emphasis remap="B">root=UUID=uuidnumber</emphasis> will mount the partition with that UUID as the 
+root filesystem.</para>
+    <refsect2>
+      <title>Standard</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>init=<replaceable>&lt;path to real init&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para> </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>root=<replaceable>&lt;path to blockdevice&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>specify blockdevice to use as root filesystem. 
+     e.g.
+     <programlisting>
+root=/dev/sda1
+root=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1
+     </programlisting></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rootfstype=<replaceable>&lt;filesystem type&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>&quot;auto&quot; if not specified, e.g. rootfstype=ext3</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rootflags=<replaceable>&lt;mount options&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>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.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_NO_FSTAB</envar>
+          </term>
+          <listitem>
+            <para>do not honor special mount options for the root filesystem found in 
+/etc/fstab of the real root.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>Misc</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>rdblacklist=<replaceable>&lt;drivername&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>do not load kernel module &lt;drivername&gt;
+This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rdloaddriver=<replaceable>&lt;drivername&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>force loading kernel module &lt;drivername&gt;
+This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>Debug</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>rdinfo</envar>
+          </term>
+          <listitem>
+            <para>print informational output though &quot;quiet&quot; is set</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rdshell</envar>
+          </term>
+          <listitem>
+            <para>allow dropping to a shell, if root mounting fails</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rdinitdebug</envar>
+          </term>
+          <listitem>
+            <para>set -x for the dracut shell and logs to dmesg, console and /init.log</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rdbreak</envar>
+          </term>
+          <listitem>
+            <para>drop to a shell at the end</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><envar>rdbreak=</envar>{cmdline|pre-udev|pre-trigger|initqueue|pre-mount|mount|pre-pivot} </term>
+          <listitem>
+            <para>drop to a shell on defined breakpoint</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rdudevinfo</envar>
+          </term>
+          <listitem>
+            <para>set udev to loglevel info</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rdudevdebug</envar>
+          </term>
+          <listitem>
+            <para>set udev to loglevel debug</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>I18N</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>KEYMAP=</envar>
+            <replaceable>&lt;keymap base file name&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>keyboard translation table loaded by loadkeys; taken from keymaps directory; will be written to /etc/sysconfig/keyboard in the initramfs, e.g.: <programlisting>KEYMAP=de-latin1-nodeadkeys</programlisting></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>EXT_KEYMAPS=</envar>
+            <replaceable>&lt;list of keymap base file names&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>list of extra keymaps to bo loaded (sep. by space); will be written to /etc/sysconfig/keyboard in the initramfs</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>UNICODE=</envar>
+            <replaceable>&lt;1|0&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>boolean, indicating UTF-8 mode; will be written to /etc/sysconfig/i18n in the initramfs</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>SYSFONT=</envar>
+            <replaceable>&lt;font base file name&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>console font; taken from consolefonts directory;  will be written to /etc/sysconfig/i18n in the initramfs; e.g.: <programlisting>SYSFONT=LatArCyrHeb-16</programlisting></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>CONTRANS=</envar>
+            <replaceable>&lt;console map base file name&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>see description of &apos;-m&apos; parameter in setfont manual; taken from consoletrans directory; will be written to /etc/sysconfig/i18n in the initramfs</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>UNIMAP=</envar>
+            <replaceable>&lt;unicode table base file name&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>see description of &apos;-u&apos; parameter in setfont manual; taken from unimaps directory; will be written to /etc/sysconfig/i18n in the initramfs</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>LANG=</envar>
+            <replaceable>&lt;locale&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>taken from the environment; if no UNICODE is defined we set its value in basis of LANG value (whether it ends with &quot;.utf8&quot; (or similar) or not); will be written to /etc/sysconfig/i18n in the initramfs; e.g.: <programlisting>LANG=pl_PL.utf8</programlisting></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>LC_ALL=</envar>
+            <replaceable>&lt;locale&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>taken from the environment; will be written to /etc/sysconfig/i18n in the initramfs</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>LVM</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>rd_NO_LVM</envar>
+          </term>
+          <listitem>
+            <para>disable LVM detection</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_LVM_VG=<replaceable>&lt;volume group name&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>only activate the volume groups with the given name
+rd_LVM_VG can be specified multiple times on the kernel command line.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_LVM_LV=<replaceable>&lt;logical volume name&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>only activate the logical volumes with the given name
+rd_LVM_LV can be specified multiple times on the kernel command line.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_NO_LVMCONF</envar>
+          </term>
+          <listitem>
+            <para>remove any /etc/lvm/lvm.conf, which may exist in the initramfs</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>crypto LUKS</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>rd_NO_LUKS</envar>
+          </term>
+          <listitem>
+            <para>disable crypto LUKS detection</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_LUKS_UUID=<replaceable>&lt;luks uuid&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>only activate the LUKS partitions with the given UUID
+Any &quot;luks-&quot; of the LUKS UUID is removed before comparing to &lt;luks uuid&gt;.
+The comparisons also matches, if &lt;luks uuid&gt; is only the beginning of the 
+LUKS UUID, so you don&apos;t have to specify the full UUID.
+This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_NO_CRYPTTAB</envar>
+          </term>
+          <listitem>
+            <para>do not check, if LUKS partition is in /etc/crypttab</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>crypt LUKS - experimental removable keys support</title>
+      <para>works only when plymouth module is not included</para>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>rd_LUKS_KEYPATH=</envar>
+            <replaceable>&lt;path to keyfile&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>path to keyfile inside remove device filesystem</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_LUKS_KEYDEV_UUID=</envar>
+            <replaceable>&lt;rem. device uuid&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>UUID of removalbe device storing keyfile; UUID doesn&apos;t have to be exact just like for rd_LUKS_UUID</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>MD</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>rd_NO_MD</envar>
+          </term>
+          <listitem>
+            <para>disable MD RAID detection</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_NO_MDIMSM</envar>
+          </term>
+          <listitem>
+            <para>no MD RAID for imsm/isw raids, use dmraid instead</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_NO_MDADMCONF</envar>
+          </term>
+          <listitem>
+            <para>ignore mdadm.conf included in initramfs</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_MD_UUID=<replaceable>&lt;md uuid&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>only activate the raid sets with the given UUID.
+This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>DMRAID</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>rd_NO_DM</envar>
+          </term>
+          <listitem>
+            <para>disable DM RAID detection</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_DM_UUID=<replaceable>&lt;dmraid uuid&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>only activate the raid sets with the given UUID.
+This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>Network</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>ip=</envar>
+            <replaceable>{dhcp|on|any|dhcp6|auto6}</replaceable>
+          </term>
+          <listitem>
+            <para>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.</para>
+            <para>auto6: do IPv6 autoconfiguration</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><envar>ip=</envar><replaceable>&lt;interface&gt;</replaceable>:<replaceable>{dhcp|on|any|dhcp6|auto6}</replaceable></term>
+          <listitem>
+            <para>dhcp|on|any|dhcp6: get ip from dhcp server on a specific interface
+auto6: do IPv6 autoconfiguration
+This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><envar>ip=</envar><replaceable>&lt;client-IP&gt;</replaceable>:<optional>
+              <replaceable>&lt;server-id&gt;</replaceable>
+            </optional>:<replaceable>&lt;gateway-IP&gt;</replaceable>:<replaceable>&lt;netmask&gt;</replaceable>:<replaceable>&lt;client_hostname&gt;</replaceable>:<replaceable>&lt;interface&gt;</replaceable>:<replaceable>{none|off}</replaceable></term>
+          <listitem>
+            <para>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.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><envar>ifname=</envar><replaceable>&lt;interface&gt;</replaceable>:<replaceable>&lt;MAC&gt;</replaceable></term>
+          <listitem>
+            <para>Assign network device name &lt;interface&gt; (ie eth0) to the NIC with MAC &lt;MAC&gt;.
+Note letters in the MAC-address must be lowercase!
+Note that if you use this option you <emphasis remap="B">must</emphasis> specify an ifname= argument
+for all interfaces used in ip= or fcoe= arguments
+This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>bootdev=</envar>
+            <replaceable>&lt;interface&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>specify network interface to use routing and netroot information from. 
+Required if multiple ip= lines are used.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>nameserver=</envar>
+            <replaceable>&lt;IP&gt;</replaceable>
+            <optional><envar>nameserver</envar>=<replaceable>&lt;IP&gt;</replaceable> ...</optional>
+          </term>
+          <listitem>
+            <para>specify nameserver(s) to use</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>NFS</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>root=</envar>
+            <optional><replaceable>&lt;server-ip&gt;</replaceable>:</optional>
+            <replaceable>&lt;root-dir&gt;</replaceable>
+            <optional>:<replaceable>&lt;nfs-options&gt;</replaceable></optional>
+          </term>
+          <listitem>
+            <para>mount nfs share from &lt;server-ip&gt;:/&lt;root-dir&gt;, if no server-ip is given,
+use dhcp next_server. if server-ip is an IPv6 address it has to be put in brackets, e.g. [2001:DB8::1].
+NFS options can be appended with the prefix &quot;:&quot; or &quot;,&quot; and are seperated by &quot;,&quot;.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><envar>root=</envar>nfs:<optional><replaceable>&lt;server-ip&gt;</replaceable>:</optional><replaceable>&lt;root-dir&gt;</replaceable><optional>:<replaceable>&lt;nfs-options&gt;</replaceable></optional></term>
+          <term><envar>root=</envar>nfs4:<optional><replaceable>&lt;server-ip&gt;</replaceable>:</optional><replaceable>&lt;root-dir&gt;</replaceable><optional>:<replaceable>&lt;nfs-options&gt;</replaceable></optional></term>
+          <term>
+            <envar>root=</envar>
+            <replaceable>{dhcp|dhcp6}</replaceable>
+          </term>
+          <listitem>
+            <para>root=dhcp alone directs initrd to look at the DHCP root-path where NFS 
+options can be specified.
+    root-path=&lt;server-ip&gt;:&lt;root-dir&gt;[,&lt;nfs-options&gt;]
+    root-path=nfs:&lt;server-ip&gt;:&lt;root-dir&gt;[,&lt;nfs-options&gt;]
+    root-path=nfs4:&lt;server-ip&gt;:&lt;root-dir&gt;[,&lt;nfs-options&gt;]</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>root=</envar>
+            <filename>/dev/nfs</filename>
+            <envar> nfsroot=</envar>
+            <optional><replaceable>&lt;server-ip&gt;</replaceable>:</optional>
+            <replaceable>&lt;root-dir&gt;</replaceable>
+            <optional>:<replaceable>&lt;nfs-options&gt;</replaceable></optional>
+          </term>
+          <listitem>
+            <para><emphasis remap="B">Deprecated!</emphasis> kernel Documentation/filesystems/nfsroot.txt defines 
+this method.  
+This is supported by dracut but not recommended.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar remap="B">rd_NFS_DOMAIN=</envar>
+            <replaceable>&lt;NFSv4 domain name&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>Set the NFSv4 domain name. Will overwrite the settings in /etc/idmap.conf.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>iSCSI</title>
+      <variablelist>
+        <varlistentry>
+          <term><envar>root=</envar>iscsi:<optional><replaceable>&lt;username&gt;</replaceable>:<replaceable>&lt;password&gt;</replaceable><optional>:<replaceable>&lt;reverse&gt;</replaceable>:<replaceable>&lt;password&gt;</replaceable></optional>@</optional><optional>
+              <replaceable>&lt;servername&gt;</replaceable>
+            </optional>:<optional>
+              <replaceable>&lt;protocol&gt;</replaceable>
+            </optional>:<optional>
+              <replaceable>&lt;port&gt;</replaceable>
+            </optional>:<optional>
+              <replaceable>&lt;LUN&gt;</replaceable>
+            </optional>:<replaceable>&lt;targetname&gt;</replaceable></term>
+          <listitem>
+            <para>protocol defaults to &quot;6&quot;, LUN defaults to &quot;0&quot;.</para>
+            <para>If the &quot;servername&quot; field is provided by BOOTP or DHCP, then that
+field is used in conjunction with other associated fields to contact
+the boot server in the Boot stage (Section 7).  However, if the
+&quot;servername&quot; field is not provided, then the &quot;targetname&quot; field is
+then used in the Discovery Service stage in conjunction with other
+associated fields.</para>
+            <para><ulink url="http://tools.ietf.org/html/rfc4173">http://tools.ietf.org/html/rfc4173</ulink></para>
+            <para>e.g. 
+     <programlisting>
+root=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0
+     </programlisting>
+     </para>
+            <para>If servername is an IPv6 address, it has to be put in brackets. e.g. 
+     <programlisting>
+root=iscsi:[2001:DB8::1]::::iqn.2009-06.dracut:target0
+     </programlisting></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><envar>root=</envar><replaceable>???</replaceable><envar> netroot=</envar>iscsi:<optional><replaceable>&lt;username&gt;</replaceable>:<replaceable>&lt;password&gt;</replaceable><optional>:<replaceable>&lt;reverse&gt;</replaceable>:<replaceable>&lt;password&gt;</replaceable></optional>@</optional><optional>
+              <replaceable>&lt;servername&gt;</replaceable>
+            </optional>:<optional>
+              <replaceable>&lt;protocol&gt;</replaceable>
+            </optional>:<optional>
+              <replaceable>&lt;port&gt;</replaceable>
+            </optional>:<optional>
+              <replaceable>&lt;LUN&gt;</replaceable>
+            </optional>:<replaceable>&lt;targetname&gt;</replaceable> ...</term>
+          <listitem>
+            <para>multiple netroot options allow setting up multiple iscsi disks. e.g. 
+     <programlisting>
+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
+     </programlisting></para>
+            <para>If servername is an IPv6 address, it has to be put in brackets.
+ e.g.
+  <programlisting>netroot=iscsi:[2001:DB8::1]::::iqn.2009-06.dracut:target0</programlisting></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>root=<replaceable>???</replaceable></envar>
+            <envar> iscsi_initiator=<replaceable>&lt;initiator&gt; </replaceable></envar>
+            <envar>iscsi_target_name=<replaceable>&lt;target_name&gt; </replaceable></envar>
+            <envar>iscsi_target_ip=<replaceable>&lt;target ip&gt; </replaceable></envar>
+            <envar>iscsi_target_port=<replaceable>&lt;target port&gt; </replaceable></envar>
+            <envar>iscsi_target_group=<replaceable>&lt;target group&gt; </replaceable></envar>
+            <envar>iscsi_username=<replaceable>&lt;username&gt; </replaceable></envar>
+            <envar>iscsi_password=<replaceable>&lt;password&gt; </replaceable></envar>
+            <envar>iscsi_in_username=<replaceable>&lt;in username&gt; </replaceable></envar>
+            <envar>iscsi_in_password=<replaceable>&lt;in password&gt; </replaceable></envar>
+          </term>
+          <listitem>
+            <para>manually specify all iscsistart parameter (see <userinput>iscsistart&nbsp;--help</userinput>)</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><envar>root=</envar>???<envar> iscsi_firmware</envar></term>
+          <listitem>
+            <para>will read the iscsi parameter from the BIOS firmware</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>FCoE</title>
+      <variablelist>
+        <varlistentry>
+          <term><envar>netroot=</envar>fcoe:<replaceable>&lt;interface|MAC&gt;</replaceable>:<replaceable>{dcb|nodcb}</replaceable></term>
+          <listitem>
+            <para>Try to connect to a FCoE SAN through the NIC specified by &lt;interface&gt; or &lt;MAC&gt;,
+for the second argument, currently only nodcb is supported. Note letters in
+the MAC-address must be lowercase!</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>NBD</title>
+      <variablelist>
+        <varlistentry>
+          <term><envar>root=</envar><constant>nbd</constant>:<replaceable>&lt;server&gt;</replaceable>:<replaceable>&lt;port&gt;</replaceable><optional>:<replaceable>&lt;fstype&gt;</replaceable></optional><optional>:<replaceable>&lt;mountopts&gt;</replaceable></optional></term>
+          <listitem>
+            <para>mount nbd share from &lt;server&gt;</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>root=dhcp</envar>
+          </term>
+          <listitem>
+            <para>with dhcp root-path=nbd:&lt;server&gt;:&lt;port&gt;[:&lt;fstype&gt;][:&lt;mountopts&gt;]
+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.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>DASD</title>
+      <variablelist>
+        <varlistentry>
+          <term><envar>rd_DASD_MOD=</envar>....</term>
+          <listitem>
+            <para>same syntax as the kernel module parameter (s390 only)</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_DASD=</envar>
+            <replaceable>&lt;dasd_adaptor device bus ID&gt;</replaceable>
+            <optional>,readonly=<replaceable>X</replaceable></optional>
+            <optional>,use_diag=<replaceable>X</replaceable></optional>
+            <optional>,erplog=<replaceable>X</replaceable></optional>
+          </term>
+          <listitem>
+            <para>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.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>ZFCP</title>
+      <variablelist>
+        <varlistentry>
+          <term><envar>rd_ZFCP=</envar><replaceable>&lt;zfcp adaptor device bus ID&gt;</replaceable>,<replaceable>&lt;WWPN&gt;</replaceable>,<replaceable>&lt;FCPLUN&gt;</replaceable></term>
+          <listitem>
+            <para>rd_ZFCP can be specified multiple times on the kernel command line.</para>
+            <para>example: rd_ZFCP=0.0.4000,0x5005076300C213e9,0x5022000000000000</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd_NO_ZFCPCONF</envar>
+          </term>
+          <listitem>
+            <para>ignore zfcp.conf included in the initramfs</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>ZNET</title>
+      <variablelist>
+        <varlistentry>
+          <term><envar>rd_ZNET=</envar><replaceable>&lt;nettype&gt;</replaceable>,<replaceable>&lt;subchannels&gt;</replaceable>,<replaceable>&lt;options&gt;</replaceable></term>
+          <listitem>
+            <para>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</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+    <refsect2>
+      <title>Plymouth Boot Splash</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <envar>rd_NO_PLYMOUTH</envar>
+          </term>
+          <listitem>
+            <para>do not start plymouth. This will not work with encrypted partitions.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+  </refsect1>
+  <refsect1>
+    <title>Files</title>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <filename>/var/log/dracut.log</filename>
+        </term>
+        <listitem>
+          <para>logfile of initramfs image creation</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>/tmp/dracut.log</filename>
+        </term>
+        <listitem>
+          <para>logfile of initramfs image creation, if /var/log/dracut.log is not writable</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>/etc/dracut.conf</filename>
+        </term>
+        <listitem>
+          <para>see <citerefentry>
+              <refentrytitle>dracut.conf</refentrytitle>
+              <manvolnum>5</manvolnum>
+            </citerefentry></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>/etc/dracut.conf.d/*.conf</filename>
+        </term>
+        <listitem>
+          <para>see <citerefentry>
+              <refentrytitle>dracut.conf</refentrytitle>
+              <manvolnum>5</manvolnum>
+            </citerefentry></para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <refsect2>
+      <title>Configuration in the Initramfs</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <filename>/conf/conf.d/</filename>
+          </term>
+          <listitem>
+            <para>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.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <filename>/etc/cmdline</filename>
+          </term>
+          <listitem>
+            <para>Can contain additional command line options.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+  </refsect1>
+  <refsect1>
+    <title>See Also</title>
+    <para>
+      <citerefentry>
+        <refentrytitle>dracut</refentrytitle>
+        <manvolnum>8</manvolnum>
+      </citerefentry>
+      <citerefentry>
+        <refentrytitle>dracut.conf</refentrytitle>
+        <manvolnum>5</manvolnum>
+      </citerefentry>
+    </para>
+  </refsect1>
+</refentry>

dracut.spec

@@ -1,6 +1,6 @@
 # Variables must be defined
-%define with_switch_root	1
-%define with_nbd		1
+%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
@@ -19,16 +19,17 @@
 %endif
 
 Name: dracut
-Version: 004
+Version: 007
 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)
+BuildRequires: docbook-style-xsl docbook-dtds docbook-style-xsl libxslt 
 
 %if 0%{?fedora} > 12 || 0%{?rhel} >= 6
 # no "provides", because dracut does not offer
@@ -38,60 +39,60 @@ 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: 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
 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 
-Requires(pre): plymouth >= 0.8.0-0.2009.29.09.19.1
-Requires: plymouth >= 0.8.0-0.2009.29.09.19.1
-Requires: cryptsetup-luks
-Requires: file
 Requires: bzip2
-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: plymouth-scripts
+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
 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
+Requires: vconfig
 
 %description network
 This package requires everything which is needed to build a generic
 all purpose initramfs with network support with dracut.
 
 %package fips
-Summary: dracut modules to build a dracut initramfs with an integrity check.
+Summary: Dracut modules to build a dracut initramfs with an integrity check
 Requires: %{name} = %{version}-%{release}
 Requires: hmaccalc
 %if 0%{?rhel} > 5
@@ -115,26 +116,13 @@ 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
 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
+Requires: %{name} = %{version}-%{release}
 
 %description tools
 This package contains tools to assemble the local initrd and host configuration.
@@ -152,11 +140,14 @@ make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
 
 echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
 rm $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/01fips/check
+# remove gentoo specific modules
+rm -fr $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/50gensplash
 
 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
+install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/fedora.conf
 
 %if 0%{?fedora} <= 12 && 0%{?rhel} < 6
 rm $RPM_BUILD_ROOT/sbin/mkinitrd
@@ -180,13 +171,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/dracut
 %{_datadir}/dracut/dracut-functions
 %config(noreplace) /etc/dracut.conf
+%config(noreplace) /etc/dracut.conf.d/fedora.conf
+%dir /etc/dracut.conf.d
 %{_mandir}/man8/dracut.8*
+%{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man5/dracut.conf.5*
+%{_datadir}/dracut/modules.d/00bootchart
 %{_datadir}/dracut/modules.d/00dash
-%{_datadir}/dracut/modules.d/10redhat-i18n
+%{_datadir}/dracut/modules.d/10i18n
 %{_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
@@ -201,16 +197,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/95dasd
 %{_datadir}/dracut/modules.d/95dasd_mod
 %{_datadir}/dracut/modules.d/95zfcp
-%{_datadir}/dracut/modules.d/95znet
 %{_datadir}/dracut/modules.d/95terminfo
 %{_datadir}/dracut/modules.d/95udev-rules
 %{_datadir}/dracut/modules.d/95uswsusp
+%{_datadir}/dracut/modules.d/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
-%doc README HACKING TODO COPYING AUTHORS NEWS
 %defattr(-,root,root,0755)
 %{_datadir}/dracut/modules.d/40network
 %{_datadir}/dracut/modules.d/95fcoe
@@ -218,23 +215,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/95nbd
 %{_datadir}/dracut/modules.d/95nfs
 %{_datadir}/dracut/modules.d/45ifcfg
+%{_datadir}/dracut/modules.d/95znet
 
 %files fips
 %defattr(-,root,root,0755)
-%doc COPYING
 %{_datadir}/dracut/modules.d/01fips
 
-%files kernel 
-%defattr(-,root,root,0755)
-%doc README.kernel
-
 %files generic
 %defattr(-,root,root,0755)
 %doc README.generic
 
 %files tools 
 %defattr(-,root,root,0755)
-%doc COPYING NEWS
 %{_mandir}/man8/dracut-gencmdline.8*
 %{_mandir}/man8/dracut-catimages.8*
 /sbin/dracut-gencmdline
@@ -244,6 +236,100 @@ 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 

modules.d/00bootchart/check

@@ -0,0 +1,5 @@
+#!/bin/sh
+[ -x /sbin/bootchartd ] || exit 1
+
+# do not enable bootchartd by default
+exit 255

modules.d/00bootchart/install

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+inst /sbin/bootchartd 
+inst /bin/bash 
+ln -s /init "${initdir}/sbin/init"
+mkdir -p /lib/bootchart/
+inst /lib/bootchart/bootchart-collector 
+inst /etc/bootchartd.conf 
+inst /sbin/accton 
+inst /usr/bin/pkill /bin/pkill
+inst /bin/echo
+inst /bin/grep 
+inst /bin/usleep
+inst /usr/bin/[  /bin/[
+mknod -m 0666 "${initdir}/dev/null" c 1 3

modules.d/01fips/check

@@ -1,19 +1,5 @@
 #!/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
+[[ $1 = -d ]] && exit 0
 exit 255
 

modules.d/01fips/fips.sh

@@ -4,7 +4,7 @@ do_fips()
     FIPSMODULES=$(cat /etc/fipsmodules)
     BOOT=$(getarg boot=)
     KERNEL=$(uname -r)
-    udevadm trigger >/dev/null 2>&1
+    udevadm trigger --action=add >/dev/null 2>&1
     case "$boot" in
     block:LABEL=*|LABEL=*)
         boot="${boot#block:}"

modules.d/01fips/install

@@ -4,7 +4,7 @@ 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/libc; then
+if ldd $(find_binary sha512hmac) |grep -q /lib64/; then
     libdir="lib64"
 fi
 

modules.d/10i18n/10-console.rules

@@ -0,0 +1,2 @@
+# Console initialization - keyboard, font, etc.
+KERNEL=="tty0",		RUN+="/lib/udev/console_init %k"

modules.d/10i18n/README

@@ -0,0 +1,124 @@
+Dracut i18n module
+------------------
+
+INDEX
+
+0. Introduction
+1. Hostonly vs Generic
+2. Configuration
+   2.1. Variables
+   2.2. Setting up mappings
+   2.3. Additional settings
+3. Kernel parameters
+
+~
+
+0. Introduction
+
+i18n module provides internationalization for initramfs at runtime.  It
+is intended to be generic across different GNU/Linux distributions.
+
+i18n and keyboard settings are stored in different files among
+distributions.  To deal with it avoiding hardcoding those differences in
+the installation script we handle it by mappings between variables used
+by Dracut and the ones in the system.  Package maintainer is expected to
+create those for his/her distribution and it's appreciated to share it
+with us, so we can include it in source package. 
+
+
+1. Hostonly vs Generic
+
+If you invoke dracut with '-H' option, i18n module install script will
+gather variables values from your configuration files using mappings
+provided in "/etc/dracut.conf.d/<foo>.conf".  Those variables will be
+put in "etc/sysconfig/{i18n,keyboard}" files inside initramfs image.
+Next it will install only declared font, keymaps and so.
+
+When building generic image (dracut without '-H' option), install script
+copies all content of directories: consolefonts, consoletrans, unimaps
+and keymaps to image.  Take into account that's about 4 MiB.
+
+
+2. Configuration
+
+2.1. Variables
+
+The following variables are used by i18n install script and at initramfs
+runtime:
+
+    KEYMAP - keyboard translation table loaded by loadkeys
+    EXT_KEYMAPS - list of extra keymaps to bo loaded (sep. by space)
+    UNICODE - boolean, indicating UTF-8 mode
+    SYSFONT - console font
+    CONTRANS - see description of '-m' parameter in setfont manual
+    UNIMAP - see description of '-u' parameter in setfont manual
+
+The following are appended to EXT_KEYMAPS only during build time:
+
+    UNIKEYMAP
+    GRP_TOGGLE
+
+They were used in 10redhat-i18n module, but not sure of its purpose.
+I'm leaving it in case...  The following are taken from the environment:
+
+    LANG
+    LC_ALL
+
+If UNICODE variable is not provided, script indicates if UTF-8 should be
+used on the basis of LANG value (if it ends with ".utf8" or similar).
+
+
+2.2. Setting up mappings
+
+Mappings between variables listed in 2.1. and the ones spread around
+your system are set up in /etc/dracut.conf.d/<foo>.conf.  You need to
+assign mappings to fields keyboard_vars and i18n_vars.  Here's an
+example:
+
+keyboard_vars="/etc/conf.d/keymaps:KEYMAP,EXTENDED_KEYMAPS-EXT_KEYMAPS"
+i18n_vars="/etc/conf.d/consolefont:CONSOLEFONT-SYSFONT,CONSOLETRANSLATION-CONTRANS /etc/rc.conf:UNICODE"
+
+First we've got name of file in host file system tree.  After colon
+there's mapping: <from>-<to>.  If both variables have the same name you
+can enter just a single, but it's important to specify it!  The module
+will source only variables you've listed.
+
+Below there's detailed description in BNF:
+
+<list> ::= <element> | <element> " " <list>
+<element> ::= <conf-file-name> ":" <map-list>
+<map-list> ::= <mapping> | <mapping> "," <map-list>
+<mapping> ::= <src-var> "-" <dst-var> | <src-var>
+
+We assume no whitespace are allowed between symbols.
+<conf-file-name> is a file holding <src-var> in your system.
+<src-var> is a variable holding value of meaning the same as <dst-var>.
+<dst-var> is a variable which will be set up inside initramfs.
+If <dst-var> has the same name as <src-var> we can omit <dst-var>.
+
+Example:
+/etc/conf.d/keymaps:KEYMAP,extended_keymaps-EXT_KEYMAPS
+<list> = /etc/conf.d/keymaps:KEYMAP,extended_keymaps-EXT_KEYMAPS
+<element> = /etc/conf.d/keymaps:KEYMAP,extended_keymaps-EXT_KEYMAPS
+<conf-file-name> = /etc/conf.d/keymaps
+<map-list> = KEYMAP,extended_keymaps-EXT_KEYMAPS
+<mapping> = KEYMAP
+<src-var> = KEYMAP
+<mapping> = extended_keymaps-EXT_KEYMAPS
+<src-var> = extended_keymaps
+<dst-var> = EXT_KEYMAPS
+
+
+2.3. Additional settings
+
+If you encounter following error message: "Directories consolefonts,
+consoletrans, keymaps, unimaps not found.", you can provide path where
+those directories lie in your system by setting kbddir in configuration
+file (the same where you put mappings).
+
+
+3. Kernel parameters
+
+If you create generic initramfs you can set up i18n by kernel
+parameters using variables listed in 2.1. (except of UNIKEYMAP
+and GRP_TOGGLE) The recommended minimum is: SYSFONT, KEYMAP and UNICODE.

modules.d/10i18n/check

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

modules.d/10i18n/console_init

@@ -0,0 +1,91 @@
+#!/bin/sh
+
+[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
+[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard
+
+DEFAULT_SYSFONT=LatArCyrHeb-16
+DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap
+
+
+set_keyboard() {
+    local param
+
+    [ "${UNICODE}" = 1 ] && param=-u || param=-a
+    kbd_mode ${param}
+}
+
+set_terminal() {
+    local dev=$1
+
+    if [ "${UNICODE}" = 1 ]; then
+        printf '\033%%G' >&7
+        stty -F ${dev} iutf8
+    else
+        printf '\033%%@' >&7
+    fi
+}
+
+set_keymap() {
+    local utf_switch
+
+    if [ -z "${KEYMAP}" ]; then
+        [ -f "${DEFAULT_KEYMAP}" ] && KEYMAP=${DEFAULT_KEYMAP}
+    fi
+
+    [ -n "${KEYMAP}" ] || return 1
+
+    [ "${UNICODE}" = 1 ] && utf_switch=-u
+
+    loadkeys -q ${utf_switch} ${KEYMAP} ${EXT_KEYMAPS}
+}
+
+set_font() {
+    local dev=$1; local trans=''; local uni=''
+
+    [ -z "${SYSFONT}" ] && SYSFONT=${DEFAULT_SYSFONT}
+    [ -n "${CONTRANS}" ] && trans="-m ${CONTRANS}"
+    [ -n "${UNIMAP}" ] && uni="-u ${UNIMAP}"
+
+    setfont ${SYSFONT} -C ${dev} ${trans} ${uni}
+}
+
+dev_close() {
+    exec 6>&-
+    exec 7>&-
+}
+
+dev_open() {
+    local dev=$1
+
+    exec 6<${dev} && \
+    exec 7>>${dev}
+}
+
+
+dev=/dev/${1#/dev/}
+devname=${dev#/dev/}
+
+[ -c "${dev}" ] || {
+    echo "Usage: $0 device" >&2
+    exit 1
+}
+
+[ -e /tmp/console_init.${devname} ] && exit 0
+
+dev_open ${dev}
+
+for fd in 6 7; do
+    if ! [ -t ${fd} ]; then
+        echo "ERROR: File descriptor not opened: ${fd}" >&2
+        dev_close
+        exit 1
+    fi
+done
+
+set_keyboard
+set_terminal ${dev}
+set_font ${dev}
+set_keymap
+
+dev_close
+>/tmp/console_init.${devname}

modules.d/10i18n/install

@@ -0,0 +1,195 @@
+#!/bin/bash
+
+KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
+DEFAULT_SYSFONT=LatArCyrHeb-16
+I18N_CONF="${initdir}/etc/sysconfig/i18n"
+KEYBOARD_CONF="${initdir}/etc/sysconfig/keyboard"
+
+
+# This is from 10redhat-i18n.
+findkeymap () {
+    local MAP=$1
+    [[ ! -f $MAP ]] && \
+    MAP=$(find ${kbddir}/keymaps -type f -name $MAP -o -name $MAP.\* | head -n1)
+    [[ " $KEYMAPS " = *" $MAP "* ]] && return
+    KEYMAPS="$KEYMAPS $MAP"
+    case $MAP in
+        *.gz) cmd=zgrep;;
+        *.bz2) cmd=bzgrep;;
+        *) cmd=grep ;;
+    esac
+
+    for INCL in $($cmd "^include " $MAP | cut -d' ' -f2 | tr -d '"'); do
+        for FN in $(find ${kbddir}/keymaps -type f -name $INCL\*); do
+            findkeymap $FN
+        done
+    done
+}
+
+# Function gathers variables from distributed files among the tree, maps to
+# specified names and prints the result in format "new-name=value".
+#
+# $@ = list in format specified below (BNF notation)
+#
+# <list> ::= <element> | <element> " " <list>
+# <element> ::= <conf-file-name> ":" <map-list>
+# <map-list> ::= <mapping> | <mapping> "," <map-list>
+# <mapping> ::= <src-var> "-" <dst-var> | <src-var>
+#
+# We assume no whitespace are allowed between symbols.
+# <conf-file-name> is a file holding <src-var> in your system.
+# <src-var> is a variable holding value of meaning the same as <dst-var>.
+# <dst-var> is a variable which will be set up inside initramfs.
+# If <dst-var> has the same name as <src-var> we can omit <dst-var>.
+#
+# Example:
+# /etc/conf.d/keymaps:KEYMAP,extended_keymaps-EXT_KEYMAPS
+# <list> = /etc/conf.d/keymaps:KEYMAP,extended_keymaps-EXT_KEYMAPS
+# <element> = /etc/conf.d/keymaps:KEYMAP,extended_keymaps-EXT_KEYMAPS
+# <conf-file-name> = /etc/conf.d/keymaps
+# <map-list> = KEYMAP,extended_keymaps-EXT_KEYMAPS
+# <mapping> = KEYMAP
+# <src-var> = KEYMAP
+# <mapping> = extended_keymaps-EXT_KEYMAPS
+# <src-var> = extended_keymaps
+# <dst-var> = EXT_KEYMAPS
+gather_vars() {
+    local item map value
+
+    for item in $@
+    do
+        item=(${item/:/ })
+        for map in ${item[1]//,/ }
+        do
+            map=(${map//-/ })
+            value=$(grep "^${map[0]}=" "${item[0]}")
+            value=${value#*=}
+            echo "${map[1]:-${map[0]}}=${value}"
+        done
+    done
+}
+
+install_base() {
+    dracut_install setfont loadkeys kbd_mode stty
+    inst ${moddir}/console_init /lib/udev/console_init
+    inst_rules ${moddir}/10-console.rules
+    inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
+}
+
+install_all_kbd() {
+    local rel f
+
+    for f in $(eval find ${kbddir}/{${KBDSUBDIRS}} -type f -print)
+    do
+        inst $f
+    done
+
+    # remove unnecessary files
+    rm -f "${initdir}${kbddir}/consoletrans/utflist"
+    find "${initdir}${kbddir}/" -name README\* -delete
+
+    dracut_install gzip bzip2
+}
+
+install_local_keyboard() {
+    local map
+
+    eval $(gather_vars ${keyboard_vars})
+
+    # Gentoo user may have KEYMAP set to something like "-u pl2",
+    KEYMAP=${KEYMAP#-* }
+    # I'm not sure of the purpose of UNIKEYMAP and GRP_TOGGLE.  They were in
+    # original redhat-i18n module.  Anyway it won't hurt.
+    EXT_KEYMAPS+=\ ${UNIKEYMAP}\ ${GRP_TOGGLE}
+
+    [[ ${KEYMAP} ]] || derror 'No KEYMAP.' || return 1
+    findkeymap ${KEYMAP}
+
+    for map in ${EXT_KEYMAPS}
+    do
+        dinfo "Adding extra map: ${map}"
+        findkeymap ${map}
+    done
+
+    inst_opt_decompress ${KEYMAPS}
+
+    mksubdirs ${KEYBOARD_CONF}
+    print_vars KEYMAP EXT_KEYMAPS >> ${KEYBOARD_CONF}
+}
+
+install_local_i18n() {
+    eval $(gather_vars ${i18n_vars})
+
+    [[ ${SYSFONT} ]] || SYSFONT=${DEFAULT_SYSFONT}
+    SYSFONT=${SYSFONT%.psf*}
+    inst_opt_decompress ${kbddir}/consolefonts/${SYSFONT}.*
+
+    if [[ ${CONTRANS} ]]
+    then
+        CONTRANS=${CONTRANS%.trans}
+        inst ${kbddir}/consoletrans/${CONTRANS}.trans
+    fi
+
+    if [[ ${UNIMAP} ]]
+    then
+        UNIMAP=${UNIMAP%.uni}
+        inst ${kbddir}/unimaps/${UNIMAP}.uni
+    fi
+
+    if [[ ${UNICODE} ]]
+    then
+        if [[ ${UNICODE^^} = YES || ${UNICODE} = 1 ]]
+        then
+            UNICODE=1
+        elif [[ ${UNICODE^^} = NO || ${UNICODE} = 0 ]]
+        then
+            UNICODE=0
+        else
+            UNICODE=''
+        fi
+    fi
+    if [[ ! ${UNICODE} && ${LANG^^} =~ .*\.UTF-?8 ]]
+    then
+        UNICODE=1
+    fi
+
+    mksubdirs ${I18N_CONF}
+    print_vars LC_ALL LANG UNICODE SYSFONT CONTRANS UNIMAP >> ${I18N_CONF}
+}
+
+checks() {
+    for kbddir in ${kbddir} /usr/lib/kbd /lib/kbd /usr/share
+    do
+        [[ -d "${kbddir}" ]] && \
+        for dir in ${KBDSUBDIRS//,/ }
+        do
+            [[ -d "${kbddir}/${dir}" ]] && continue
+            false
+        done && break
+	kbddir='' 
+    done
+
+    [[ ${kbddir} ]] || {
+        derror "Directories ${KBDSUBDIRS//,/, } not found.  Please inform us about the issue including your OS name and version."
+        return 1
+    }
+
+    [[ ! ${hostonly} || ${keyboard_vars} && ${i18n_vars} ]] || {
+        derror 'Please set up keyboard_vars and i18n_vars in configuration file.'
+        return 1
+    }
+}
+
+
+if checks
+then
+    install_base
+
+    if [[ ${hostonly} ]]
+    then
+        install_local_keyboard
+        install_local_i18n
+    else
+        install_all_kbd
+    fi
+fi

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

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+inst_key_val() {
+    local value
+    value=$(getarg $1)
+    [ -n "${value}" ] && printf '%s="%s"\n' $1 ${value} >> $2
+}
+
+
+mkdir -p /etc/sysconfig
+inst_key_val KEYMAP /etc/sysconfig/keyboard
+inst_key_val EXT_KEYMAPS /etc/sysconfig/keyboard
+inst_key_val UNICODE /etc/sysconfig/i18n
+inst_key_val SYSFONT /etc/sysconfig/i18n
+inst_key_val CONTRANS /etc/sysconfig/i18n
+inst_key_val UNIMAP /etc/sysconfig/i18n
+inst_key_val LANG /etc/sysconfig/i18n
+inst_key_val LC_ALL /etc/sysconfig/i18n
+
+if [ -f /etc/sysconfig/i18n ]; then
+    . /etc/sysconfig/i18n
+    export LANG
+    export LC_ALL
+fi

modules.d/10redhat-i18n/check

@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -f /etc/redhat-release ]

modules.d/10redhat-i18n/install

@@ -1,100 +0,0 @@
-#!/bin/bash
-
-findkeymap () {
-    local MAP=$1
-    [[ ! -f $MAP ]] && \
-	MAP=$(find ${kbddir}/keymaps -type f -name $MAP -o -name $MAP.\* | head -n1)
-    [[ " $KEYMAPS " = *" $MAP "* ]] && return
-    KEYMAPS="$KEYMAPS $MAP"
-    case $MAP in
-        *.gz) cmd=zgrep;;
-        *.bz2) cmd=bzgrep;;
-        *) cmd=grep ;;
-    esac
-
-    for INCL in $($cmd "^include " $MAP | cut -d' ' -f2 | tr -d '"'); do
-        for FN in $(find ${kbddir}/keymaps -type f -name $INCL\*); do
-            findkeymap $FN
-        done
-    done
-}
-
-install_local()
-{
-# FIXME: i18n stuff isn't really distro-independent :/
-    if [[ -f /etc/sysconfig/keyboard || -f /etc/sysconfig/console/default.kmap ]]; then
-	if [ -f /etc/sysconfig/console/default.kmap ]; then
-            KEYMAP=/etc/sysconfig/console/default.kmap
-	else
-            . /etc/sysconfig/keyboard
-	    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
-		    TARGET=$(readlink -f $FN)
-		    TG=$(echo $TARGET | sed -e 's/\.gz$//' -e 's/\.bz2$//')
-		    LN=$(echo $FN | sed -e 's/\.gz$//' -e 's/\.bz2$//')
-                    mkdir -p "$initdir/$(dirname $LN)"
-                    ln -s "$TG" "$initdir/$LN"
-                    FN=$TARGET
-		fi
-		inst $FN
-		case $FN in
-                    *.gz) gzip -d "$initdir$FN" ;;
-                    *.bz2) bzip2 -d "$initdir$FN" ;;
-		esac
-            done
-	fi
-    fi
-
-    if [ -f /etc/sysconfig/i18n ]; then
-	. /etc/sysconfig/i18n
-	inst /etc/sysconfig/i18n
-	[[ $SYSFONT ]] || SYSFONT=latarcyrheb-sun16
-	inst setfont
-
-	for FN in ${kbddir}/consolefonts/$SYSFONT.* ; do
-            inst "$FN"
-            case $FN in
-		*.gz) gzip -d "$initdir$FN" ;;
-		*.bz2) bzip2 -d "$initdir$FN" ;;
-            esac
-	done
-	[[ $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 ${kbddir} -type f -print); do
-	dracut_install $i
-    done
-    # remove unnecessary files
-    rm -f "$initdir${kbddir}/consoletrans/utflist" 2>/dev/null
-    find "$initdir${kbddir}/" -name README\* -exec rm -f '{}' \;
-    dracut_install gzip bzip2
-fi
-
-dracut_install /lib/udev/console_init 
-dracut_install setfont loadkeys
-inst_rules 10-console.rules
-inst_hook cmdline 20 "$moddir/parse-i18n.sh"

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

@@ -1,20 +0,0 @@
-inst_key_val()
-{
-    local value
-    value=$(getarg $1)
-    [ -n "$value" ] && printf '%s="%s"\n' $1 $value >> $2
-}
-
-mkdir -p /etc/sysconfig
-inst_key_val KEYBOARDTYPE /etc/sysconfig/keyboard
-inst_key_val KEYTABLE /etc/sysconfig/keyboard
-inst_key_val SYSFONT /etc/sysconfig/i18n
-inst_key_val SYSFONTACM /etc/sysconfig/i18n
-inst_key_val UNIMAP /etc/sysconfig/i18n
-inst_key_val LANG /etc/sysconfig/i18n
-
-if [ -f /etc/sysconfig/i18n ]; then
-    . /etc/sysconfig/i18n
-    export LANG
-fi
-

modules.d/10rpmversion/install

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [ -e "$moddir/dracut-version" ]; then
     dracut_rpm_version=$(cat "$moddir/dracut-version")
     inst "$moddir/dracut-version" /$dracut_rpm_version

modules.d/40network/check

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [[ $1 = -d ]]; then
+  [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg
+  exit 0
+fi
+
 . $dracutfunctions
 
 for program in ip arping; do 
@@ -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

@@ -44,14 +44,10 @@ setup_interface() {
 
 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
 
@@ -60,10 +56,12 @@ 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
@@ -76,7 +74,7 @@ case $reason in
 	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,13 +7,15 @@
 [ -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"

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

@@ -2,8 +2,6 @@
 
 # if there are no ifname parameters, just use NAME=KERNEL
 if ! getarg ifname= >/dev/null ; then
-    echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="?*", ATTR{type}=="1", NAME="%k"' \
-        > /etc/udev/rules.d/50-ifname.rules
     return
 fi
 

modules.d/40network/ifup

@@ -3,59 +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 wait_for_if_up $netif
-	echo ip addr flush dev $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 "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
 
@@ -99,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
@@ -115,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

@@ -11,3 +11,18 @@ 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"
+
+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
+

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", NAME=="%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

modules.d/40network/netroot

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

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

modules.d/45ifcfg/check

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

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

@@ -15,39 +15,49 @@ for netif in $IFACES ; do
         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
+    {
+	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" >> /tmp/ifcfg/ifcfg-$netif
-	echo "NETMASK=$mask" >> /tmp/ifcfg/ifcfg-$netif
-	[ -n "$gw" ] && echo "GATEWAY=$gw" >> /tmp/ifcfg/ifcfg-$netif
-    fi
+	    . /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)" >> /tmp/ifcfg/ifcfg-$netif
-        echo "TYPE=Ethernet" >> /tmp/ifcfg/ifcfg-$netif
-        echo "NAME=\"Boot Disk\"" >> /tmp/ifcfg/ifcfg-$netif
+	{
+            echo "HWADDR=$(cat /sys/class/net/$netif/address)"
+            echo "TYPE=Ethernet"
+            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
+	{
+	    echo "TYPE=Bridge"
+            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
+	{
+            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
 

modules.d/50gensplash/README

@@ -0,0 +1,42 @@
+Dracut gensplash module
+-----------------------
+
+INDEX
+
+0. Introduction
+1. Hostonly vs Generic
+2. Configuration and kernel parameters
+
+~
+
+0. Introduction
+
+gensplash is based on Genkernel code and that's why it's Gentoo-specific.  It
+requires splashutils to work.  To set up theme you may edit /etc/conf.d/splash
+or set DRACUT_GENSPLASH_THEME and DRACUT_GENSPLASH_RES variables.  Your theme
+has to exist in /etc/splash and for every given resolution has to exist config
+in theme's directory, e.g. there's 1024x768.cfg in /etc/splash/natural_gentoo.
+List of resolutions is comma-separated.
+
+NOTE: The module will be rewritten to be distro-neutral. Its name will change
+to fbsplash.
+
+
+1. Hostonly vs Generic
+
+All available themes are installed only if no --hostonly is specified and no
+DRACUT_GENSPLASH_THEME and DRACUT_GENSPLASH_RES are set.  Otherwise those vars
+are checked and if not set then config /etc/conf.d/splash is read.
+
+
+2. Configuration and kernel parameters
+
+Example set up by environment variables:
+    DRACUT_GENSPLASH_THEME=natural_gentoo
+    DRACUT_GENSPLASH_RES=1024x768,1024x600
+
+Example kernel arguments:
+    splash=silent,theme:natural_gentoo console=tty1 quiet
+
+You may easily set up the module using Genkernel with arguments:
+    --gensplash=<theme>:<res1>,<res2>,...

modules.d/50gensplash/check

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# TODO: splash_geninitramfs
+# TODO: /usr/share/splashutils/initrd.splash
+exit 255

modules.d/50gensplash/gensplash-emergency.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+CDROOT=0
+. /lib/gensplash-lib.sh
+splash verbose

modules.d/50gensplash/gensplash-newroot.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+CDROOT=0
+. /lib/gensplash-lib.sh
+splash set_msg 'Switching to new root'

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

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if ! getarg rd_NO_SPLASH; then
+    [ -c /dev/null ] || mknod /dev/null c 1 3
+    [ -c /dev/console ] || mknod /dev/console c 5 1
+    [ -c /dev/tty0 ] || mknod /dev/tty0 c 4 0
+
+    info "Starting Gentoo Splash"
+
+    /lib/udev/console_init tty0
+    CDROOT=0
+    . /lib/gensplash-lib.sh
+    splash init
+fi

modules.d/50gensplash/install

@@ -0,0 +1,63 @@
+#!/bin/bash
+
+call_splash_geninitramfs() {
+    local out ret 
+
+    out=$(splash_geninitramfs -c "$1" ${@:2} 2>&1)
+    ret=$?
+
+    if [[ ${out} ]]; then
+        local IFS='
+'
+        for line in ${out}; do
+            if [[ ${line} =~ ^Warning ]]; then
+                dwarning "${line}"
+            else
+                derror "${line}"
+                (( ret == 0 )) && ret=1
+            fi
+        done
+    fi
+
+    return ${ret}
+}
+
+
+type -P splash_geninitramfs >/dev/null || exit 1
+
+opts=''
+
+if [[ ${DRACUT_GENSPLASH_THEME} ]]; then
+    # Variables from the environment
+    # They're supposed to be set up by e.g. Genkernel in basis of cmdline args.
+    # If user set them he/she would expect to be included only given theme
+    # rather then all even if we're building generic initramfs.
+    SPLASH_THEME=${DRACUT_GENSPLASH_THEME}
+    SPLASH_RES=${DRACUT_GENSPLASH_RES}
+elif [[ ${hostonly} ]]; then
+    # Settings from config only in hostonly
+    [[ -e /etc/conf.d/splash ]] && source /etc/conf.d/splash
+    [[ ! ${SPLASH_THEME} ]] && SPLASH_THEME=default
+    [[ ${SPLASH_RES} ]] && opts+=" -r ${SPLASH_RES}"
+else
+    # generic
+    SPLASH_THEME=--all
+fi
+
+dinfo "Installing Gentoo Splash (using the ${SPLASH_THEME} theme)"
+
+pushd "${initdir}" >/dev/null
+mv dev dev.old
+call_splash_geninitramfs "${initdir}" ${opts} ${SPLASH_THEME} || {
+    derror "Could not build splash"
+    exit 1
+}
+rm -rf dev
+mv dev.old dev
+popd >/dev/null
+
+dracut_install chvt
+inst /usr/share/splashutils/initrd.splash /lib/gensplash-lib.sh
+inst_hook pre-pivot 90 "${moddir}"/gensplash-newroot.sh
+inst_hook pre-trigger 10 "${moddir}"/gensplash-pretrigger.sh
+inst_hook emergency 50 "${moddir}"/gensplash-emergency.sh

modules.d/50plymouth/check

@@ -1,3 +1,3 @@
 #!/bin/bash
-[[ $1 = -d ]] && echo crypt
+[[ $1 = -d ]] && which cryptsetup &>/dev/null && echo crypt
 [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]

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

@@ -9,6 +9,9 @@
 # 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
@@ -21,7 +24,7 @@ else
     device="$1"
 fi
 
-if [ -f /etc/crypttab ] && ! getargs rd_NO_CRYPTTAB; then
+if [ -f /etc/crypttab ] && ! getarg rd_NO_CRYPTTAB; then
     while read name dev rest; do
 	# ignore blank lines and comments
 	if [ -z "$name" -o "${name#\#}" != "$name" ]; then
@@ -48,30 +51,20 @@ if [ -f /etc/crypttab ] && ! getargs rd_NO_CRYPTTAB; then
     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
-	luks=${luks##luks-}
-	if [ "${luuid##$luks}" != "$luuid" ] || [ "$luksname" = "$luks" ]; then
-	    ask=1
-	    break
-	fi
-    done
+prompt="Password [$device ($luksname)]:" 
+if [ ${#luksname} -gt 8 ]; then
+    sluksname=${sluksname##luks-}
+    sluksname=${luksname%%${luksname##????????}}
+    prompt="Password for $device ($sluksname...)"
 fi
-unset LUKS luks luuid
 
-if [ $ask -gt 0 ]; then
-    info "luksOpen $device $luksname"
-    # flock against other interactive activities
-    { flock -s 9; 
-	/bin/plymouth ask-for-password \
-	    --prompt "$device ($luksname) is password protected" \
-	    --command="/sbin/cryptsetup luksOpen -T1 $device $luksname"
-    } 9>/.console.lock
-fi
+# flock against other interactive activities
+{ flock -s 9; 
+    /bin/plymouth ask-for-password \
+	--prompt "$prompt" \
+	--command="/sbin/cryptsetup luksOpen -T1 $device $luksname"
+} 9>/.console.lock
+
 unset ask device luksname
 
 # mark device as asked
@@ -80,4 +73,4 @@ unset ask device luksname
 udevsettle
 
 exit 0
-# vim:ts=8:sw=4:sts=4:et
+# vim:ts=8:sw=4:sts=4:et

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' 2>/dev/null); do
-    nm -uPA $modname | grep -q drm_crtc_init && instmods $modname
+    grep -q drm_crtc_init  $modname && instmods $modname
 done

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,17 +1,19 @@
 #!/bin/sh
 
 if ! getarg rd_NO_PLYMOUTH; then
-    [ -c /dev/null ] || mknod /dev/null c 1 3
+    [ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3
     # first trigger graphics subsystem
     udevadm trigger --attr-match=class=0x030000 >/dev/null 2>&1
     # first trigger graphics and tty subsystem
     udevadm trigger --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty >/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
+    [ -c /dev/zero ] || mknod -m 0666 /dev/zero c 1 5
+    [ -c /dev/tty0 ] || mknod -m 0620 /dev/tty0 c 4 0
+    [ -e /dev/systty ] || ln -s tty0 /dev/systty
+    [ -c /dev/fb0 ] || mknod -m 0660 /dev/fb0 c 29 0
+    [ -e /dev/fb ] || ln -s fb0 /dev/fb
+    [ -c /dev/hvc0 ] || mknod -m 0600 /dev/hvc0 c 229 0
 
     info "Starting plymouth daemon"
     [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session

modules.d/60xen/check

@@ -1,12 +1,14 @@
 #!/bin/bash
 
 # No Xen-detect? Boo!!
-which xen-detect >/dev/null 2>&1 || exit 1
+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.
-xen-detect | egrep -q -v 'PV' || exit 0
+$XENDETECT | egrep -q -v 'PV' || exit 0
 
 exit 1

modules.d/60xen/install

@@ -1,4 +1,6 @@
 #!/bin/bash
-inst xen-detect 
+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/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,22 @@
+#!/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
+
+. $dracutfunctions
+[[ $debug ]] && set -x
+
+is_btrfs() { get_fs_type /dev/block/$1 |grep -q btrfs; }
+
+if [[ "$1" = "-h" ]]; then
+    rootdev=$(find_root_block_device)
+    if [[ $rootdev ]]; then
+	is_btrfs "$rootdev" || exit 1
+    fi
+fi
+
+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

@@ -1,12 +0,0 @@
-# hacky rules to try to try unlocking dm-crypt devs
-#
-# Copyright 2008, Red Hat, Inc.
-# Jeremy Katz <katzj@redhat.com>
-
-
-SUBSYSTEM!="block", GOTO="luks_end"
-ACTION!="add|change", GOTO="luks_end"
-
-ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/sbin/initqueue --unique --onetime --name cryptroot-ask-%k /sbin/cryptroot-ask $env{DEVNAME} luks-$env{ID_FS_UUID}"
-
-LABEL="luks_end"

modules.d/90crypt/check

@@ -3,6 +3,8 @@
 # if cryptsetup is not installed, then we cannot support encrypted devices.
 which cryptsetup >/dev/null 2>&1 || exit 1
 
+[ "$1" = "-d" ] && echo dm
+
 # hostonly checking should only return true if root is on a LUKS device
 # in some way, but I am too lazy to figure out how to do that.
 # Instead, fail if we do not have a LUKS device in use somewhere.
@@ -19,7 +21,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,5 +1,11 @@
 #!/bin/sh
 # close everything which is not busy
-for i in /dev/mapper/luks-*; do
-    cryptsetup luksClose $i >/dev/null 2>&1
+rm -f /etc/udev/rules.d/70-luks.rules >/dev/null 2>&1
+
+while true; do
+	local do_break="y"
+	for i in /dev/mapper/luks-*; do
+	    cryptsetup luksClose $i >/dev/null 2>&1 && do_break=n
+	done
+	[ "$do_break" = "y" ] && break
 done

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

@@ -9,6 +9,9 @@
 # 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
@@ -21,54 +24,104 @@ else
     device="$1"
 fi
 
-if [ -f /etc/crypttab ] && ! getargs rd_NO_CRYPTTAB; then
+if [ -f /etc/crypttab ] && ! getarg rd_NO_CRYPTTAB; then
     while read name dev rest; do
-	# ignore blank lines and comments
-	if [ -z "$name" -o "${name#\#}" != "$name" ]; then
-	    continue
-	fi
+        # 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
+        # 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
-	luks=${luks##luks-}
-	if [ "${luuid##$luks}" != "$luuid" ] || [ "$luksname" = "$luks" ]; then
-	    ask=1
-	    break
-	fi
-    done
-fi
-unset LUKS luks luuid
+#
+# Search key on external devices
+#
 
-if [ $ask -gt 0 ]; then
-    info "luksOpen $device $luksname"
+# Try to mount device specified by UUID and probe for existence of any of
+# the paths.  On success return 0 and print "<uuid> <first-existing-path>",
+# otherwise return 1.
+# Function leaves mount point created.
+probe_keydev() {
+    local uuid="$1"; shift; local keypaths="$*"
+    local ret=1; local mount_point=/mnt/keydev
+    local path
+
+    [ -n "${uuid}" -a -n "${keypaths}" ] || return 1
+    [ -d ${mount_point} ] || mkdir -p "${mount_point}" || return 1
+
+    if mount -r -U "${uuid}" "${mount_point}" 2>/dev/null >/dev/null; then
+        for path in ${keypaths}; do
+            if [ -f "${mount_point}/${path}" ]; then
+                echo "${uuid} ${path}"
+                ret=0
+                break
+            fi
+        done
+    fi
+
+    umount "${mount_point}" 2>/dev/null >/dev/null
+
+    return ${ret}
+}
+
+keypaths="$(getargs rd_LUKS_KEYPATH)"
+unset keydev_uuid keypath
+
+if [ -n "$keypaths" ]; then
+    keydev_uuids="$(getargs rd_LUKS_KEYDEV_UUID)"
+    [ -n "$keydev_uuids" ] || {
+            warn 'No UUID of device storing LUKS key specified.'
+            warn 'It is recommended to set rd_LUKS_KEYDEV_UUID.'
+            warn 'Performing scan of *all* devices accessible by UUID...'
+    }
+    tmp=$(foreach_uuid_until "probe_keydev \$full_uuid $keypaths" \
+            $keydev_uuids) && {
+        keydev_uuid="${tmp%% *}"
+        keypath="${tmp#* }"
+    } || {
+        warn "Key for $device not found."
+    }
+    unset tmp keydev_uuids
+fi
+
+unset keypaths
+
+#
+# Open LUKS device
+#
+
+info "luksOpen $device $luksname"
+
+if [ -n "$keydev_uuid" ]; then
+    mntp=/mnt/keydev
+    mkdir -p "$mntp"
+    mount -r -U "$keydev_uuid" "$mntp"
+    cryptsetup -d "$mntp/$keypath" luksOpen "$device" "$luksname"
+    umount "$mntp"
+    rmdir -p "$mntp" 2>/dev/null
+else
     # flock against other interactive activities
-    { flock -s 9; 
-	echo -n "$device ($luksname) is password protected"
-	/sbin/cryptsetup luksOpen -T1 $1 $luksname 
+    { flock -s 9;
+        echo -n "$device ($luksname) is password protected"
+        cryptsetup luksOpen -T1 $1 $luksname
     } 9>/.console.lock
 fi
 
@@ -76,4 +129,4 @@ fi
 >> /tmp/cryptroot-asked-$2
 
 exit 0
-# vim:ts=8:sw=4:sts=4:et
+# vim:ts=8:sw=4:sts=4:et

modules.d/90crypt/install

@@ -1,8 +1,6 @@
 #!/bin/bash
 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 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 fpu
+

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

@@ -2,5 +2,42 @@
 if getarg rd_NO_LUKS; then
     info "rd_NO_LUKS: removing cryptoluks activation"
     rm -f /etc/udev/rules.d/70-luks.rules
-fi
+else
+    {
+        echo 'SUBSYSTEM!="block", GOTO="luks_end"'
+        echo 'ACTION!="add|change", GOTO="luks_end"'
+    } > /etc/udev/rules.d/70-luks.rules
 
+    LUKS=$(getargs rd_LUKS_UUID)
+    unset settled
+    [ -n "$(getargs rd_LUKS_KEYPATH)" ] && \
+            [ -z "$(getargs rd_LUKS_KEYDEV_UUID)" ] && \
+            settled='--settled'
+
+    if [ -n "$LUKS" ]; then
+        for luksid in $LUKS; do 
+            luksid=${luksid##luks-}
+            {
+                printf 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
+                printf 'ENV{ID_FS_UUID}=="*%s*", ' $luksid
+                printf 'RUN+="/sbin/initqueue --unique --onetime %s ' "$settled"
+                printf -- '--name cryptroot-ask-%%k /sbin/cryptroot-ask '
+                printf '$env{DEVNAME} luks-$env{ID_FS_UUID}"\n'
+            } >> /etc/udev/rules.d/70-luks.rules
+
+            printf '[ -e /dev/disk/by-uuid/*%s* ] || exit 1\n' $luksid \
+                    >> /initqueue-finished/crypt.sh
+            {
+                printf '[ -e /dev/disk/by-uuid/*%s* ] || ' $luksid
+                printf 'warn "crypto LUKS UUID "%s" not found"\n' $luksid
+            } >> /emergency/00-crypt.sh
+        done
+    else
+        echo 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/sbin/initqueue' $settled \
+                '--unique --onetime --name cryptroot-ask-%k' \
+                '/sbin/cryptroot-ask $env{DEVNAME} luks-$env{ID_FS_UUID}"' \
+                >> /etc/udev/rules.d/70-luks.rules
+    fi
+
+    echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules
+fi

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

@@ -1 +1 @@
-modprobe dm_mod 
+strstr "$(cat /proc/misc)" device-mapper || modprobe dm_mod 

modules.d/90dmraid/dmraid.sh

@@ -10,7 +10,7 @@ DM_CLEANUP="no"
 info "Scanning for dmraid devices $DM_RAIDS"
 SETS=$(dmraid -c -s)
 
-if [ "$SETS" = "no raid disks" ]; then
+if [ "$SETS" = "no raid disks" -o "$SETS" = "no raid sets" ]; then
     return
 fi
 

modules.d/90dmsquash-live/cdrom-hack.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -e /dev/sr0 ] && {
-	blkid /dev/sr0;
-	blkid /dev/sr0;
-} 2>/dev/null

modules.d/90dmsquash-live/check

@@ -2,7 +2,10 @@
 
 # if dmsetup is not installed, then we cannot support fedora/red hat 
 # style live images
-which dmsetup >/dev/null 2>&1 || exit 1
+if [ "$1" = "-d" ]; then
+    echo dm
+    exit 0
+fi
 
 # a live host-only image doesn't really make a lot of sense
 if [ "$1" = "-h" ] ; then

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

@@ -1,14 +1,15 @@
 if [ "${root%%:*}" = "live" ]; then
-    (
+    {
     printf 'KERNEL=="%s", SYMLINK+="live"\n' \
     	${root#live:/dev/} 
     printf 'SYMLINK=="%s", SYMLINK+="live"\n' \
 	${root#live:/dev/} 
+    } >> /dev/.udev/rules.d/99-live-mount.rules
+    {
     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 --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
 	${root#live:/dev/} 
-
-    ) >> /etc/udev/rules.d/99-live-mount.rules
+    } >> /etc/udev/rules.d/99-live-squash.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
@@ -40,7 +41,8 @@ getarg ro && liverw=ro
 getarg rw && liverw=rw
 [ -z "$liverw" ] && liverw=ro
 # mount the backing of the live image first
-mount -n -t $fstype -o $liverw $livedev $NEWROOT
+mkdir -p /dev/.initramfs/live
+mount -n -t $fstype -o $liverw $livedev /dev/.initramfs/live
 RES=$?
 if [ "$RES" != "0" ]; then
     die "Failed to mount block device of live image"
@@ -95,7 +97,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
@@ -104,8 +106,8 @@ do_live_from_base_loop() {
 }
 
 # we might have a genMinInstDelta delta file for anaconda to take advantage of
-if [ -e $NEWROOT/${live_dir}/osmin.img ]; then
-    OSMINSQFS=$NEWROOT/${live_dir}/osmin.img
+if [ -e /dev/.initramfs/live/${live_dir}/osmin.img ]; then
+    OSMINSQFS=/dev/.initramfs/live/${live_dir}/osmin.img
 fi
 
 if [ -n "$OSMINSQFS" ]; then
@@ -121,21 +123,20 @@ if [ -n "$OSMINSQFS" ]; then
 fi
 
 # we might have just an embedded ext3 to use as rootfs (uncompressed live)
-if [ -e $NEWROOT/${live_dir}/ext3fs.img ]; then
-  EXT3FS="$NEWROOT/${live_dir}/ext3fs.img"
+if [ -e /dev/.initramfs/live/${live_dir}/ext3fs.img ]; then
+  EXT3FS="/dev/.initramfs/live/${live_dir}/ext3fs.img"
 fi
 
 if [ -n "$EXT3FS" ] ; then
     BASE_LOOPDEV=$( losetup -f )
     losetup -r $BASE_LOOPDEV $EXT3FS
-    umount -l $NEWROOT
 
     do_live_from_base_loop
 fi
 
 # we might have an embedded ext3 on squashfs to use as rootfs (compressed live)
-if [ -e $NEWROOT/${live_dir}/squashfs.img ]; then
-  SQUASHED="$NEWROOT/${live_dir}/squashfs.img"
+if [ -e /dev/.initramfs/live/${live_dir}/squashfs.img ]; then
+  SQUASHED="/dev/.initramfs/live/${live_dir}/squashfs.img"
 fi
 
 if [ -e "$SQUASHED" ] ; then
@@ -143,7 +144,7 @@ if [ -e "$SQUASHED" ] ; then
         echo "Copying live image to RAM..."
         echo "(this may take a few minutes)"
         dd if=$SQUASHED of=/squashed.img bs=512 2> /dev/null
-        umount -n $NEWROOT
+        umount -n /dev/.initramfs/live
         echo "Done copying live image to RAM."
         eject -p $livedev || :
         SQUASHED="/squashed.img"
@@ -158,9 +159,6 @@ if [ -e "$SQUASHED" ] ; then
     losetup -r $BASE_LOOPDEV /squashfs/LiveOS/ext3fs.img
 
     umount -l /squashfs
-    if [ -z "$live_ram" ] ; then
-        umount -l $NEWROOT
-    fi
 
     do_live_from_base_loop
 fi
@@ -168,10 +166,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

@@ -1,7 +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
+    } >> /etc/udev/rules.d/99-liveiso-mount.rules
     echo '[ -e /dev/root ]' > /initqueue-finished/dmsquash.sh
 fi

modules.d/90dmsquash-live/install

@@ -21,4 +21,3 @@ 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
-inst "$moddir/cdrom-hack.sh" /sbin/cdrom-hack.sh

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

@@ -39,7 +39,5 @@ case "$liveroot" in
 esac
 info "root was $root, liveroot is now $liveroot"
 
-[ $rootok = "1" ] && initqueue --settled /sbin/cdrom-hack.sh
-
 # make sure that init doesn't complain
 [ -z "$root" ] && root="live"

modules.d/90kernel-modules/installkernel

@@ -1,35 +1,38 @@
 #!/bin/bash
 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'
+	local blockfuncs='ahci_init_controller|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 pcmcia sd_mod scsi_dh scsi_dh_rdac scsi_dh_emc
-    instmods firewire-ohci
+    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 $filesystems
+  hostonly='' instmods $drivers $filesystems
 fi
 
-[[ $add_drivers ]] && instmods $add_drivers
+[[ $add_drivers ]] && hostonly='' instmods $add_drivers
 
 # force install of scsi_wait_scan
-old_hostonly=$hostonly
-hostonly=''
-instmods scsi_wait_scan
-hostonly=$old_hostonly
+hostonly='' instmods scsi_wait_scan
 

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

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

modules.d/90lvm/install

@@ -1,7 +1,7 @@
 #!/bin/bash
 inst lvm
 
-inst_rules "$moddir/64-lvm.rules" 64-lvm.rules
+inst_rules "$moddir/64-lvm.rules" 
 
 if [[ $hostonly ]] || [[ $lvmconf = "yes" ]]; then 
     if [ -f /etc/lvm/lvm.conf ]; then
@@ -16,3 +16,14 @@ 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"
+
+
+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_scan.sh

@@ -55,18 +55,18 @@ nopoll=$(
 	maj=${maj##*:}; 
 	sub=${sub%% *}; sub=${sub%%\(*}; 
 	check_lvm_ver $maj $min $sub && \
-	    echo " --poll n "))
+	    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 --monitor n $LVS 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 --monitor n $VGS 2>&1 | vinfo
+    lvm vgchange -ay --ignorelockingfailure $nopoll --ignoremonitoring $VGS 2>&1 | vinfo
 fi
 
 if [ "$lvmwritten" ]; then

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

@@ -1,10 +1,18 @@
-if getarg rd_NO_LVM; then
-    info "rd_NO_LVM: removing LVM activation"
-    rm -f /etc/udev/rules.d/64-lvm*.rules
-fi
-
 if [ -e /etc/lvm/lvm.conf ] && getarg rd_NO_LVMCONF; then
     rm -f /etc/lvm/lvm.conf
 fi
 
+if getarg rd_NO_LVM; then
+    info "rd_NO_LVM: removing LVM activation"
+    rm -f /etc/udev/rules.d/64-lvm*.rules
+else
+    for dev in $(getargs rd_LVM_VG=) $(getargs rd_LVM_LV=); do
+        printf '[ -e "/dev/%s" ] || exit 1\n' $dev \
+            >> /initqueue-finished/lvm.sh
+        {
+            printf '[ -e "/dev/%s" ] || ' $dev
+            printf 'warn "LVM "%s" not found"\n' $dev
+        } >> /emergency/00-lvm.sh
+    done
+fi
 

modules.d/90mdraid/65-md-incremental-imsm.rules

@@ -37,7 +37,7 @@ LABEL="md_auto_end"
 #
 # Incrementally build the md array
 #
-RUN+="/sbin/mdadm -I --no-degraded $env{DEVNAME}"
+RUN+="/sbin/mdadm -I $env{DEVNAME}"
 
 RUN+="/bin/ln -s /sbin/md_finished.sh /initqueue-finished/md_finished.sh"
 

modules.d/90mdraid/check

@@ -6,7 +6,7 @@ which mdadm >/dev/null 2>&1 || exit 1
 . $dracutfunctions
 [[ $debug ]] && set -x
 
-is_mdraid() { get_fs_type /dev/block/$1 |egrep -q '(linux|isw)_raid'; }
+is_mdraid() { [[ -d "/sys/dev/block/$1/md" ]]; }
 
 [[ $1 = '-h' ]] && {
     rootdev=$(find_root_block_device)
@@ -16,7 +16,7 @@ is_mdraid() { get_fs_type /dev/block/$1 |egrep -q '(linux|isw)_raid'; }
 	check_block_and_slaves is_mdraid "$rootdev" || exit 1
     else
 	# root is not on a block device, use the shotgun approach
-	blkid | grep -q linux_raid || exit 1
+	blkid | egrep -q '(linux|isw)_raid' || exit 1
     fi
 }