Version 017

Check if /usr is mounted, by checking for /usr/bin

.gitignore

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

.mailmap

@@ -5,4 +5,8 @@ Victor Lowther <victor.lowther@gmail.com> <victor.lowther-Re5JQEeQqe8AvxtiuMwx3w
 Harald Hoyer <harald@redhat.com> <harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
 Harald Hoyer <harald@redhat.com> <harald@eeepc.(none)>
 Mike Snitzer <snitzer@redhat.com> <msnitzer@redhat.com> 
-
+Amerigo Wang <amwang@redhat.com> <xiyou.wangcong@gmail.com>
+Andrey Borzenkov <arvidjaar@gmail.com> <arvidjaar@mail.ru>
+Dan Horák <dhorak@redhat.com> <dan@danny.cz>
+John Reiser <jreiser@bitwagon.com> <jreiser@BitWagon.com>
+Luca Berra <bluca@vodka.it> <bluca@comedia.it>

AUTHORS

@@ -2,50 +2,65 @@ Harald Hoyer <harald@redhat.com>
 Victor Lowther <victor.lowther@gmail.com>
 Philippe Seewer <philippe.seewer@bfh.ch>
 Warren Togami <wtogami@redhat.com>
-Jeremy Katz <katzj@redhat.com>
 Amadeusz Żołnowski <aidecoe@aidecoe.name>
+Jeremy Katz <katzj@redhat.com>
 David Dillow <dave@thedillows.org>
+Michal Soltys <soltys@ziu.info>
+Will Woods <wwoods@redhat.com>
+Andrey Borzenkov <arvidjaar@gmail.com>
 Andreas Thienemann <andreas@bawue.net>
 Hans de Goede <hdegoede@redhat.com>
 Peter Jones <pjones@redhat.com>
-Luca Berra <bluca@comedia.it>
-Will Woods <wwoods@redhat.com>
-Andrey Borzenkov <arvidjaar@mail.ru>
-Andrey Borzenkov <arvidjaar@gmail.com>
-Marc Grimme <grimme@atix.de>
+Amerigo Wang <amwang@redhat.com>
+Colin Guthrie <colin@mageia.org>
+John Reiser <jreiser@bitwagon.com>
+Luca Berra <bluca@vodka.it>
+Dave Young <dyoung@redhat.com>
 Daniel Drake <dsd@laptop.org>
+Marc Grimme <grimme@atix.de>
+Roberto Sassu <roberto.sassu@polito.it>
+Anton Blanchard <anton@samba.org>
 Bill Nottingham <notting@redhat.com>
+Brian C. Lane <bcl@redhat.com>
+Dan Horák <dhorak@redhat.com>
 David Cantrell <dcantrell@redhat.com>
 Lance Albertson <lance@osuosl.org>
+Marian Ganisin <mganisin@redhat.com>
 Michael Ploujnikov <plouj@somanetworks.com>
 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
-Dan Horák <dan@danny.cz>
+Alan Pevec <apevec@redhat.com>
+Ian Dall <ian@beware.dropbear.id.au>
+James Buren <ryuo@frugalware.org>
 Joey Boggs <jboggs@redhat.com>
+Jon Ander Hernandez <jonan.h@gmail.com>
 Mike Snitzer <snitzer@redhat.com>
 Peter Rajnoha <prajnoha@redhat.com>
+Przemysław Rudy <prudy1@o2.pl>
 Vladislav Bogdanov <bubble@hoster-ok.com>
 Alexander Todorov <atodorov@redhat.com>
 Andy Lutomirski <luto@mit.edu>
+Anssi Hannula <anssi@mageia.org>
 Christian Heinz <christian.ch.heinz@gmail.com>
-Dan Horák <dhorak@redhat.com>
 Dave Jones <davej@redhat.com>
+Duane Griffin <duaneg@dghda.com>
 Frederic Crozat <fcrozat@mandriva.com>
 Glen Gray <slaine@slaine.org>
-Ian Dall <ian@beware.dropbear.id.au>
+Hermann Gausterer <git-dracut-2012@mrq1.org>
 James Laska <jlaska@redhat.com>
-Jon Ander Hernandez <jonan.h@gmail.com>
 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Leho Kraav <leho@kraav.com>
 Lubomir Rintel <lkundrak@v3.sk>
-Luca Berra <bluca@vodka.it>
 Matt <smoothsailing72@hotmail.com>
 Matt Smith <shadowfax@gmx.com>
 Michal Schmidt <mschmidt@redhat.com>
-Michal Soltys <soltys@ziu.info>
 Munehiro Matsuda <haro@kgt.co.jp>
+Paolo Bonzini <pbonzini@redhat.com>
+Peter Robinson <pbrobinson@fedoraproject.org>
 Pádraig Brady <P@draigBrady.com>
 Quentin Armitage <quentin@armitage.org.uk>
 Sergey Fionov <fionov@gmail.com>
 Thilo Bangert <thilo.bangert@gmx.net>
+Thomas Lange <lange@informatik.uni-koeln.de>
 Tomasz Torcz <tomek@pipebreaker.pl>
 Vadim Kuznetsov <vadimk@gentoo.org>
 Ville Skyttä <ville.skytta@iki.fi>

HACKING

@@ -1,11 +1,11 @@
 Right now, most of the testing is done using a qemu/kvm guest and
 generating the initramfs on another box but the support is all present
 to build for the "running" machine.  For the former, you can boot the guest
-using qemu's -kernel and -initrd options.  
+using qemu's -kernel and -initrd options.
 
 dracut exists and will build an image.  It is command-line equivalent
 to most mkinitrd implementations and should be pretty straight-forward
-to use.  
+to use.
 
 To use, just run dracut with an output file name and, optionally, a
 kernel version (it defaults to using the current).   The appropriate
@@ -14,7 +14,7 @@ like to customize the list of modules copied in, edit /etc/dracut.conf
 and set
   dracutmodules="foo bar baz"
 
-Note that dracut calls functional components in modules.d "modules" 
+Note that dracut calls functional components in modules.d "modules"
 while kernel modules are called "drivers".
 
 Requirements:

Makefile

@@ -1,24 +1,20 @@
-VERSION=010
+VERSION=017
 GITVERSION=$(shell [ -d .git ] && git rev-list  --abbrev-commit  -n 1 HEAD  |cut -b 1-8)
 
 prefix ?= /usr
+libdir ?= ${prefix}/lib
 datadir ?= ${prefix}/share
-pkglibdir ?= ${datadir}/dracut
+pkglibdir ?= ${libdir}/dracut
 sysconfdir ?= ${prefix}/etc
-sbindir ?= ${prefix}/sbin
+bindir ?= ${prefix}/bin
 mandir ?= ${prefix}/share/man
 
-manpages = dracut.8 dracut.kernel.7 dracut.conf.5 dracut-catimages.8  dracut-gencmdline.8
+manpages = dracut.8 dracut.cmdline.7 dracut.conf.5 dracut-catimages.8  dracut-gencmdline.8
 
-.PHONY: install clean archive rpm testimage test all check AUTHORS
+.PHONY: install clean archive rpm testimage test all check AUTHORS doc
 
-ifeq (1,${WITH_SWITCH_ROOT})
-targets = modules.d/99base/switch_root
-else
-targets = 
-endif
-
-all: $(targets) $(manpages) dracut.html
+doc: $(manpages) dracut.html
+all: syncheck
 
 %: %.xml
 	xsltproc -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
@@ -29,42 +25,43 @@ dracut.html: dracut.xml $(manpages)
 		--stringparam html.stylesheet http://docs.redhat.com/docs/en-US/Common_Content/css/default.css \
 		http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml
 
-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	
-
-install:
+install: doc
 	mkdir -p $(DESTDIR)$(pkglibdir)
-	mkdir -p $(DESTDIR)$(sbindir)
+	mkdir -p $(DESTDIR)$(bindir)
 	mkdir -p $(DESTDIR)$(sysconfdir)
 	mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
-	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
-	install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(sbindir)/mkinitrd
-	install -m 0755 lsinitrd $(DESTDIR)$(sbindir)/lsinitrd
-ifeq (1,${WITH_SWITCH_ROOT})
-	install -m 0755 modules.d/99base/switch_root $(DESTDIR)$(sbindir)/switch_root
-endif
+	mkdir -p $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
+	install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
+	install -m 0755 dracut-gencmdline.sh $(DESTDIR)$(bindir)/dracut-gencmdline
+	install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
+	install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
+	install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd
 	install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
 	mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
-	install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions
-	install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger
+	install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh
+	ln -s dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions
+	install -m 0755 dracut-logger.sh $(DESTDIR)$(pkglibdir)/dracut-logger.sh
+	install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore
 	cp -arx modules.d $(DESTDIR)$(pkglibdir)
-	install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8
-	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
+	install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8/dracut.8
+	install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8/dracut-catimages.8
+	install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8/dracut-gencmdline.8
+	install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5/dracut.conf.5
+	install -m 0644 dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.cmdline.7
+	ln -s dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7
+	if [ -n "$(systemdsystemunitdir)" ]; then \
+		mkdir -p $(DESTDIR)$(systemdsystemunitdir); \
+		install -m 0644 dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir); \
+		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants; \
+		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants; \
+		ln -s ../dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants/dracut-shutdown.service; \
+		ln -s ../dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants/dracut-shutdown.service; \
+	fi
 
 clean:
 	$(RM) *~
 	$(RM) */*~
 	$(RM) */*/*~
-	$(RM) modules.d/99base/switch_root
 	$(RM) test-*.img
 	$(RM) dracut-*.rpm dracut-*.tar.bz2
 	$(RM) $(manpages) dracut.html
@@ -80,30 +77,24 @@ dracut-$(VERSION).tar.bz2:
 dracut-$(VERSION).tar.gz:
 	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ |gzip > dracut-$(VERSION).tar.gz
 
-dracut-$(VERSION)-$(GITVERSION).tar.bz2:
-	git archive --format=tar HEAD --prefix=dracut-$(VERSION)-$(GITVERSION)/ |bzip2 > dracut-$(VERSION)-$(GITVERSION).tar.bz2
-
-
-rpm: clean dracut-$(VERSION).tar.bz2
-	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" -ba dracut.spec 
-	rm -fr BUILD BUILDROOT
-
-gitrpm: dracut-$(VERSION)-$(GITVERSION).tar.bz2
-	echo "%define gittag $(GITVERSION)" > dracut.spec.git
-	cat dracut.spec >> dracut.spec.git
-	mv dracut.spec dracut.spec.bak
-	mv dracut.spec.git dracut.spec
-	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" --define "gittag $(GITVERSION)" -ba dracut.spec || :
-	mv dracut.spec.bak dracut.spec
-	rm -fr BUILD BUILDROOT
+rpm: dracut-$(VERSION).tar.bz2
+	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
+	cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \
+	$$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
+	(cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
+	        --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
+		--define "_rpmdir $$PWD" -ba dracut.spec; ) && \
+	( mv "$$rpmbuild"/noarch/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr "$$rpmbuild"; ls *.rpm )
 
 syncheck:
-	@ret=0;for i in dracut-logger modules.d/99base/init modules.d/*/*.sh; do \
+	@ret=0;for i in dracut-initramfs-restore.sh dracut-logger.sh \
+                        modules.d/99base/init.sh modules.d/*/*.sh; do \
                 [ "$${i##*/}" = "module-setup.sh" ] && continue; \
                 [ "$${i##*/}" = "caps.sh" ] && continue; \
 		dash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret
-	@ret=0;for i in dracut modules.d/02caps/caps.sh modules.d/*/module-setup.sh; do \
+	@ret=0;for i in *.sh mkinitrd-dracut.sh modules.d/02caps/caps.sh \
+	                modules.d/*/module-setup.sh; do \
 		bash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret
 
@@ -111,17 +102,17 @@ check: all syncheck
 	$(MAKE) -C test check
 
 testimage: all
-	./dracut -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
+	./dracut.sh -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img 
 
 testimages: all
-	./dracut -l -a debug --kernel-only -f test-kernel-$(shell uname -r).img $(shell uname -r)
+	./dracut.sh -l -a debug --kernel-only -f test-kernel-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img 
-	./dracut -l -a debug --no-kernel -f test-dracut.img $(shell uname -r)
+	./dracut.sh -l -a debug --no-kernel -f test-dracut.img $(shell uname -r)
 	@echo wrote  test-dracut.img 
 
 hostimage: all
-	./dracut -H -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
+	./dracut.sh -H -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img 
 
 AUTHORS:

NEWS

@@ -1,3 +1,122 @@
+dracut-017
+==========
+- a _lot_ faster than dracut-016 in image creation
+- systemd service dracut-shutdown.service
+- livenet fixes
+- ssh-client module install fix
+- root=iscsi:... fixed
+- lots of restructuring and optimizing in dracut-functions.sh
+- usrmount: honor fs_passno in /etc/fstab
+- renamed all shell scripts to .sh
+- new option "--omit-drivers" and config option "omit_drivers"
+- hostonly mode fixups
+
+dracut-016
+==========
+- fixed lsinitrd
+- honor binaries in sbin first
+- fixed usrmount module
+- added systemd service for shutdown
+- fixed terminfo on distros with /usr/share/terminfo
+- reload udev rules after "pre-trigger" hook
+- improved test suite
+- new parameter "--omit-drivers" and new conf param omit_drivers
+- "--offroot" support for mdraid
+- new libs: net-lib.sh, nfs-lib.sh, url-lib.sh, img-lib.sh
+  full of functions to use in your dracut module
+
+dracut-015
+==========
+- hostonly mode automatically adds command line options for root and /usr
+- --add-fstab --mount parameters
+- ssh-client module
+- --ctty option: add job control
+- cleanup /run/initramfs
+- convertfs module
+- /sbin/ifup can be called directly
+- support kernel modules compressed with xz
+- s390 iscsi modules added
+- terminfo module
+- lsinitrd can handle concatened images
+- lsinitrd can sort by size
+
+dracut-014
+==========
+- new dracut arguments:
+  --lvmconf
+  --nolvmconf
+  --fscks [LIST]
+  --nofscks
+- new .conf options:
+  install_items
+  fscks
+  nofscks
+- new kernel options:
+  rd.md.ddf
+  rd.md.waitclean
+  plymouth.enable
+- dracut move from /sbin to /usr/bin
+- dracut modules dir moved from /usr/share/dracut to /usr/lib/dracut
+- profiling with "dracut --profile"
+- new TEST-16-DMSQUASH, test for Fedora LiveCDs
+- speedup of initramfs creation
+- ask_for_password fallback to CLI
+- mdraid completely switched to incremental assembly
+- no more cdrom polling
+- "switch_root" breakpoint is now very late
+- /dev/live is gone
+- /dev/root is gone
+- fs-lib dracut module for fscks added
+- xen dracut module removed
+- usb mass storage kernel drivers now included
+- usrmount dracut module added:
+  mount /usr if found in /sysroot/etc/fstab
+- only include fsck helper needed for hostonly
+- fcoe: support for bnx2fc
+- support iSCSI drivers: qla4xxx, cxgb3i, cxgb4i, bnx2i, be2iscsi
+- fips-aesni dracut module added
+- add install_items to dracut.conf
+    install_items+=" <file>[ <file> ...] "
+- speedup internal testsuite
+- internal testsuite: store temporary data in a temporary dir
+
+dracut-013
+==========
+- speedup of initramfs creation
+- fixed inst_dir for symbolic links
+- add unix kernel module
+
+dracut-012
+==========
+- better fsck handling
+- fixed wait condition for LVM volumes
+- fix for hardlinks (welcome Debian! :-)
+- shutdown bugfixes
+- automatic busybox symlink creation
+- try to mount /usr, if init points to a path in /usr
+- btrfs with multiple devices
+- "--force-add" option for dracut, to force-add dracut modules,
+  without hostonly checks
+- lsinitrd also display the initramfs size in human readable form
+- livenet module, to mount live-isos over http
+- masterkey,ecryptfs,integrity security modules
+- initqueue/timeout queue e.g. for starting degraded raids
+- "make rpm" creates an rpm with an increasing release number from any
+  git checkout
+- support lvm mirrors
+- start degraded lvm mirrors after a timeout
+- start degraded md raids after a timeout
+- getarg() now returns wildcards without file matching to the current fs
+- lots of bugfixes
+
+dracut-011
+==========
+- use udev-168 features for shutting down udev
+- introduce "--prefix" to put all initramfs files in e.g "/run/initramfs"
+- new shutdown script (called by systemd >= 030) to disassemble the root device
+- lots of bugfixes
+- new module for gpg-encrypted keys - 91crypt-gpg
+
 dracut-010
 ==========
 - lots of bugfixes
@@ -13,7 +132,7 @@ dracut-009
 
 - initramfs
   - hooks moved to /lib/dracut/hooks in initramfs
-  - rd.driver.{blacklist|pre|post} accept comma seperated driver list
+  - rd.driver.{blacklist|pre|post} accept comma separated driver list
   - iSCSI: iSCSI Boot Firmware Table (iBFT) support
   - support for /run
   - live image: support for generic rootfs.img (instead of ext3fs.img)
@@ -62,7 +181,7 @@ dracut-006
 - add btrfsctl scan for btrfs multi-devices (raid)
 - teach dmsquash live-root to use rootflags
 - trigger udev with action=add
-- fixed add_drivers handling 
+- fixed add_drivers handling
 - add sr_mod
 - use pigz instead of gzip, if available
 - boot from LVM mirrors and snapshots
@@ -75,7 +194,7 @@ dracut-006
 
 dracut-005
 ==========
-- dcb support to dracut's FCoE support 
+- dcb support to dracut's FCoE support
 - add readonly overlay support for dmsquash
 - add keyboard kernel modules
 - dracut.conf: added add_dracutmodules
@@ -113,7 +232,7 @@ dracut-003
 - add s390 network support
 - fixed dracut-gencmdline for root=UUID or LABEL
 - do not destroy assembled raid arrays if mdadm.conf present
-- mount /dev/shm 
+- mount /dev/shm
 - let udevd not resolve group and user names
 - moved network from udev to initqueue
 - improved debug output: specifying "rdinitdebug" now logs
@@ -121,7 +240,7 @@ dracut-003
 - strip kernel modules which have no x bit set
 - redirect stdin, stdout, stderr all RW to /dev/console
   so the user can use "less" to view /init.log and dmesg
-- add new device mapper udev rules and dmeventd 
+- add new device mapper udev rules and dmeventd
 - fixed dracut-gencmdline for root=UUID or LABEL
 - do not destroy assembled raid arrays if mdadm.conf present
 - mount /dev/shm
@@ -166,17 +285,17 @@ dracut-001
     Supported cmdline formats:
     fcoe=<networkdevice>:<dcb|nodcb>
     fcoe=<macaddress>:<dcb|nodcb>
-    
+
     Note currently only nodcb is supported, the dcb option is reserved for
     future use.
-    
+
     Note letters in the macaddress must be lowercase!
-    
+
     Examples:
     fcoe=eth0:nodcb
     fcoe=4A:3F:4C:04:F8:D7:nodcb
 
-- Syslog support for dracut   
+- Syslog support for dracut
     This module provides syslog functionality in the initrd.
     This is especially interesting when complex configuration being
     used to provide access to the device the rootfs resides on.
@@ -203,20 +322,20 @@ dracut-0.8
 dracut-0.7
 ==========
 - dracut:     strip binaries in initramfs
-    
+
            --strip
                   strip binaries in the initramfs (default)
-    
+
            --nostrip
                   do not strip binaries in the initramfs
 - dracut-catimages
-    
+
     Usage: ./dracut-catimages [OPTION]... <initramfs> <base image>
     [<image>...]
     Creates initial ramdisk image by concatenating several images from the
     command
     line and /boot/dracut/
-    
+
       -f, --force           Overwrite existing initramfs file.
       -i, --imagedir        Directory with additional images to add
                             (default: /boot/dracut/)
@@ -233,44 +352,44 @@ dracut-0.7
 dracut-0.6
 ==========
 - dracut: add --kernel-only and --no-kernel arguments
-    
+
            --kernel-only
                   only install kernel drivers and firmware files
-    
+
            --no-kernel
                   do not install kernel drivers and firmware files
-    
+
     All kernel module related install commands moved from "install"
     to "installkernel".
-    
+
     For "--kernel-only" all installkernel scripts of the specified
     modules are used, regardless of any checks, so that all modules
     which might be needed by any dracut generic image are in.
-    
+
     The basic idea is to create two images. One image with the kernel
     modules and one without. So if the kernel changes, you only have
     to replace one image.
-    
+
     Grub and the kernel can handle multiple images, so grub entry can
     look like this:
-    
+
     title Fedora (2.6.29.5-191.fc11.i586)
             root (hd0,0)
             kernel /vmlinuz-2.6.29.5-191.fc11.i586 ro rhgb quiet
             initrd /initrd-20090722.img /initrd-kernel-2.6.29.5-191.fc11.i586.img /initrd-config.img
-    
+
     initrd-20090722.img
       the image provided by the initrd rpm
       one old backup version is kept like with the kernel
-    
+
     initrd-kernel-2.6.29.5-191.fc11.i586.img
       the image provided by the kernel rpm
-    
+
     initrd-config.img
       optional image with local configuration files
 
 - dracut: add --kmoddir directory, where to look for kernel modules
-    
+
            -k, --kmoddir [DIR]
                   specify the directory, where to look for kernel modules
 
@@ -290,18 +409,18 @@ dracut-0.4
 - firmware loading support
 - new internal queue (initqueue)
     initqueue now loops until /dev/root exists or root is mounted
-    
+
     init now has the following points to inject scripts:
-    
+
     /cmdline/*.sh
        scripts for command line parsing
-    
+
     /pre-udev/*.sh
        scripts to run before udev is started
-    
+
     /pre-trigger/*.sh
        scripts to run before the main udev trigger is pulled
-    
+
     /initqueue/*.sh
        runs in parallel to the udev trigger
        Udev events can add scripts here with /sbin/initqueue.
@@ -313,12 +432,12 @@ dracut-0.4
        filesystem was mounted, the user will be dropped to a shell after
        a timeout.
        Scripts can remove themselves from the initqueue by "rm $job".
-    
+
     /pre-mount/*.sh
        scripts to run before the root filesystem is mounted
        NFS is an exception, because it has no device node to be created
        and mounts in the udev events
-    
+
     /mount/*.sh
        scripts to mount the root filesystem
        NFS is an exception, because it has no device node to be created
@@ -326,12 +445,12 @@ dracut-0.4
        If the udev queue is empty and no root device is found or no root
        filesystem was mounted, the user will be dropped to a shell after
        a timeout.
-    
+
     /pre-pivot/*.sh
        scripts to run before the real init is executed and the initramfs
        disappears
        All processes started before should be killed here.
-    
+
     The behaviour of the dmraid module demonstrates how to use the new
     mechanism. If it detects a device which is part of a raidmember from a
     udev rule, it installs a job to scan for dmraid devices, if the udev

README

@@ -2,8 +2,8 @@ Dracut
 ------
 Dracut is a new initramfs infrastructure.
 
-Information about the initial goals and aims can be found at 
-https://fedoraproject.org/wiki/Initrdrewrite 
+Information about the initial goals and aims can be found at
+https://fedoraproject.org/wiki/Initrdrewrite
 
 Unlike existing initramfs's, this is an attempt at having as little as
 possible hard-coded into the initramfs as possible.  The initramfs has
@@ -19,19 +19,19 @@ we'll grow some hooks for running arbitrary commands in the flow of
 the script, but it's worth trying to resist the urge as much as we can
 as hooks are guaranteed to be the path to slow-down.
 
-Most of the initrd generation functionality in dracut is provided by a bunch
+Most of the initramfs generation functionality in dracut is provided by a bunch
 of generator modules that are sourced by the main dracut script to install
-specific functionality into the initrd.  They live in the modules.d 
-subdirectory, and use functionality provided by dracut-functions to do their 
+specific functionality into the initramfs.  They live in the modules.d
+subdirectory, and use functionality provided by dracut-functions to do their
 work.
 
 Some general rules for writing modules:
  * Use one of the inst family of functions to actually install files
-   on to the initrd.  They handle mangling the pathnames and (for binaries,
+   on to the initramfs.  They handle mangling the pathnames and (for binaries,
    scripts, and kernel modules) installing dependencies as appropriate so
    you do not have to.
- * Scripts that end up on the initrd should be POSIX compliant. dracut
-   will try to use /bin/dash as /bin/sh for the initrd if it is available,
+ * Scripts that end up on the initramfs should be POSIX compliant. dracut
+   will try to use /bin/dash as /bin/sh for the initramfs if it is available,
    so you should install it on your system -- dash aims for strict POSIX
    compliance to the extent possible.
  * Hooks MUST be POSIX compliant -- they are sourced by the init script,
@@ -44,35 +44,41 @@ Some general rules for writing modules:
  * We have some breakpoints for debugging your hooks.  If you pass 'rdbreak'
    as a kernel parameter, the initramfs will drop to a shell just before
    switching to a new root. You can pass 'rdbreak=hookpoint', and the initramfs
-   will break just before hooks in that hookpoint run. 
+   will break just before hooks in that hookpoint run.
 
 Also, there is an attempt to keep things as distribution-agnostic as
 possible.  Every distribution has their own tool here and it's not
 something which is really interesting to have separate across them.
 So contributions to help decrease the distro-dependencies are welcome.
 
-Currently dracut lives on sourceforge.
+Currently dracut lives on kernel.org.
+
+The tarballs can be found here:
+	http://www.kernel.org/pub/linux/utils/boot/dracut/
+	ftp://ftp.kernel.org/pub/linux/utils/boot/dracut/
+
+Git:
+	git://git.kernel.org/pub/scm/boot/dracut/dracut.git
+	http://git.kernel.org/pub/scm/boot/dracut/dracut.git
+	https://git.kernel.org/pub/scm/boot/dracut/dracut.git
+
+Git Web:
+	http://git.kernel.org/?p=boot/dracut/dracut.git
+
+Git Web RSS Feed:
+	http://git.kernel.org/?p=boot/dracut/dracut.git;a=rss
 
 Project Page:
-https://sourceforge.net/projects/dracut/
+	http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html
 
-Drop Harald Hoyer <harald@redhat.com> a mail, if you want to help with 
-the documentation, git access, etc.
+Project Wiki:
+	http://dracut.wiki.kernel.org
 
-Git Repository:
-http://dracut.git.sourceforge.net/
-git://dracut.git.sourceforge.net/gitroot/dracut/dracut
-
-Trac Instance:
-http://apps.sourceforge.net/trac/dracut/ 
-
-The git tree can be found at
-git://dracut.git.sourceforge.net/gitroot/dracut/dracut for now.  See the TODO
-file for things which still need to be done and HACKING for some
-instructions on how to get started.  There is also a mailing list that
-is being used for the discussion -- initramfs@vger.kernel.org.  It is
-a typical vger list, send mail to majordomo@vger.kernel.org with body
-of 'subscribe initramfs email@host.com' 
+See the TODO file for things which still need to be done and HACKING for
+some instructions on how to get started.  There is also a mailing list
+that is being used for the discussion -- initramfs@vger.kernel.org.
+It is a typical vger list, send mail to majordomo@vger.kernel.org with body
+of 'subscribe initramfs email@host.com'
 
 
 Licensed under the GPLv2

README.generic

@@ -1,7 +1,7 @@
 To build a generic initramfs, you have to install the following software packages:
  * device-mapper
  * cryptsetup-luks
- * rpcbind nfs-utils 
+ * rpcbind nfs-utils
  * lvm2
  * iscsi-initiator-utils
  * nbd

README.modules

@@ -4,7 +4,7 @@ structure:
 
 dracut_install_dir/modules.d/
 	00modname/
-		install
+		module-setup.sh
 		check
 		<other files as needed by the hook>
 
@@ -12,45 +12,55 @@ dracut_install_dir/modules.d/
 	   The numeric code must be present and in the range of 00 - 99.
 	   Modules with lower numbers are installed first.  This is important
 	   because the dracut install functions (which install files onto
-	   the initrd) refuse to overwrite already installed files. This makes 
-	   it easy for an earlier module to override the functionality of a 
+	   the initrd) refuse to overwrite already installed files. This makes
+	   it easy for an earlier module to override the functionality of a
 	   later module, so that you can have a distro or system specific
 	   module override or modify the functionality of a generic module
 	   without having to patch the more generic module.
 
-install: dracut sources this script to install the functionality that a 
+module-setup.sh:
+	 dracut sources this script to install the functionality that a
 	 module implements onto the initrd.  For the most part, this amounts
 	 to copying files from the host system onto the initrd in a controlled
-	 manner.  dracut supplies several install functions that are
+	 manner.
+
+install():
+	 This function of module-setup.sh is called to install all
+	 non-kernel files. dracut supplies several install functions that are
 	 specialized for different file types.  Browse through dracut-functions
 	 fore more details.  dracut also provides a $moddir variable if you
 	 need to install a file from the module directory, such as an initrd
 	 hook, a udev rule, or a specialized executable.
 
-check: Dracut calls this program to check and see if a module can be installed
+installkernel():
+	 This function of module-setup.sh is called to install all
+	 kernel related files.
+
+
+check():
+       Dracut calls this function to check and see if a module can be installed
        on the initrd.
-       
+
        When called without options, check should check to make sure that
        any files it needs to install into the initrd from the host system
        are present.  It should exit with a 0 if they are, and a 1 if they are
        not.
 
-       When called with -h, it should perform the same check that it would
-       without any options, and it should also check to see if the 
+       When called with $hostonly set, it should perform the same check
+       that it would without it set, and it should also check to see if the
        functionality the module implements is being used on the host system.
        For example, if this module handles installing support for LUKS
        encrypted volumes, it should return 0 if all the tools to handle
        encrpted volumes are available and the host system has the root
        partition on an encrypted volume, 1 otherwise.
 
-       When called with -d, it should output a list of dracut modules
+depends():
+       This function should output a list of dracut modules
        that it relies upon.  An example would be the nfs and iscsi modules,
        which rely on the network module to detect and configure network
        interfaces.
 
-       Check may take additional options in the future.  
-
-Any other files in the module will not be touched by dracut directly. 
+Any other files in the module will not be touched by dracut directly.
 
 You are encouraged to provide a README that describes what the module is for.
 
@@ -60,39 +70,39 @@ HOOKS
 
 init has the following hook points to inject scripts:
 
-/cmdline/*.sh
+/lib/dracut/hooks/cmdline/*.sh
    scripts for command line parsing
 
-/pre-udev/*.sh
+/lib/dracut/hooks/pre-udev/*.sh
    scripts to run before udev is started
 
-/pre-trigger/*.sh
+/lib/dracut/hooks/pre-trigger/*.sh
    scripts to run before the main udev trigger is pulled
 
-/initqueue/*.sh
+/lib/dracut/hooks/initqueue/*.sh
    runs in parallel to the udev trigger
    Udev events can add scripts here with /sbin/initqueue.
    If /sbin/initqueue is called with the "--onetime" option, the script
    will be removed after it was run.
-   If /initqueue/work is created and udev >= 143 then this loop can
-   process the jobs in parallel to the udevtrigger.
+   If /lib/dracut/hooks/initqueue/work is created and udev >= 143 then
+   this loop can process the jobs in parallel to the udevtrigger.
    If the udev queue is empty and no root device is found or no root
    filesystem was mounted, the user will be dropped to a shell after
    a timeout.
    Scripts can remove themselves from the initqueue by "rm $job".
 
-/pre-mount/*.sh
+/lib/dracut/hooks/pre-mount/*.sh
    scripts to run before the root filesystem is mounted
-   Network filesystems like NFS that do not use device files are an 
+   Network filesystems like NFS that do not use device files are an
    exception. Root can be mounted already at this point.
 
-/mount/*.sh
+/lib/dracut/hooks/mount/*.sh
    scripts to mount the root filesystem
    If the udev queue is empty and no root device is found or no root
    filesystem was mounted, the user will be dropped to a shell after
    a timeout.
 
-/pre-pivot/*.sh
+/lib/dracut/hooks/pre-pivot/*.sh
    scripts to run before the real init is executed and the initramfs
    disappears
    All processes started before should be killed here.

TODO

@@ -1,2 +1,24 @@
-See https://sourceforge.net/apps/trac/dracut/wiki/TODO
+Current TODO list, broken into things which are relevant for the initramfs itself (/init et al) vs the generator. A lot of things are/should be marked with "FIXME" in the code
+INITRAMFS TODO
+
+- The hard-coded list of udev rules that we care about is kind of lame.
+- automatic kexec fallback
+- panic fallback
+- fsck for $NEWROOT/usr
+
+GENERATOR TODO
+
+- Default module specification could use some work
+- udev rule copying, as mentioned above, is a bit too hard-coded
+- pkg-config integration, to make it easy for other packages to use us.
+- add recovery image creator (mkrecovery)
+
+CODE TODO
+- document functions
+- make function vars local, and prefix with "_"
+
+Future Enhancement Requests
+
+- run ssh server to enter crypto password or perform debugging (supported by debian)
+- Bug 524727 - Dracut + encrypted root + networking
 

debian/changelog

@@ -1,53 +0,0 @@
-dracut (2.26) unstable; urgency=low
-
-  [ Harald Hoyer ]
-  * multipath: install udev rules and helper tools
-  * NEWS update
-  * multipath: install xdr utils
-  * multipath: install multipath kernel module
-  * specfile update
-  * dracut.8: fixed formatting for rootfs and mount options
-  * dracut: check more return codes, check for permissions and use
-    derror
-  * dracut: create initramfs-$(kernelversion).img by default
-  * Makefile: add WITH_SWITCH_ROOT
-  * fips: search different lib paths
-  * kernel-modules: add firewire-ohci to hardcoded modules list
-  * 90dm: install more device mapper kernel modules
-  * specfile update
-
-  [ Peter Jones ]
-  * Use glob for libdir when installing multipath libraries.
-  * Add #!/bin/bash for consistency.
-  * Make sure and get all the multipath related modules.
-  * Bring up multipath devices that are configured in multipath.conf.
-  * Fix missing shell variables.
-  * This has to be executable.
-  * Handle modules with hyphens in their names properly.
-
-  [ Harald Hoyer ]
-  * lvm: scan without monitor
-
-  [ Yanko Kaneti ]
-  * Wildcards need dracut_install
-
-  [ Harald Hoyer ]
-  * lvm/dmraid: make LIBDIR depend on the binary
-  * nfs: install passwd entries for nobody and nfsnobody
-  * nfs: add rd_NFS_DOMAIN parameter to set the NFSv4 domain name
-  * dracut-functions: inst_simple(): do not bail out if target is a dir
-    and exists
-  * dm: install dmsetup
-  * multipath: corrected initqueue parameter
-  * rootfs-block/mount-root: remount root with /etc/fstab filesystem
-    options
-  * test: set PATH
-
- -- Philippe Seewer <philippe.seewer@.bfh.ch>  Fri, 27 Nov 2009 10:58:26 +0100
-
-dracut (2.21) unstable; urgency=low
-  [ Harald Hoyer ]
-  * fix rd_DASD argument handling (bug #531720)
-  * Resolves: rhbz#531720
-
- -- Philippe Seewer <philippe.seewer@.bfh.ch>  Fri, 06 Nov 2009 15:52:00 +0100

debian/compat

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

debian/control

@@ -1,41 +0,0 @@
-Source: dracut
-Section: utils
-Priority: optional
-Maintainer: Philippe Seewer <philippe.seewer@bfh.ch>
-Build-Depends: debhelper (>= 5.0), cdbs
-Standards-Version: 3.8.4
-Vcs-Browser: http://git.kernel.org/?p=boot/dracut/dracut.git
-Vcs-Git: git://git.kernel.org/pub/scm/boot/dracut/dracut.git
-
-Package: dracut
-Architecture: all
-Recommends: cryptsetup, dmsetup, dmraid, lvm2, mdadm
-Suggests: dracut-network
-Depends: cpio, module-init-tools, udev, ${misc:Depends}
-Provides: linux-initramfs-tool
-Description: A new initramfs infrastructure
- Unlike existing initramfs's, this is an attempt at having as little as
- possible hard-coded into the initramfs as possible.  The initramfs has
- (basically) one purpose in life -- getting the rootfs mounted so that
- we can transition to the real rootfs.  This is all driven off of
- device availability.  Therefore, instead of scripts hard-coded to do
- various things, we depend on udev to create device nodes for us and
- then when we have the rootfs's device node, we mount and carry on. 
- Having the root on MD, LVM2, LUKS is supported as well as NFS, iSCSI,
- NBD and FCOE with dracut-network.
-
-Package: dracut-network
-Architecture: all
-Recommends: nfs-common, open-iscsi, nbd-client
-Depends: dracut, iputils-arping, dhcp3-client, ${misc:Depends}
-Description: A new initramfs infrastucture
- Unlike existing initramfs's, this is an attempt at having as little as
- possible hard-coded into the initramfs as possible.  The initramfs has
- (basically) one purpose in life -- getting the rootfs mounted so that
- we can transition to the real rootfs.  This is all driven off of
- device availability.  Therefore, instead of scripts hard-coded to do
- various things, we depend on udev to create device nodes for us and
- then when we have the rootfs's device node, we mount and carry on. 
- Having the root on MD, LVM2, LUKS is supported as well as NFS, iSCSI,
- NBD and FCOE with dracut-network.
-

debian/copyright

@@ -1,39 +0,0 @@
-This package was debianized by Philippe Seewer <philippe.seewer@bfh.ch> on
-Fri Nov 20 15:45:00 +0100
-
-Sources can be downloaded from:
-
-    http://www.kernel.org/pub/linux/utils/boot/dracut/
-
-Upstream Maintainer:
-    Harald Hoyer <harald@redhat.com>
-
-Updstream Authors:
-    Victor Lowther <victor.lowther@gmail.com>
-    Warren Togami <wtogami@redhat.com>
-    Jeremy Katz <katzj@redhat.com>
-    Philippe Seewer <philippe.seewer@bfh.ch>
-    David Dillow <dave@thedillows.org>
-    Andreas Thienemann <andreas@bawue.net>
-    Hans de Goede <hdegoede@redhat.com>
-    Marc Grimme <grimme@atix.de>
-    Bill Nottingham <notting@redhat.com>
-    Daniel Drake <dsd@laptop.org>
-    Lance Albertson <lance@osuosl.org>
-    Michael Ploujnikov <plouj@somanetworks.com>
-    Peter Jones <pjones@redhat.com>
-    Dave Jones <davej@redhat.com>
-    Michal Schmidt <mschmidt@redhat.com>
-    Peter Rajnoha <prajnoha@redhat.com>
-    Quentin Armitage <quentin@armitage.org.uk>
-    Sergey Fionov <fionov@gmail.com>
-    Thilo Bangert <thilo.bangert@gmx.net>
-
-Copyright:
-    Copyright 2009 Harald Hoyer <harald@redhat.com>
-
-
-License: GPLv2
-
-On Debian systems, the complete text of the GNU General Public 
-License version 2 can be found in `/usr/share/common-licenses/GPL-2'.

debian/dracut-network.dirs

@@ -1,5 +0,0 @@
-usr/share/dracut/modules.d/40network
-usr/share/dracut/modules.d/95fcoe
-usr/share/dracut/modules.d/95iscsi
-usr/share/dracut/modules.d/95nbd
-usr/share/dracut/modules.d/95nfs

debian/dracut-network.install

@@ -1,5 +0,0 @@
-modules.d/40network	usr/share/dracut/modules.d
-modules.d/95fcoe	usr/share/dracut/modules.d
-modules.d/95iscsi	usr/share/dracut/modules.d
-modules.d/95nbd		usr/share/dracut/modules.d
-modules.d/95nfs		usr/share/dracut/modules.d

debian/dracut.dirs

@@ -1,25 +0,0 @@
-usr/share/dracut
-usr/share/dracut/modules.d/00dash
-usr/share/dracut/modules.d/01fips
-usr/share/dracut/modules.d/60xen
-usr/share/dracut/modules.d/90crypt
-usr/share/dracut/modules.d/90dm
-usr/share/dracut/modules.d/90dmraid
-usr/share/dracut/modules.d/90kernel-modules
-usr/share/dracut/modules.d/90lvm
-usr/share/dracut/modules.d/90mdraid
-usr/share/dracut/modules.d/90multipath
-usr/share/dracut/modules.d/95dasd
-usr/share/dracut/modules.d/95dasd_mod
-usr/share/dracut/modules.d/95debug
-usr/share/dracut/modules.d/95resume
-usr/share/dracut/modules.d/95rootfs-block
-usr/share/dracut/modules.d/95terminfo
-usr/share/dracut/modules.d/95udev-rules
-usr/share/dracut/modules.d/95uswsusp
-usr/share/dracut/modules.d/95zfcp
-usr/share/dracut/modules.d/95znet
-usr/share/dracut/modules.d/98syslog
-usr/share/dracut/modules.d/99base
-/var/lib/dracut
-/etc/dracut.conf.d

debian/dracut.docs

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

debian/dracut.install

@@ -1,28 +0,0 @@
-dracut			usr/sbin
-dracut-catimages	usr/sbin
-dracut-update-initramfs	usr/sbin
-dracut-gencmdline	usr/sbin
-dracut-functions	usr/share/dracut
-dracut.conf		etc
-modules.d/00dash		usr/share/dracut/modules.d
-modules.d/01fips		usr/share/dracut/modules.d
-modules.d/60xen			usr/share/dracut/modules.d
-modules.d/90crypt		usr/share/dracut/modules.d
-modules.d/90dm			usr/share/dracut/modules.d
-modules.d/90dmraid		usr/share/dracut/modules.d
-modules.d/90kernel-modules	usr/share/dracut/modules.d
-modules.d/90lvm			usr/share/dracut/modules.d
-modules.d/90mdraid		usr/share/dracut/modules.d
-modules.d/90multipath		usr/share/dracut/modules.d
-modules.d/95dasd		usr/share/dracut/modules.d
-modules.d/95dasd_mod		usr/share/dracut/modules.d
-modules.d/95debug		usr/share/dracut/modules.d
-modules.d/95resume		usr/share/dracut/modules.d
-modules.d/95rootfs-block	usr/share/dracut/modules.d
-modules.d/95terminfo		usr/share/dracut/modules.d
-modules.d/95udev-rules		usr/share/dracut/modules.d
-modules.d/95uswsusp		usr/share/dracut/modules.d
-modules.d/95zfcp		usr/share/dracut/modules.d
-modules.d/95znet		usr/share/dracut/modules.d
-modules.d/98syslog		usr/share/dracut/modules.d
-modules.d/99base		usr/share/dracut/modules.d

debian/dracut.manpages

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

debian/dracut.postinst

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Regenerate initramfs when we're `installed`
-DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -u
-
-#DEBHELPER#

debian/dracut.triggers

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

debian/rules

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

dracut-catimages.8.xml

@@ -67,7 +67,7 @@ line and /boot/dracut/*.img</para>
   <varlistentry>
   <term><option>-h</option>, <option>--help</option></term>
   <listitem>
-<para>display help text and exit.</para> 
+<para>display help text and exit.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
@@ -105,7 +105,7 @@ Harald Hoyer &lt;harald@redhat.com&gt;
 
 <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>
+<ulink url='https://dracut.wiki.kernel.org'>https://dracut.wiki.kernel.org</ulink></para>
 
 </refsect1>
 

dracut-catimages.sh

@@ -39,7 +39,7 @@ Creates initial ramdisk image by concatenating several images from the command
 line and /boot/dracut/
 
   -f, --force           Overwrite existing initramfs file.
-  -i, --imagedir        Directory with additional images to add 
+  -i, --imagedir        Directory with additional images to add
                         (default: /boot/dracut/)
   -o, --overlaydir      Overlay directory, which contains files that
                         will be used to create an additional image
@@ -120,7 +120,7 @@ images+=($@)
 dinfo "Using base image $baseimage"
 cat "$baseimage" > "$outfile"
 
-for i in "${images[@]}"; do 
+for i in "${images[@]}"; do
     dinfo "Appending $i"
     cat "$i" >> "$outfile"
 done

dracut-functions

@@ -1,796 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-#
-# functions used by dracut and other tools.
-#
-# Copyright 2005-2009 Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-if ! [[ $dracutbasedir ]]; then
-    dracutbasedir=${BASH_SOURCE[0]%/*}
-    [[ $dracutbasedir = "dracut-functions" ]] && dracutbasedir="."
-    [[ $dracutbasedir ]] || dracutbasedir="."
-    dracutbasedir="$(readlink -f $dracutbasedir)"
-fi
-
-if ! type dinfo >/dev/null 2>&1; then
-    . "$dracutbasedir/dracut-logger"
-    dlog_init
-fi
-
-IF_RTLD=""
-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 -m 0755 -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
-}
-
-is_func() {
-    [[ $(type -t $1) = "function" ]]
-}
-
-# 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
-        eval $(blkid -o udev $1)
-    else
-        return 1
-    fi
-}
-
-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
-)
-
-get_fs_uuid() (
-    get_fs_env $1 || return
-    echo $ID_FS_UUID
-)
-
-# finds the major:minor of the block device backing the root filesystem.
-find_block_device() {
-    local x mpt majmin dev fs misc maj min
-    if [[ $use_fstab != yes ]]; then
-        while read x x majmin x mpt x x fs dev misc; do
-            [[ $fs = nfs ]] && { echo $dev; return 0;}
-            [[ $fs = nfs3 ]] && { echo $dev; return 0;}
-            [[ $fs = nfs4 ]] && { echo $dev; return 0;}
-            [[ $fs = btrfs ]] && {
-                ls -nLl "$dev" | {
-                    read x x x x maj min x
-                    maj=${maj//,/}
-                    echo $maj:$min
-                } && 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 /; }
-
-# Walk all the slave relationships for a given block device.
-# Stop when our helper function returns success
-# $1 = function to call on every found block device
-# $2 = block device in major:minor format
-check_block_and_slaves() {
-    local x
-    [[ -b /dev/block/$2 ]] || return 1 # Not a block device? So sorry.
-    "$1" $2 && return
-    check_vol_slaves "$@" && return 0
-    if [[ -f /sys/dev/block/$2/../dev ]]; then
-        check_block_and_slaves $1 $(cat "/sys/dev/block/$2/../dev") && return 0
-    fi
-    [[ -d /sys/dev/block/$2/slaves ]] || return 1
-    for x in /sys/dev/block/$2/slaves/*/dev; do
-        [[ -f $x ]] || continue
-        check_block_and_slaves $1 $(cat "$x") && return 0
-    done
-    return 1
-}
-
-get_numeric_dev() {
-    ls -lH "$1" | { read a b c d maj min rest; printf "%d:%d" ${maj%%,} $min; }
-}
-
-# ugly workaround for the lvm design
-# There is no volume group device,
-# so, there are no slave devices for volume groups.
-# Logical volumes only have the slave devices they really live on,
-# but you cannot create the logical volume without the volume group.
-# And the volume group might be bigger than the devices the LV needs.
-check_vol_slaves() {
-    for i in /dev/mapper/*; do
-        lv=$(get_numeric_dev $i)
-        if [[ $lv = $2 ]]; then
-            vg=$(lvm lvs --noheadings -o vg_name $i 2>/dev/null)
-            # strip space
-            vg=$(echo $vg)
-            if [[ $vg ]]; then
-                for pv in $(lvm vgs --noheadings -o pv_name "$vg" 2>/dev/null)
-                do
-                    check_block_and_slaves $1 $(get_numeric_dev $pv) && return 0
-                done
-            fi
-        fi
-    done
-    return 1
-}
-
-# Install a directory, keeping symlinks as on the original system.
-# Example: if /lib64 points to /lib on the host, "inst_dir /lib/file"
-# will create ${initdir}/lib64, ${initdir}/lib64/file,
-# and a symlink ${initdir}/lib -> lib64.
-inst_dir() {
-    local dir="$1"
-    [[ -e ${initdir}$dir ]] && return 0
-
-    # iterate over parent directories
-    local file=""
-    local IFS="/"
-    for part in $dir; do
-        [[ $part ]] || continue
-        file="$file/$part"
-        [[ -e ${initdir}$file ]] && continue
-
-        if [[ -L $file ]]; then
-            # create link as the original
-            local target=$(readlink "$file")
-            ln -sfn "$target" "${initdir}$file" || return 1
-            # resolve relative path and recursively install destination
-            [[ $target == ${target#/} ]] && target="$(dirname "$file")/$target"
-            inst_dir "$target"
-        else
-            # create directory
-            mkdir -m 0755 -p "${initdir}$file" || return 1
-        fi
-    done
-}
-
-# $1 = file to copy to ramdisk
-# $2 (optional) Name for the file on the ramdisk
-# Location of the image dir is assumed to be $initdir
-# We never overwrite the target if it exists.
-inst_simple() {
-    local src target
-    [[ -f $1 ]] || return 1
-    src=$1 target="${2:-$1}"
-    if ! [[ -d ${initdir}$target ]]; then
-        [[ -e ${initdir}$target ]] && return 0
-        inst_dir "${target%/*}"
-    fi
-    # install checksum files also
-    if [[ -e "${src%/*}/.${src##*/}.hmac" ]]; then
-        inst "${src%/*}/.${src##*/}.hmac" "${target%/*}/.${target##*/}.hmac"
-    fi
-    ddebug "Installing $src" 
-    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} lib reallib symlink
-    [[ -e $initdir$dest ]] && return 0
-    if [[ -L $src ]]; then
-        # install checksum files also
-        if [[ -e "${src%/*}/.${src##*/}.hmac" ]]; then
-            inst "${src%/*}/.${src##*/}.hmac" "${dest%/*}/.${dest##*/}.hmac"
-        fi
-        reallib=$(readlink -f "$src")
-        lib=${src##*/}
-        inst_simple "$reallib" "$reallib"
-        inst_dir "${dest%/*}"
-        (cd "${initdir}${dest%/*}" && ln -s "$reallib" "$lib")
-    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 ]] && {
-            ddebug "Creating extra symlink: $symlink"
-            inst_symlink $symlink
-        }
-    done
-}
-
-# find a binary.  If we were not passed the full path directly,
-# search in the usual places to find the binary.
-find_binary() {
-    local binpath="/bin /sbin /usr/bin /usr/sbin" p
-    if [[ -z ${1##/*} ]]; then
-        if [[ -x $1 ]] || ldd $1 &>/dev/null; then
-            echo $1
-            return 0
-        fi
-    fi
-    for p in $binpath; do
-        [[ -x $p/$1 ]] && { echo "$p/$1"; return 0; }
-    done
-    return 1
-}
-
-# Same as above, but specialized to install binary executables.
-# Install binary executable, and all shared library dependencies, if any.
-inst_binary() {
-    local bin target
-    bin=$(find_binary "$1") || return 1
-    target=${2:-$bin}
-    inst_symlink $bin $target && return 0
-    local LDSO NAME IO FILE ADDR I1 n f TLIBDIR
-    [[ -e $initdir$target ]] && return 0
-    # I love bash!
-    LC_ALL=C ldd $bin 2>/dev/null | while read line; do
-        [[ $line = 'not a dynamic executable' ]] && return 1
-        if [[ $line =~ not\ found ]]; then
-            dfatal "Missing a shared library required by $bin."
-            dfatal "Run \"ldd $bin\" to find out what it is."
-            dfatal "dracut cannot create an initrd."
-            exit 1
-        fi
-        so_regex='([^ ]*/lib[^/]*/[^ ]*\.so[^ ]*)'
-        [[ $line =~ $so_regex ]] || continue
-        FILE=${BASH_REMATCH[1]}
-        [[ -e ${initdir}$FILE ]] && continue
-        # see if we are loading an optimized version of a shared lib.
-        lib_regex='^(/lib[^/]*).*'
-        if [[ $FILE =~ $lib_regex ]]; then
-            TLIBDIR=${BASH_REMATCH[1]}
-            BASE=${FILE##*/}
-            # prefer nosegneg libs, then unoptimized ones.
-            for f in "$TLIBDIR/i686/nosegneg" "$TLIBDIR"; do
-                [[ -e $f/$BASE ]] || continue
-                FILE=$f/$BASE
-                break
-            done
-            inst_library "$FILE" "$TLIBDIR/$BASE"
-            IF_dynamic=yes
-            continue
-            fi
-            inst_library "$FILE"
-    done
-    inst_simple "$bin" "$target"
-}
-
-# same as above, except for shell scripts.
-# If your shell script does not start with shebang, it is not a shell script.
-inst_script() {
-    [[ -f $1 ]] || return 1
-    local line
-    read -r -n 80 line <"$1"
-    # If debug is set, clean unprintable chars to prevent messing up the term
-    [[ $debug ]] && line=$(echo -n "$line" | tr -c -d '[:print:][:space:]')
-    shebang_regex='(#! *)(/[^ ]+).*'
-    [[ $line =~ $shebang_regex ]] || return 1
-    inst "${BASH_REMATCH[2]}" && inst_simple "$@"
-}
-
-# same as above, but specialized for symlinks
-inst_symlink() {
-    local src=$1 target=$initdir${2:-$1} realsrc
-    [[ -L $1 ]] || return 1
-    [[ -L $target ]] && return 0
-    realsrc=$(readlink -f "$src")
-    [[ $realsrc = ${realsrc##*/} ]] && realsrc=${src%/*}/$realsrc
-    inst "$realsrc" && mkdir -m 0755 -p "${target%/*}" && \
-        ln -s "$realsrc" "$target"
-}
-
-# find a udev rule in the usual places.
-find_rule() {
-    [[ -f $1 ]] && { echo "$1"; return 0; }
-    for r in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
-        [[ -f $r/$1 ]] && { echo "$r/$1"; return 0; }
-    done
-    return 1
-}
-
-# 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 rule found
-
-    inst_dir "/lib/udev/rules.d"
-    inst_dir "$target"
-    for rule in "$@"; do 
-        for r in /lib/udev/rules.d /etc/udev/rules.d; do
-            if [[ -f $r/$rule ]]; then
-                found="$r/$rule"
-                inst_simple "$found"
-            fi
-        done    
-        for r in '' ./ $dracutbasedir/rules.d/; do
-            if [[ -f ${r}$rule ]]; then
-                found="${r}$rule"
-                inst_simple "$found" "$target/${found##*/}" 
-            fi
-        done
-        [[ $found ]] || dinfo "Skipping udev rule: $rule"
-    done
-}
-
-# general purpose installation function
-# Same args as above.
-inst() {
-    case $# in
-        1) ;;
-        2) [[ ! $initdir && -d $2 ]] && export initdir=$2
-            [[ $initdir = $2 ]] && set $1;;
-        3) [[ -z $initdir ]] && export initdir=$2
-            set $1 $3;;
-        *) dfatal "inst only takes 1 or 2 or 3 arguments"
-            exit 1;;
-    esac
-    for x in inst_symlink inst_script inst_binary inst_simple; do
-        $x "$@" && return 0
-    done
-    return 1
-}
-
-[[ $hookdirs ]] || {
-    hookdirs="cmdline pre-udev pre-trigger netroot initqueue pre-mount"
-    hookdirs+=" pre-pivot mount emergency"
-    export hookdirs
-}
-
-# install function specialized for hooks
-# $1 = type of hook, $2 = hook priority (lower runs first), $3 = hook
-# All hooks should be POSIX/SuS compliant, they will be sourced by init.
-inst_hook() {
-    if ! [[ -f $3 ]]; then
-        dfatal "Cannot install a hook ($3) that does not exist."
-        dfatal "Aborting initrd creation."
-        exit 1
-    elif ! strstr "$hookdirs" "$1"; then
-        dfatal "No such hook type $1. Aborting initrd creation." 
-        exit 1
-    fi
-    inst_simple "$3" "/lib/dracut/hooks/${1}/${2}${3##*/}"
-}
-
-dracut_install() {
-    if [[ $1 = '-o' ]]; then
-        local optional=yes
-        shift
-    fi
-    while (($# > 0)); do
-        if ! inst "$1" ; then
-            if [[ $optional = yes ]]; then
-                dwarn "Skipping program $1 as it cannot be found and is" \
-                    "flagged to be optional"
-            else
-                dfatal "Failed to install $1"
-                exit 1
-            fi
-        fi
-        shift
-    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
-}
-
-module_check() {
-    local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
-    [[ -d $moddir ]] || return 1
-    if [[ ! -f $moddir/module-setup.sh ]]; then
-        # if we do not have a check script, we are unconditionally included
-        [[ -x $moddir/check ]] || return 0
-        $moddir/check $hostonly
-        return $?
-    else
-        unset check depends install installkernel
-        . $moddir/module-setup.sh
-        is_func check || return 0
-        check
-        ret=$?
-        unset check depends install installkernel
-        return $ret
-    fi
-}
-
-module_depends() {
-    local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
-    [[ -d $moddir ]] || return 1
-    if [[ ! -f $moddir/module-setup.sh ]]; then
-        # if we do not have a check script, we have no deps
-        [[ -x $moddir/check ]] || return 0
-        $moddir/check -d
-        return $?
-    else
-        unset check depends install installkernel
-        . $moddir/module-setup.sh
-        is_func depends || return 0
-        depends
-        ret=$?
-        unset check depends install installkernel
-        return $ret
-    fi
-}
-
-module_install() {
-    local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
-    [[ -d $moddir ]] || return 1
-    if [[ ! -f $moddir/module-setup.sh ]]; then
-        [[ -x $moddir/install ]] && . "$moddir/install"
-        return $?
-    else
-        unset check depends install installkernel
-        . $moddir/module-setup.sh
-        is_func install || return 0
-        install
-        ret=$?
-        unset check depends install installkernel
-        return $ret
-    fi
-}
-
-module_installkernel() {
-    local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
-    [[ -d $moddir ]] || return 1
-    if [[ ! -f $moddir/module-setup.sh ]]; then
-        [[ -x $moddir/installkernel ]] && . "$moddir/installkernel"
-        return $?
-    else
-        unset check depends install installkernel
-        . $moddir/module-setup.sh
-        is_func installkernel || return 0
-        installkernel
-        ret=$?
-        unset check depends install installkernel
-        return $ret
-    fi
-}
-
-check_module() {
-    local mod=$1;
-    local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
-    local moddep;
-    # If we are already scheduled to be loaded, no need to check again.
-    strstr " $mods_to_load " " $mod " && return 0
-    strstr " $mods_checked_as_dep " " $mod " && return 1
-
-    # This should never happen, but...
-    [[ -d $moddir ]] || return 1
-
-    [[ $2 ]] || mods_checked_as_dep+=" $mod "
-
-    strstr " $omit_dracutmodules " " $mod " && return 1
-
-    if strstr " $dracutmodules $add_dracutmodules " " $mod "; then
-        module_check $mod; ret=$?
-        # explicit module, so also accept ret=255
-        [[ $ret = 0 || $ret = 255 ]] || return 1
-    else
-        # module not in our list
-        if [[ $dracutmodules = all ]]; then
-            # check, if we can and should install this module
-            module_check $mod || return 1
-        else
-            # skip this module
-            return 1
-        fi
-    fi
-
-    for moddep in $(module_depends $mod); do
-        # handle deps as if they were manually added
-        strstr " $add_dracutmodules " " $moddep " || \
-            add_dracutmodules+=" $moddep "
-        # if a module we depend on fail, fail also
-        check_module $moddep || return 1
-    done
-
-    strstr " $mods_to_load " " $mod " || \
-        mods_to_load+=" $mod "
-
-    return 0
-}
-
-check_module_dir() {
-    local modcheck;
-    local mod;
-    mods_to_load=""
-    for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
-        local mod=${moddir##*/}; mod=${mod#[0-9][0-9]}
-        check_module $mod 1
-    done
-
-    # Report any missing dracut modules, the user has specified
-    modcheck=$add_dracutmodules
-    [[ $dracutmodules != all ]] && modcheck="$m $dracutmodules"
-    for mod in $modcheck; do
-        strstr "$mods_to_load" "$mod" && continue
-        strstr "$omit_dracutmodules" "$mod" && continue
-        derror "Dracut module \"$mod\" cannot be found."
-    done
-}
-
-# Install a single kernel module along with any firmware it may require.
-# $1 = full path to kernel module to install
-install_kmod_with_fw() {
-    local modname=${1##*/} fwdir found
-    modname=${modname%.ko*}
-    # no need to go further if the module is already installed
-    [[ -e "${initdir}/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" ]] \
-        && return 0
-    inst_simple "$1" "/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" \
-        || return $?
-    for fw in $(modinfo -k $kernel -F firmware $1 2>/dev/null); do
-        found=''
-        for fwdir in $fw_dir; do
-            if [[ -d $fwdir && -f $fwdir/$fw ]]; then
-                inst_simple "$fwdir/$fw" "/lib/firmware/$fw"
-                found=yes
-            fi
-        done
-        if [[ $found != yes ]]; then
-            dwarn "Possible missing firmware \"${fw}\" for kernel module" \
-                "\"${mod}.ko\""
-        fi
-    done
-    return 0
-}
-
-# Do something with all the dependencies of a kernel module.
-# Note that kernel modules depend on themselves using the technique we use
-# $1 = function to call for each dependency we find
-#      It will be passed the full path to the found kernel module
-# $2 = module to get dependencies for
-# rest of args = arguments to modprobe
-for_each_kmod_dep() {
-    local func=$1 kmod=$2 cmd modpapth options
-    shift 2
-    modprobe "$@" --ignore-install --show-depends $kmod 2>/dev/null | (
-        local found=0
-        while read cmd modpath options; do
-            [[ $cmd = insmod ]] || continue
-            $func ${modpath} || exit $?
-            found=1
-        done
-        [[ $found -eq 0 ]] && exit 1
-        exit 0
-    )
-    return $?
-}
-
-# filter kernel modules to install certain modules that meet specific
-# requirements.
-# $1 = function to call with module name to filter.
-#      This function will be passed the full path to the module to test.
-# The behaviour of this function can vary depending on whether $hostonly is set.
-# If it is, we will only look at modules that are already in memory.
-# If it is not, we will look at all kernel modules
-# This function returns the full filenames of modules that match $1
-filter_kernel_modules () (
-    if ! [[ $hostonly ]]; then
-        filtercmd='find "$srcmods/kernel/drivers" "$srcmods/extra"'
-        filtercmd+=' "$srcmods/weak-updates" -name "*.ko" -o -name "*.ko.gz"'
-        filtercmd+=' 2>/dev/null'
-    else
-        filtercmd='cut -d " " -f 1 </proc/modules|xargs modinfo -F filename '
-        filtercmd+='-k $kernel 2>/dev/null'
-    fi
-    for modname in $(eval $filtercmd); do
-        case $modname in
-            *.ko) "$1" "$modname" && echo "$modname";;
-            *.ko.gz) gzip -dc "$modname" > $initdir/$$.ko
-                $1 $initdir/$$.ko && echo "$modname"
-                rm -f $initdir/$$.ko
-                ;;
-        esac
-    done
-)
-
-# install kernel modules along with all their dependencies.
-instmods() {
-    [[ $no_kernel = yes ]] && return
-    local mod mpargs modpath modname cmd moddirname
-    local ret=0
-    while (($# > 0)); do
-        mod=${1%.ko*}
-        case $mod in
-            =*)
-                # This introduces 2 incompatible meanings for =* arguments
-                # to instmods.  We need to decide which one to keep.
-                if [[ $mod = =ata && -f $srcmods/modules.block ]]; then
-                    instmods $mpargs \
-                        $(egrep 'ata|ahci' "${srcmods}/modules.block")
-                elif [ -f $srcmods/modules.${mod#=} ]; then
-                    instmods $mpargs $(cat ${srcmods}/modules.${mod#=} )
-                else
-                    instmods $mpargs $(find "$srcmods" -path "*/${mod#=}/*")
-                fi
-                ;;
-            --*)
-                mod=${mod##*/}
-                mpargs+=" $mod";;
-            i2o_scsi) shift; continue;; # Do not load this diagnostic-only module
-            *)  mod=${mod##*/}
-                # if we are already installed, skip this module and go on
-                # to the next one.
-                [[ -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 -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 ${moddirname}
-                ((ret+=$?))
-                ;;
-        esac
-        shift
-    done
-    return $ret
-}

dracut-gencmdline.8.xml

@@ -15,7 +15,7 @@
 <!-- body begins here -->
 <refsynopsisdiv id='synopsis'>
 <cmdsynopsis>
-  <command>dracut-gencmdline</command>    
+  <command>dracut-gencmdline</command>
     <sbr/>
 </cmdsynopsis>
 </refsynopsisdiv>
@@ -35,7 +35,7 @@ Harald Hoyer &lt;harald@redhat.com&gt;
 
 <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>
+<ulink url='https://dracut.wiki.kernel.org'>https://dracut.wiki.kernel.org</ulink></para>
 
 </refsect1>
 

dracut-gencmdline.sh

@@ -168,7 +168,7 @@ resolve_device_name() {
         real=$(freadlink /dev/disk/by-label/${1##LABEL=})
         [ -b $real ] && { echo $real; return; }
     fi
-    echo "$1" 
+    echo "$1"
 }
 
 finddevnoinsys() {
@@ -308,7 +308,7 @@ iscsi_set_parameters() {
     chap=${result}
     if [ -n "${chap}" -a "${chap}" != "<empty>" ]; then
         chap="-u ${chap}"
-        iscsi_get_rec_val $tmpfile "node.session.auth.password" 
+        iscsi_get_rec_val $tmpfile "node.session.auth.password"
         chap_pw="-w ${result}"
     else
         chap=""
@@ -318,7 +318,7 @@ iscsi_set_parameters() {
     chap_in=${result}
     if [ -n "${chap_in}" -a "${chap_in}" != "<empty>" ]; then
         chap_in="-U ${chap_in}"
-        iscsi_get_rec_val $tmpfile "node.session.auth.password_in" 
+        iscsi_get_rec_val $tmpfile "node.session.auth.password_in"
         chap_in_pw="-W ${result}"
     else
         chap_in=""
@@ -343,7 +343,7 @@ is_iscsi() {
     path=$1
     if echo $path | grep -q "/platform/host[0-9]*/session[0-9]*/target[0-9]*:[0-9]*:[0-9]*/[0-9]*:[0-9]*:[0-9]*:[0-9]*"; then
         return 0
-    else 
+    else
         return 1
     fi
 }
@@ -399,7 +399,7 @@ handledm() {
 EOF
         local name=$(dmsetup info --noheadings -c -j $major -m $minor -o name)
         local vg=$(lvshow "/dev/mapper/$name")
-        local raids=$(/sbin/dmraid -s -craidname 2>/dev/null | grep -vi "no raid disks") 
+        local raids=$(/sbin/dmraid -s -craidname 2>/dev/null | grep -vi "no raid disks")
         if [ -n "$vg" ]; then
             vg=`echo $vg` # strip whitespace
             case " $vg_list " in
@@ -630,7 +630,7 @@ fi
 
 cemit()
 {
-    cat 
+    cat
 }
 
 emit()
@@ -640,7 +640,7 @@ emit()
         NONL="-n"
         shift
     fi
-    echo $NONL "$@" 
+    echo $NONL "$@"
 }
 
 emitdmraids()
@@ -678,8 +678,8 @@ else
     echo -n "rd_NO_MD "
 fi
 
-if [ -z "$nolvm" -a -n "$vg_list" ]; then    
-    for vg in $vg_list; do 
+if [ -z "$nolvm" -a -n "$vg_list" ]; then
+    for vg in $vg_list; do
         echo -n "rd_LVM_VG=$vg "
     done
 else

dracut-initramfs-restore.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+set -e
+cd /run/initramfs
+IMG="/boot/initramfs-$(uname -r).img"
+[ -f .need_shutdown -a -f "$IMG" ] || exit 1
+zcat "$IMG"  | cpio -id >/dev/null 2>&1
+rm .need_shutdown

dracut-logger.sh

@@ -106,19 +106,21 @@ __DRACUT_LOGGER__=1
 # @warning Function sets global variables @var maxloglvl and @syslogfacility.
 # See file doc comment for details.
 dlog_init() {
-    # Skip initialization if it's already done.
-    [ -n "$maxloglvl" ] && return 0
-
+    local __oldumask
     local ret=0; local errmsg
-
     [ -z "$stdloglvl" ] && stdloglvl=4
     [ -z "$sysloglvl" ] && sysloglvl=0
     [ -z "$kmsgloglvl" ] && kmsgloglvl=0
+    # Skip initialization if it's already done.
+    [ -n "$maxloglvl" ] && return 0
 
     if [ -z "$fileloglvl" ]; then
         [ -w "$logfile" ] && fileloglvl=4 || fileloglvl=0
     elif [ $fileloglvl -gt 0 ]; then
+        __oldumask=$(umask)
+        umask 0377
         ! [ -e "$logfile" ] && >"$logfile"
+        umask $__oldumask
         if [ -w "$logfile" -a -f "$logfile" ]; then
             # Mark new run in the log file
             echo >>"$logfile"
@@ -269,12 +271,8 @@ _dlvl2syslvl() {
 #   - @c INFO to @c info
 #   - @c DEBUG and @c TRACE both to @c debug
 _do_dlog() {
-    [ -z "$maxloglvl" ] && return 0
     local lvl="$1"; shift
     local lvlc=$(_lvl2char "$lvl") || return 0
-
-    [ $lvl -le $maxloglvl ] || return 0
-
     local msg="$lvlc: $*"
 
     [ $lvl -le $stdloglvl ] && echo "$msg" >&2
@@ -305,6 +303,9 @@ _do_dlog() {
 # dwarn "This is a warning"
 # echo "This is a warning" | dwarn
 dlog() {
+    [ -z "$maxloglvl" ] && return 0
+    [ $1 -le $maxloglvl ] || return 0
+
     if [ $# -gt 1 ]; then
         _do_dlog "$@"
     else
@@ -312,7 +313,6 @@ dlog() {
             _do_dlog "$1" "$line"
         done
     fi
-    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief Logs message at TRACE level (6)
@@ -322,6 +322,7 @@ dlog() {
 dtrace() {
     set +x
     dlog 6 "$@"
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief Logs message at DEBUG level (5)
@@ -331,6 +332,7 @@ dtrace() {
 ddebug() {
     set +x
     dlog 5 "$@"
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief Logs message at INFO level (4)
@@ -340,6 +342,7 @@ ddebug() {
 dinfo() {
     set +x
     dlog 4 "$@"
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief Logs message at WARN level (3)
@@ -349,6 +352,7 @@ dinfo() {
 dwarn() {
     set +x
     dlog 3 "$@"
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief It's an alias to dwarn() function.
@@ -358,6 +362,7 @@ dwarn() {
 dwarning() {
     set +x
     dwarn "$@"
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief Logs message at ERROR level (2)
@@ -367,6 +372,7 @@ dwarning() {
 derror() {
     set +x
     dlog 2 "$@"
+    [ -n "$debug" ] && set -x || :
 }
 
 ## @brief Logs message at FATAL level (1)
@@ -376,4 +382,5 @@ derror() {
 dfatal() {
     set +x
     dlog 1 "$@"
+    [ -n "$debug" ] && set -x || :
 }

dracut-shutdown.service

@@ -0,0 +1,18 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Restore /run/initramfs
+After=getty@tty1.service prefdm.service
+Before=reboot.service
+DefaultDependencies=no
+ConditionPathExists=/run/initramfs/.need_shutdown
+
+[Service]
+ExecStart=/usr/lib/dracut/dracut-initramfs-restore
+Type=oneshot
+RemainAfterExit=yes

dracut-update-initramfs

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

dracut.8.xml

@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- This document was created with Syntext Serna Free. --><!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
+<!-- vim: set ts=8 sts=2 sw=2 et: -->
 <refentry id="dracut8">
   <refentryinfo>
     <title>dracut</title>
@@ -17,18 +18,6 @@
         <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>
@@ -37,9 +26,8 @@
       </author>
       <author>
         <contrib>Developer</contrib>
-        <firstname>David</firstname>
-        <surname>Dillow</surname>
-        <email>dave@thedillows.org</email>
+        <firstname>Warren</firstname>
+        <surname>Togami</surname>
       </author>
       <author>
         <contrib>Developer</contrib>
@@ -47,6 +35,17 @@
         <surname>Żołnowski</surname>
         <email>aidecoe@aidecoe.name</email>
       </author>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Jeremy</firstname>
+        <surname>Katz</surname>
+      </author>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>David</firstname>
+        <surname>Dillow</surname>
+        <email>dave@thedillows.org</email>
+      </author>
     </authorgroup>
   </refentryinfo>
   <refmeta>
@@ -82,7 +81,7 @@ 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>
+        <refentrytitle>dracut.cmdline</refentrytitle>
         <manvolnum>7</manvolnum>
       </citerefentry>
 </para>
@@ -108,10 +107,15 @@ For a complete list of kernel command line options see
             <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>
+            <para>specify a space-separated list of dracut modules to call
+when building the initramfs.
+Modules are located in
+<filename>/usr/lib/dracut/modules.d</filename>. This parameter can be specified multiple times.</para>
+	    <para>
+	      If [LIST] has multiple arguments, then you have to put these in quotes.
+	      For example:
+	      <screen># dracut --modules "module1 module2"  ...</screen>
+	    </para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -123,6 +127,11 @@ Modules are located in
           </term>
           <listitem>
             <para>omit a space-separated list of dracut modules. This parameter can be specified multiple times.</para>
+	    <para>
+	      If [LIST] has multiple arguments, then you have to put these in quotes.
+	      For example:
+	      <screen># dracut --omit "module1 module2"  ...</screen>
+	    </para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -134,8 +143,27 @@ Modules are located in
           </term>
           <listitem>
             <para>add a space-separated list of dracut modules to the default set of modules. This parameter can be specified multiple times.</para>
+	    <para>
+	      If [LIST] has multiple arguments, then you have to put these in quotes.
+	      For example:
+	      <screen># dracut --add "module1 module2"  ...</screen>
+	    </para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--force-add&nbsp;<replaceable>&lt;list of dracut modules&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>force to add a space-separated list of dracut modules to the default set of modules, when -H is specified. This parameter can be specified multiple times.</para>
+	    <para>
+	      If [LIST] has multiple arguments, then you have to put these in quotes.
+	      For example:
+	      <screen># dracut --force-add "module1 module2"  ...</screen>
+	    </para>
+          </listitem>
+        </varlistentry>
+
         <varlistentry>
           <term>
             <option>-d</option>
@@ -147,6 +175,11 @@ Modules are located in
             <para>specify a space-separated list of kernel modules to exclusively include
 in the initramfs.
 The kernel modules have to be specified without the &quot;.ko&quot; suffix. This parameter can be specified multiple times.</para>
+	    <para>
+	      If [LIST] has multiple arguments, then you have to put these in quotes.
+	      For example:
+	      <screen># dracut --drivers "kmodule1 kmodule2"  ...</screen>
+	    </para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -156,6 +189,25 @@ The kernel modules have to be specified without the &quot;.ko&quot; suffix. This
           <listitem>
             <para>specify a space-separated list of kernel modules to add to the initramfs.
 The kernel modules have to be specified without the &quot;.ko&quot; suffix. This parameter can be specified multiple times.</para>
+	    <para>
+	      If [LIST] has multiple arguments, then you have to put these in quotes.
+	      For example:
+	      <screen># dracut --add-drivers "kmodule1 kmodule2"  ...</screen>
+	    </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--omit-drivers&nbsp;<replaceable>&lt;list of kernel modules&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>specify a space-separated list of kernel modules not to add to the initramfs.
+The kernel modules have to be specified without the &quot;.ko&quot; suffix. This parameter can be specified multiple times.</para>
+	    <para>
+	      If [LIST] has multiple arguments, then you have to put these in quotes.
+	      For example:
+	      <screen># dracut --omit-drivers "kmodule1 kmodule2"  ...</screen>
+	    </para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -163,8 +215,13 @@ The kernel modules have to be specified without the &quot;.ko&quot; suffix. This
             <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 
+            <para>specify a space-separated list of kernel filesystem modules to exclusively
 include in the generic initramfs. This parameter can be specified multiple times.</para>
+	    <para>
+	      If [LIST] has multiple arguments, then you have to put these in quotes.
+	      For example:
+	      <screen># dracut --filesystems "filesystem1 filesystem2"  ...</screen>
+	    </para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -218,6 +275,46 @@ include in the generic initramfs. This parameter can be specified multiple times
             <para>do not include local <filename>/etc/mdadm.conf</filename></para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--lvmconf</option>
+          </term>
+          <listitem>
+            <para>include local <filename>/etc/lvm/lvm.conf</filename></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--nolvmconf</option>
+          </term>
+          <listitem>
+            <para>do not include local <filename>/etc/lvm/lvm.conf</filename></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--fscks [LIST]</option>
+          </term>
+          <listitem>
+            <para>add a space-separated list of fsck tools, in addition to
+              <filename>dracut.conf</filename>'s specification; the
+              installation is opportunistic (non-existing tools are ignored)
+            </para>
+	    <para>
+	      If [LIST] has multiple arguments, then you have to put these in quotes.
+	      For example:
+	      <screen># dracut --fscks "fsck.foo barfsck"  ...</screen>
+	    </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--nofscks</option>
+          </term>
+          <listitem>
+            <para>inhibit installation of any fsck tools</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term>
             <option>--strip</option>
@@ -234,6 +331,31 @@ include in the generic initramfs. This parameter can be specified multiple times
             <para>do not strip binaries in the initramfs</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--prefix&nbsp;<replaceable>&lt;dir&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>prefix initramfs files with the specified directory</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--noprefix</option>
+          </term>
+          <listitem>
+            <para>do not prefix initramfs files (default)</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--ctty</option>
+          </term>
+          <listitem>
+            <para>if possible, try to spawn an emergency shell on a terminal
+              with job control</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term>
             <option>-h</option>
@@ -284,7 +406,7 @@ include in the generic initramfs. This parameter can be specified multiple times
           </term>
           <listitem>
             <para>specify configuration file to use.
-Default: 
+Default:
 <filename>/etc/dracut.conf</filename></para>
           </listitem>
         </varlistentry>
@@ -294,10 +416,18 @@ Default:
           </term>
           <listitem>
             <para>specify configuration directory to use.
-Default: 
+Default:
 <filename>/etc/dracut.conf.d</filename></para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--sshkey&nbsp;<replaceable>&lt;sshkey file&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>ssh key file used with ssh-client module.</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term>
             <option>-l</option>
@@ -308,7 +438,7 @@ Default:
           <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>.
+<filename>/usr/lib/dracut/modules.d</filename>.
 This is useful when running dracut from a git checkout.</para>
           </listitem>
         </varlistentry>
@@ -320,8 +450,8 @@ This is useful when running dracut from a git checkout.</para>
             <option>--hostonly</option>
           </term>
           <listitem>
-            <para>Host-Only mode: Install only what is needed for booting 
-the local host instead of a generic host. 
+            <para>Host-Only mode: Install only what is needed for booting
+the local host instead of a generic host.
      <warning>
                 <para>If chrooted to another root other than the real root device, use &quot;--fstab&quot; and provide a valid <filename>/etc/fstab</filename>.</para>
               </warning></para>
@@ -335,7 +465,23 @@ the local host instead of a generic host.
             <para>Use <filename>/etc/fstab</filename> instead of <filename>/proc/self/mountinfo</filename>.</para>
           </listitem>
         </varlistentry>
-        <varlistentry>
+	<varlistentry>
+	  <term>
+	    <option>--add_fstab&nbsp;<replaceable>&lt;filename&gt;</replaceable>&nbsp;</option>
+	  </term>
+	  <listitem>
+	    <para>Add entries of <replaceable>&lt;filename&gt;</replaceable> to the initramfs /etc/fstab.</para>
+	  </listitem>
+	  </varlistentry>
+	<varlistentry>
+	  <term>
+	    <option>--mount&nbsp;&quot;<replaceable>&lt;device&gt;</replaceable> <replaceable>&lt;mountpoint&gt;</replaceable> <replaceable>&lt;filesystem type&gt;</replaceable> <replaceable>&lt;filesystem options&gt;</replaceable>&quot;</option>
+	  </term>
+	  <listitem>
+	    <para>Add entries of <replaceable>&lt;filename&gt;</replaceable> to the initramfs /etc/fstab.</para>
+	  </listitem>
+	  </varlistentry>
+	  <varlistentry>
           <term>
             <option>-i</option>
           </term>
@@ -356,6 +502,11 @@ TARGET directory in the final initramfs. If SOURCE is a file, it will be install
           </term>
           <listitem>
             <para>install the space separated list of files into the initramfs.</para>
+	    <para>
+	      If [LIST] has multiple arguments, then you have to put these in quotes.
+	      For example:
+	      <screen># dracut --install "/bin/foo /sbin/bar"  ...</screen>
+	    </para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -435,6 +586,14 @@ TARGET directory in the final initramfs. If SOURCE is a file, it will be install
             <para>Print included module's name to standard output during build.</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            <option>--keep</option>
+          </term>
+          <listitem>
+            <para>Keep the initramfs temporary directory for debugging purposes.</para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     </refsect2>
   </refsect1>
@@ -489,7 +648,7 @@ TARGET directory in the final initramfs. If SOURCE is a file, it will be install
           </term>
           <listitem>
             <para>Any files found in <filename>/etc/conf.d/</filename> will be sourced in the initramfs to
-set initial values. Command line options will override these values 
+set initial values. Command line options will override these values
 set in the configuration files.</para>
           </listitem>
         </varlistentry>
@@ -507,13 +666,13 @@ set in the configuration files.</para>
   <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>
+<ulink url='https://dracut.wiki.kernel.org'>https://dracut.wiki.kernel.org</ulink></para>
   </refsect1>
   <refsect1>
     <title>See Also</title>
     <para>
       <citerefentry>
-        <refentrytitle>dracut.kernel</refentrytitle>
+        <refentrytitle>dracut.cmdline</refentrytitle>
         <manvolnum>7</manvolnum>
       </citerefentry>
       <citerefentry>

dracut.cmdline.7.xml

@@ -1,8 +1,9 @@
 <?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" []>
+<!-- vim: set ts=8 sts=2 sw=2 et: -->
 <refentry id="dracutkernel7">
   <refentryinfo>
-    <title>dracut.kernel</title>
+    <title>dracut.cmdline</title>
     <productname>dracut</productname>
     <authorgroup>
       <author>
@@ -14,22 +15,22 @@
     </authorgroup>
   </refentryinfo>
   <refmeta>
-    <refentrytitle>dracut.kernel</refentrytitle>
+    <refentrytitle>dracut.cmdline</refentrytitle>
     <manvolnum>7</manvolnum>
     <refmiscinfo class="version"/>
   </refmeta>
   <refnamediv>
-    <refname>dracut.kernel</refname>
+    <refname>dracut.cmdline</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 
+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 
+<emphasis remap="B">root=UUID=uuidnumber</emphasis> will mount the partition with that UUID as the
 root filesystem.</para>
     <refsect2>
       <title>Standard</title>
@@ -47,7 +48,7 @@ root filesystem.</para>
             <envar>root=<replaceable>&lt;path to blockdevice&gt;</replaceable></envar>
           </term>
           <listitem>
-            <para>specify blockdevice to use as root filesystem. 
+            <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>
@@ -66,14 +67,14 @@ root=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1     </programlisting>
           </term>
           <listitem>
             <para>specify additional mount options for the root filesystem. If not set, <filename>/etc/fstab</filename>
-of the real root will be parsed for special mount options and mounted 
+of the real root will be parsed for special mount options and mounted
 accordingly.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term><envar>rd.fstab</envar>=0</term>
           <listitem>
-            <para>do not honor special mount options for the root filesystem found in 
+            <para>do not honor special mount options for the root filesystem found in
 <filename>/etc/fstab</filename> of the real root.</para>
           </listitem>
         </varlistentry>
@@ -87,7 +88,7 @@ accordingly.</para>
             <envar>rd.driver.blacklist=<replaceable>&lt;drivername&gt;<optional>,&lt;drivername&gt;,...</optional></replaceable></envar>
           </term>
           <listitem>
-            <para>do not load kernel module &lt;drivername&gt;
+            <para>do not load kernel module &lt;drivername&gt;.
 This parameter can be specified multiple times.</para>
           </listitem>
         </varlistentry>
@@ -96,7 +97,7 @@ This parameter can be specified multiple times.</para>
             <envar>rd.driver.pre=<replaceable>&lt;drivername&gt;<optional>,&lt;drivername&gt;,...</optional></replaceable></envar>
           </term>
           <listitem>
-            <para>force loading kernel module &lt;drivername&gt;
+            <para>force loading kernel module &lt;drivername&gt;.
 This parameter can be specified multiple times.</para>
           </listitem>
         </varlistentry>
@@ -108,6 +109,20 @@ This parameter can be specified multiple times.</para>
 	    <para>force loading kernel module &lt;drivername&gt; after all automatic loading modules have been loaded. This parameter can be specified multiple times.</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd.ctty=<replaceable>&lt;terminal&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>
+              if the dracut image was generated with --ctty option, try to
+              spawn an emergency shell on the specified terminal; if
+              <envar>rd.ctty</envar> is specified without a value or not
+              provided at all, the default is /dev/tty1. The '/dev' prefix
+              can be omitted.
+            </para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     </refsect2>
     <refsect2 id="dracut-kernel-debug">
@@ -169,14 +184,6 @@ This parameter can be specified multiple times.</para>
             <para>set udev to loglevel debug</para>
           </listitem>
         </varlistentry>
-        <varlistentry>
-          <term>
-            <envar>rd.timestamp</envar>
-          </term>
-          <listitem>
-            <para>export RDTIMESTAMP environment variable to init, which is set to the uptime of the dracut start.</para>
-          </listitem>
-        </varlistentry>
       </variablelist>
     </refsect2>
     <refsect2>
@@ -184,7 +191,7 @@ This parameter can be specified multiple times.</para>
       <variablelist>
         <varlistentry>
           <term>
-            <envar>voonsole.keymap=</envar>
+            <envar>vconsole.keymap=</envar>
             <replaceable>&lt;keymap base file name&gt;</replaceable>
           </term>
           <listitem>
@@ -302,7 +309,7 @@ This parameter can be specified multiple times.</para>
           <listitem>
             <para>only activate the LUKS partitions with the given UUID
 Any &quot;luks-&quot; of the LUKS UUID is removed before comparing to <replaceable>&lt;luks uuid&gt;</replaceable>.
-The comparisons also matches, if <replaceable>&lt;luks uuid&gt;</replaceable> is only the beginning of the 
+The comparisons also matches, if <replaceable>&lt;luks uuid&gt;</replaceable> 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>
@@ -325,7 +332,7 @@ This parameter can be specified multiple times.</para>
             <envar>rd.luks.key=</envar><replaceable>&lt;keypath&gt;:&lt;keydev&gt;:&lt;luksdev&gt;</replaceable>
           </term>
           <listitem>
-            <para><replaceable>keypath</replaceable> is a path to key file to look for. It&apos;s REQUIRED.</para>
+            <para><replaceable>keypath</replaceable> is a path to key file to look for. It&apos;s REQUIRED. When <replaceable>keypath</replaceable> ends with '.gpg' it's considered to be key encrypted symmetrically with GPG. You will be prompted for password on boot. GPG support comes with 'crypt-gpg' module which needs to be added explicitly.</para>
             <para><replaceable>keydev</replaceable> is a device on which key file resides. It might be kernel name of devices (should start with &quot;/dev/&quot;), UUID (prefixed with &quot;UUID=&quot;) or label (prefix with &quot;LABEL=&quot;).  You don&apos;t have to specify full UUID. Just its beginning will suffice, even if its ambiguous. All matching devices will be probed. This parameter is recommended, but not required. If not present, all block devices will be probed, which may significantly increase boot time.</para>
             <para>If <replaceable>luksdev</replaceable> is given, the specified key will only be applied for that LUKS device. Possible values are the same as for <replaceable>keydev</replaceable>. Unless you have several LUKS devices, you don&apos;t have to specify this parameter.</para>
             <para>The simplest usage is:</para>
@@ -350,6 +357,12 @@ This parameter can be specified multiple times.</para>
             <para>disable MD RAID for imsm/isw raids, use DM RAID instead</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><envar>rd.md.ddf</envar>=0</term>
+          <listitem>
+            <para>disable MD RAID for SNIA ddf raids, use DM RAID instead</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term>
             <envar>rd.md.conf</envar>=0
@@ -358,6 +371,14 @@ This parameter can be specified multiple times.</para>
             <para>ignore mdadm.conf included in initramfs</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd.md.waitclean</envar>=1
+          </term>
+          <listitem>
+            <para>wait for any resync, recovery, or reshape activity to finish before continuing</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term>
             <envar>rd.md.uuid=<replaceable>&lt;md raid uuid&gt;</replaceable></envar>
@@ -389,6 +410,37 @@ This parameter can be specified multiple times.</para>
         </varlistentry>
       </variablelist>
     </refsect2>
+    <refsect2>
+      <title>FIPS</title>
+      <variablelist>
+        <varlistentry>
+          <term><envar>rd.fips</envar></term>
+          <listitem>
+            <para>enable FIPS</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>boot=<replaceable>&lt;boot device&gt;</replaceable></envar>
+          </term>
+          <listitem>
+            <para>specify the device, where /boot is located.<programlisting>
+e.g.
+  boot=/dev/sda1
+  boot=/dev/disk/by-path/pci-0000:00:1f.1-scsi-0:0:1:0-part1
+  boot=UUID=&lt;uuid&gt;
+  boot=LABEL=&lt;label&gt;</programlisting>
+</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><envar>rd.fips.skipkernel</envar></term>
+          <listitem>
+            <para>skip checksum check of the kernel image. Useful, if the kernel image is not in a separate boot partition.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
     <refsect2>
       <title>Network</title>
       <variablelist>
@@ -397,8 +449,8 @@ This parameter can be specified multiple times.</para>
             <envar>ip=</envar><replaceable>{dhcp|on|any|dhcp6|auto6|ibft}</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 
+            <para><constant>dhcp|on|any</constant>: 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><constant>auto6</constant>: IPv6 autoconfiguration</para>
             <para><constant>dhcp6</constant>: IPv6 DHCP</para>
@@ -408,15 +460,15 @@ with a valid DHCP root-path.</para>
         <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>
+            <para><constant>dhcp|on|any|dhcp6</constant>: get ip from dhcp server on a specific interface</para>
+	    <para><constant>auto6</constant>: do IPv6 autoconfiguration</para>
+	    <para>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>
+          <term><envar>ip=</envar><replaceable>&lt;client-IP&gt;</replaceable>:
+              <replaceable>&lt;server-IP&gt;</replaceable>
+            :<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>
@@ -426,7 +478,6 @@ This parameter can be specified multiple times.</para>
           <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!
 <remark>Note: If you use this option you <emphasis remap="B">must</emphasis> specify an ifname= argument for all interfaces used in ip= or fcoe= arguments.</remark>
 This parameter can be specified multiple times.</para>
           </listitem>
@@ -436,7 +487,7 @@ This parameter can be specified multiple times.</para>
             <envar>bootdev=</envar><replaceable>&lt;interface&gt;</replaceable>
           </term>
           <listitem>
-            <para>specify network interface to use routing and netroot information from. 
+            <para>specify network interface to use routing and netroot information from.
 Required if multiple ip= lines are used.</para>
           </listitem>
         </varlistentry>
@@ -456,6 +507,14 @@ Required if multiple ip= lines are used.</para>
             <para>turn on/off biosdevname network interface renaming</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd.neednet=</envar><replaceable>&lt;0|1&gt;</replaceable>
+          </term>
+          <listitem>
+            <para>boolean, bring up network even without netroot set</para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     </refsect2>
     <refsect2>
@@ -478,7 +537,7 @@ NFS options can be appended with the prefix &quot;:&quot; or &quot;,&quot; and a
             <envar>root=</envar><replaceable>{dhcp|dhcp6}</replaceable>
           </term>
           <listitem>
-            <para>root=dhcp alone directs initrd to look at the DHCP root-path where NFS 
+            <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;]
@@ -491,8 +550,8 @@ options can be specified.
             <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<filename>/filesystems/nfsroot.txt</filename> defines 
-this method.  
+            <para><emphasis remap="B">Deprecated!</emphasis> kernel Documentation<filename>/filesystems/nfsroot.txt</filename> defines
+this method.
 This is supported by dracut, but not recommended.</para>
           </listitem>
         </varlistentry>
@@ -530,7 +589,7 @@ then used in the Discovery Service stage in conjunction with other
 associated fields.</para>
             <para>See <ulink url="http://tools.ietf.org/html/rfc4173#section-5">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.: 
+            <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>
@@ -545,7 +604,7 @@ associated fields.</para>
               <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.: 
+            <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>
@@ -573,7 +632,7 @@ netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1  </programlisting></par
         </varlistentry>
         <varlistentry>
           <term>
-	    <envar>root=</envar><replaceable>??? </replaceable><envar>rd.iscsi.firmware=1</envar>
+	    <envar>root=</envar><replaceable>??? </replaceable><envar>netroot=iscsi </envar><envar>rd.iscsi.firmware=1</envar>
 	  </term>
           <listitem>
             <para>will read the iscsi parameter from the BIOS firmware</para>
@@ -608,9 +667,9 @@ For the second argument, currently only nodcb is supported. This parameter can b
           </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 
+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 
+This syntax is only usable in cases where you are directly mounting the volume
 as the rootfs.</para>
           </listitem>
         </varlistentry>
@@ -672,10 +731,45 @@ rd.znet=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar</programlisting></para>
     <refsect2>
       <title>Plymouth Boot Splash</title>
       <variablelist>
+        <varlistentry>
+          <term><envar>plymouth.enable</envar>=0</term>
+          <listitem>
+            <para>disable the plymouth bootsplash.</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term><envar>rd.plymouth</envar>=0</term>
           <listitem>
-            <para>disable plymouth. This will not work with encrypted partitions.</para>
+            <para>disable the plymouth bootsplash only for the initramfs.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+   <refsect2>
+      <title>Kernel keys</title>
+      <variablelist>
+        <varlistentry>
+          <term><envar>masterkey=</envar><replaceable>&lt;kernel master key path name&gt;</replaceable></term>
+          <listitem>
+            <para>Set the path name of the kernel master key. e.g.: <programlisting>masterkey=/etc/keys/kmk-trusted.blob</programlisting></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><envar>masterkeytype=</envar><replaceable>&lt;kernel master key type&gt;</replaceable></term>
+          <listitem>
+            <para>Set the type of the kernel master key. e.g.: <programlisting>masterkeytype=trusted</programlisting></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><envar>evmkey=</envar><replaceable>&lt;EVM key path name&gt;</replaceable></term>
+          <listitem>
+            <para>Set the path name of the EVM key. e.g.: <programlisting>evmkey=/etc/keys/evm-trusted.blob</programlisting></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><envar>ecryptfskey=</envar><replaceable>&lt;eCryptfs key path name&gt;</replaceable></term>
+          <listitem>
+            <para>Set the path name of the eCryptfs key. e.g.: <programlisting>ecryptfskey=/etc/keys/ecryptfs-trusted.blob</programlisting></para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -700,14 +794,6 @@ rd.znet=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar</programlisting></para>
             <para><envar>rd.ccw</envar></para>
           </listitem>
         </varlistentry>
-        <varlistentry>
-          <term>
-            <envar>rdcopystate</envar>
-          </term>
-          <listitem>
-            <para><envar>rd.copystate</envar></para>
-          </listitem>
-        </varlistentry>
         <varlistentry>
           <term>
             <envar>rd_DASD_MOD</envar>
@@ -1200,7 +1286,7 @@ rd.znet=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar</programlisting></para>
         </term>
         <listitem>
           <para>Any files found in <filename>/etc/conf.d/</filename> will be sourced in the initramfs to
-set initial values. Command line options will override these values 
+set initial values. Command line options will override these values
 set in the configuration files.</para>
         </listitem>
       </varlistentry>
@@ -1212,6 +1298,14 @@ set in the configuration files.</para>
           <para>Can contain additional command line options.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>/etc/cmdline.d/*.conf</filename>
+        </term>
+        <listitem>
+          <para>Can contain additional command line options.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
   <refsect1>

dracut.conf

@@ -3,7 +3,9 @@
 logfile=/var/log/dracut.log
 fileloglvl=6
 
-# Specific list of dracut modules to use
+# Exact list of dracut modules to use.  Modules not listed here are not going
+# to be included.  If you only want to add some optional modules use
+# add_dracutmodules option instead.
 #dracutmodules+=""
 
 # Dracut modules to omit
@@ -27,3 +29,12 @@ mdadmconf="yes"
 
 # install local /etc/lvm/lvm.conf
 lvmconf="yes"
+
+# A list of fsck tools to install. If it's not specified, module's hardcoded
+# default is used, currently: "umount mount /sbin/fsck* xfs_db xfs_check
+# xfs_repair e2fsck jfs_fsck reiserfsck btrfsck". The installation is
+# opportunistic, so non-existing tools are just ignored.
+#fscks=""
+
+# inhibit installation of any fsck tools
+#nofscks="yes"

dracut.conf.5.xml

@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- This document was created with Syntext Serna Free. --><!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
+<!-- vim: set ts=8 sts=2 sw=2 et: -->
 <refentry id="dracutconf5">
   <refentryinfo>
     <title>dracut.conf</title>
@@ -45,7 +46,7 @@ overwrite parameters set in <filename>/etc/dracut.conf</filename>. Each line spe
         <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>.</para>
+in <filename>/usr/lib/dracut/modules.d</filename>.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -79,11 +80,29 @@ The kernel modules have to be specified without the &quot;.ko&quot; suffix.</par
           <envar>add_drivers+=&quot;&nbsp;<replaceable>&lt;kernel modules&gt;</replaceable>&nbsp;&quot;</envar>
         </term>
         <listitem>
-          <para>Specify a space-separated list of kernel 
+          <para>Specify a space-separated list of kernel
 modules to add to the initramfs.
 The kernel modules have to be specified without the &quot;.ko&quot; suffix.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>omit_drivers+=&quot;&nbsp;<replaceable>&lt;kernel modules&gt;</replaceable>&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Specify a space-separated list of kernel
+modules not to add to the initramfs.
+The kernel modules have to be specified without the &quot;.ko&quot; suffix.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>install_items+=&quot;&nbsp;<replaceable>&lt;kernel modules&gt;</replaceable>&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Specify a space-separated list of files, which are added to the initramfs image.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <envar>filesystems+=&quot;&nbsp;<replaceable>&lt;filesystem names&gt;</replaceable>&nbsp;&quot;</envar>
@@ -110,6 +129,14 @@ initramfs.</para>
           <para>Specify additional directories, where to look for firmwares, separated by <constant>:</constant></para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>install_items+=&quot;&#160;<replaceable>&lt;file&gt;</replaceable>[ <replaceable>&lt;file&gt;</replaceable>&nbsp;...]&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Specify additional files to include in the initramfs, separated by spaces.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <envar>do_strip=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
@@ -123,7 +150,7 @@ initramfs.</para>
           <envar>hostonly=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
         </term>
         <listitem>
-          <para>Host-Only mode: Install only what is needed for booting 
+          <para>Host-Only mode: Install only what is needed for booting
    the local host instead of a generic host.
    <warning><para>If chrooted to another root other than the real root device, use <option>--fstab</option> and provide a valid <filename>/etc/fstab</filename>.</para>
             </warning>
@@ -138,6 +165,14 @@ initramfs.</para>
           <para>Use <filename>/etc/fstab</filename> instead of <filename>/proc/self/mountinfo</filename>.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>add_fstab+=&quot;&nbsp;<replaceable>&lt;filename&gt;</replaceable>&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Add entries of <replaceable>&lt;filename&gt;</replaceable> to the initramfs /etc/fstab.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <envar>mdadmconf=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
@@ -154,6 +189,27 @@ initramfs.</para>
           <para>Include local <filename>/etc/lvm/lvm.conf</filename> (default=yes)</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>fscks=&quot;&nbsp;<replaceable>&lt;fsck tools&gt;</replaceable>&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Add a space-separated list of fsck tools. If nothing is
+            specified, the default is: &quot;<replaceable>umount mount
+            /sbin/fsck* xfs_db xfs_check xfs_repair e2fsck jfs_fsck
+            reiserfsck btrfsck</replaceable>&quot;
+          </para>
+          <para>The installation is opportunistic (non-existing tools are ignored).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <envar>nofscks=&quot;<replaceable>{yes}</replaceable>&quot;</envar>
+        </term>
+        <listitem>
+          <para>If specified, inhibit installation of any fsck tools.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <envar>kernel_only=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
@@ -233,7 +289,7 @@ The configuration files are read in alphanumerical order.</para>
         <manvolnum>8</manvolnum>
       </citerefentry>
       <citerefentry>
-        <refentrytitle>dracut.kernel</refentrytitle>
+        <refentrytitle>dracut.cmdline</refentrytitle>
         <manvolnum>7</manvolnum>
       </citerefentry>
     </para>

dracut.conf.d/fedora.conf.example

@@ -1,7 +1,10 @@
-# /etc/dracut.conf.d/redhat.conf
 # Dracut config file customized for RedHat/Fedora.
 
 # i18n
 i18n_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP /etc/sysconfig/i18n:SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
 add_dracutmodules+=" rpmversion "
+omit_dracutmodules+=" dash "
+omit_drivers+=" .*/fs/ocfs/.* "
 stdloglvl=3
+realinitpath="/usr/lib/systemd/systemd"
+install_items+=" vi /etc/virc ps grep cat rm openvt "

dracut.logrotate

@@ -2,6 +2,5 @@
     missingok
     notifempty
     size 30k
-    yearly
     create 0600 root root
 }

dracut.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-# 
+#
 # Generator script for a dracut initramfs
 # Tries to retain some degree of compatibility with the command line
 # of the various mkinitrd implementations out there
@@ -35,30 +35,37 @@ Creates initial ramdisk images for preloading modules
   -f, --force           Overwrite existing initramfs file.
   -m, --modules [LIST]  Specify a space-separated list of dracut modules to
                          call when building the initramfs. Modules are located
-                         in /usr/share/dracut/modules.d.
+                         in /usr/lib/dracut/modules.d.
   -o, --omit [LIST]     Omit a space-separated list of dracut modules.
   -a, --add [LIST]      Add a space-separated list of dracut modules.
   -d, --drivers [LIST]  Specify a space-separated list of kernel modules to
                         exclusively include in the initramfs.
-  --add-drivers [LIST]  Specify a space-separated list of kernel 
+  --add-drivers [LIST] Specify a space-separated list of kernel
                         modules to add to the initramfs.
+  --omit-drivers [LIST] Specify a space-separated list of kernel
+                        modules not to add to the initramfs.
   --filesystems [LIST]  Specify a space-separated list of kernel filesystem
                         modules to exclusively include in the generic
                         initramfs.
-  -k, --kmoddir [DIR]   Specify the directory, where to look for kernel 
+  -k, --kmoddir [DIR]   Specify the directory, where to look for kernel
                         modules
-  --fwdir [DIR]         Specify additional directories, where to look for 
+  --fwdir [DIR]         Specify additional directories, where to look for
                         firmwares, separated by :
   --kernel-only         Only install kernel drivers and firmware files
   --no-kernel           Do not install kernel drivers and firmware files
   --strip               Strip binaries in the initramfs
   --nostrip             Do not strip binaries in the initramfs (default)
+  --prefix [DIR]        Prefix initramfs files with [DIR]
+  --noprefix            Do not prefix initramfs files (default)
   --mdadmconf           Include local /etc/mdadm.conf
   --nomdadmconf         Do not include local /etc/mdadm.conf
   --lvmconf             Include local /etc/lvm/lvm.conf
   --nolvmconf           Do not include local /etc/lvm/lvm.conf
+  --fscks [LIST]        Add a space-separated list of fsck helpers.
+  --nofscks             Inhibit installation of any fsck helpers.
   -h, --help            This message
   --debug               Output debug information of the build process
+  --profile             Output profile information of the build process
   -L, --stdlog [0-6]    Specify logging level (to standard error)
                          0 - suppress any messages
                          1 - only fatal errors
@@ -71,19 +78,23 @@ Creates initial ramdisk images for preloading modules
   -q, --quiet           Decrease verbosity level (default is info(4))
   -c, --conf [FILE]     Specify configuration file to use.
                          Default: /etc/dracut.conf
-  --confdir [DIR]       Specify configuration directory to use *.conf files 
+  --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.
+                         /usr/lib/dracut/modules.d.
                          Useful when running dracut from a git checkout.
   -H, --hostonly        Host-Only mode: Install only what is needed for
                          booting the local host instead of a generic host.
   --fstab               Use /etc/fstab to determine the root device.
+  --add-fstab [FILE]    Add file to the initramfs fstab
+  --mount "[DEV] [MP] [FSTYPE] [FSOPTS]"
+                        Mount device [DEV] on mountpoint [MP] with filesystem
+                        [FSTYPE] and options [FSOPTS] in the initramfs
   -i, --include [SOURCE] [TARGET]
                         Include the files in the SOURCE directory into the
                          Target directory in the final initramfs.
-                        If SOURCE is a file, it will be installed to TARGET 
+                        If SOURCE is a file, it will be installed to TARGET
                          in the final initramfs.
   -I, --install [LIST]  Install the space separated list of files into the
                          initramfs.
@@ -94,20 +105,27 @@ Creates initial ramdisk images for preloading modules
                          Make sure your kernel has bzip2 decompression support
                          compiled in, otherwise you will not be able to boot.
   --lzma                Compress the generated initramfs using lzma.
-                         Make sure your kernel has lzma support compiled in, 
+                         Make sure your kernel has lzma support compiled in,
                          otherwise you will not be able to boot.
   --xz                  Compress the generated initramfs using xz.
                          Make sure that your kernel has xz support compiled
                          in, otherwise you will not be able to boot.
   --compress [COMPRESSION] Compress the generated initramfs with the
                          passed compression program.  Make sure your kernel
-                         knows how to decompress the generated initramfs, 
+                         knows how to decompress the generated initramfs,
                          otherwise you will not be able to boot.
   --no-compress         Do not compress the generated initramfs.  This will
                          override any other compression options.
   --list-modules        List all available dracut modules.
   -M, --show-modules    Print included module's name to standard output during
                          build.
+  --keep                Keep the temporary initramfs for debugging purposes
+  --sshkey [SSHKEY]     Add ssh key to initramfs (use with ssh-client module)
+  --ctty                Add control tty for emergency shells
+
+If [LIST] has multiple arguments, then you have to put these in quotes.
+For example:
+# dracut --add-drivers "module1 module2"  ...
 EOF
 }
 
@@ -135,7 +153,7 @@ push() {
 # val=$(pop stack)
 pop() {
     local __stack=$1; shift
-    local __resultvar=$1    
+    local __resultvar=$1
     local myresult;
     # check for empty stack
     eval '[[ ${#'${__stack}'[@]} -eq 0 ]] && return 1'
@@ -192,30 +210,39 @@ verbosity_mod_l=0
 while (($# > 0)); do
     case ${1%%=*} in
         -a|--add)      push_arg add_dracutmodules_l  "$@" || shift;;
+        --force-add)   push_arg force_add_dracutmodules_l  "$@" || shift;;
         --add-drivers) push_arg add_drivers_l        "$@" || shift;;
+        --omit-drivers) push_arg omit_drivers_l      "$@" || shift;;
         -m|--modules)  push_arg dracutmodules_l      "$@" || shift;;
         -o|--omit)     push_arg omit_dracutmodules_l "$@" || shift;;
         -d|--drivers)  push_arg drivers_l            "$@" || shift;;
         --filesystems) push_arg filesystems_l        "$@" || shift;;
-        -I|--install)  push_arg install_items        "$@" || shift;;
+        -I|--install)  push_arg install_items_l      "$@" || shift;;
         --fwdir)       push_arg fw_dir_l             "$@" || shift;;
+        --fscks)       push_arg fscks_l              "$@" || shift;;
+        --add-fstab)   push_arg add_fstab_l          "$@" || shift;;
+        --mount)       push_arg fstab_lines          "$@" || shift;;
+        --nofscks)     nofscks_l="yes";;
         -k|--kmoddir)  read_arg drivers_dir_l        "$@" || shift;;
         -c|--conf)     read_arg conffile             "$@" || shift;;
         --confdir)     read_arg confdir              "$@" || shift;;
         -L|--stdlog)   read_arg stdloglvl_l          "$@" || shift;;
-        -I|--install)  read_arg install_items        "$@" || shift;;
-        --fwdir)       read_arg fw_dir_l             "$@" || shift;;
         --compress)    read_arg compress_l           "$@" || shift;;
+        --prefix)      read_arg prefix_l             "$@" || shift;;
         -f|--force)    force=yes;;
         --kernel-only) kernel_only="yes"; no_kernel="no";;
         --no-kernel)   kernel_only="no"; no_kernel="yes";;
         --strip)       do_strip_l="yes";;
         --nostrip)     do_strip_l="no";;
+        --noprefix)    prefix_l="/";;
         --mdadmconf)   mdadmconf_l="yes";;
         --nomdadmconf) mdadmconf_l="no";;
         --lvmconf)     lvmconf_l="yes";;
         --nolvmconf)   lvmconf_l="no";;
         --debug)       debug="yes";;
+        --profile)     profile="yes";;
+        --ctty)        cttyhack="yes";;
+        --sshkey)      read_arg sshkey   "$@" || shift;;
         -v|--verbose)  ((verbosity_mod_l++));;
         -q|--quiet)    ((verbosity_mod_l--));;
         -l|--local)    allowlocal="yes" ;;
@@ -236,8 +263,9 @@ while (($# > 0)); do
         -M|--show-modules)
                        show_modules_l="yes"
                        ;;
+        --keep)        keep="yes";;
         -*) printf "\nUnknown option: %s\n\n" "$1" >&2; usage; exit 1;;
-        *) 
+        *)
             if ! [[ ${outfile+x} ]]; then
                 outfile=$1
             elif ! [[ ${kernel+x} ]]; then
@@ -254,18 +282,33 @@ if ! [[ $kernel ]]; then
 fi
 [[ $outfile ]] || outfile="/boot/initramfs-$kernel.img"
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-export PATH
+for i in /usr/sbin /sbin /usr/bin /bin; do
+    rl=$i
+    if [ -L "$i" ]; then
+        rl=$(readlink -f $i)
+    fi
+    NPATH+=":$rl"
+done
+export PATH="${NPATH#:}"
+unset NPATH
+unset LD_LIBRARY_PATH
+unset GREP_OPTIONS
 
-[[ $debug ]] && { 
+[[ $debug ]] && {
     export PS4='${BASH_SOURCE}@${LINENO}(${FUNCNAME[0]}): ';
     set -x
 }
 
-[[ $dracutbasedir ]] || dracutbasedir=/usr/share/dracut
+[[ $profile ]] && {
+    export PS4='+ $(date "+%s.%N") ${BASH_SOURCE}@${LINENO}: ';
+    set -x
+    debug=yes
+}
 
-[[ $allowlocal && -f "$(readlink -f ${0%/*})/dracut-functions" ]] && \
-    dracutbasedir="$(readlink -f ${0%/*})" 
+[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
+
+[[ $allowlocal && -f "$(readlink -f ${0%/*})/dracut-functions.sh" ]] && \
+    dracutbasedir="$(readlink -f ${0%/*})"
 
 # if we were not passed a config file, try the default one
 if [[ ! -f $conffile ]]; then
@@ -283,7 +326,7 @@ fi
 
 # source our config dir
 if [[ $confdir && -d $confdir ]]; then
-    for f in "$confdir"/*.conf; do 
+    for f in "$confdir"/*.conf; do
         [[ -e $f ]] && . "$f"
     done
 fi
@@ -295,9 +338,33 @@ if (( ${#add_dracutmodules_l[@]} )); then
     done
 fi
 
-if (( ${#add_drivers_l[@]} )); then
-    while pop add_drivers_l val; do
-        add_drivers+=" $val "
+if (( ${#force_add_dracutmodules_l[@]} )); then
+    while pop force_add_dracutmodules_l val; do
+        force_add_dracutmodules+=" $val "
+    done
+fi
+
+if (( ${#fscks_l[@]} )); then
+    while pop fscks_l val; do
+        fscks+=" $val "
+    done
+fi
+
+if (( ${#add_fstab_l[@]} )); then
+    while pop add_fstab_l val; do
+        add_fstab+=" $val "
+    done
+fi
+
+if (( ${#fstab_lines_l[@]} )); then
+    while pop fstab_lines_l val; do
+        push fstab_lines $val
+    done
+fi
+
+if (( ${#install_items_l[@]} )); then
+    while pop install_items_l val; do
+        install_items+=" $val "
     done
 fi
 
@@ -316,13 +383,6 @@ if (( ${#omit_dracutmodules_l[@]} )); then
     done
 fi
 
-if (( ${#drivers_l[@]} )); then
-    drivers=''
-    while pop drivers_l val; do
-        drivers+="$val "
-    done
-fi
-
 if (( ${#filesystems_l[@]} )); then
     filesystems=''
     while pop filesystems_l val; do
@@ -345,24 +405,28 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
 
 [[ $drivers_dir_l ]] && drivers_dir=$drivers_dir_l
 [[ $do_strip_l ]] && do_strip=$do_strip_l
+[[ $prefix_l ]] && prefix=$prefix_l
+[[ $prefix = "/" ]] && unset prefix
 [[ $hostonly_l ]] && hostonly=$hostonly_l
 [[ $use_fstab_l ]] && use_fstab=$use_fstab_l
 [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
 [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
-[[ $dracutbasedir ]] || dracutbasedir=/usr/share/dracut
+[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
 [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
 [[ $do_strip ]] || do_strip=no
 [[ $compress_l ]] && compress=$compress_l
 [[ $show_modules_l ]] && show_modules=$show_modules_l
+[[ $nofscks_l ]] && nofscks="yes"
 # eliminate IFS hackery when messing with fw_dir
 fw_dir=${fw_dir//:/ }
 
 # handle compression options.
+[[ $compress ]] || compress="gzip"
 case $compress in
-    bzip2) compress="bzip -9";;
+    bzip2) compress="bzip2 -9";;
     lzma)  compress="lzma -9";;
     xz)    compress="xz --check=crc32 --lzma2=dict=1MiB";;
-    gzip)  type pigz > /dev/null 2>&1 && compress="pigz -9" || \
+    gzip)  command -v pigz > /dev/null 2>&1 && compress="pigz -9" || \
                                          compress="gzip -9";;
 esac
 if [[ $_no_compress_l = "cat" ]]; then
@@ -371,20 +435,57 @@ fi
 
 [[ $hostonly = yes ]] && hostonly="-h"
 [[ $hostonly != "-h" ]] && unset hostonly
-[[ $compress ]] || compress="gzip -9"
 
-if [[ -f $dracutbasedir/dracut-functions ]]; then
-    . $dracutbasedir/dracut-functions
+if [[ -f $dracutbasedir/dracut-functions.sh ]]; then
+    . $dracutbasedir/dracut-functions.sh
 else
-    echo "Cannot find $dracutbasedir/dracut-functions." >&2
+    echo "Cannot find $dracutbasedir/dracut-functions.sh." >&2
     echo "Are you running from a git checkout?" >&2
     echo "Try passing -l as an argument to $0" >&2
     exit 1
 fi
 
-dracutfunctions=$dracutbasedir/dracut-functions
+# Verify bash version, curret minimum is 3.1
+if (( ${BASH_VERSINFO[0]} < 3 ||
+    ( ${BASH_VERSINFO[0]} == 3 && ${BASH_VERSINFO[1]} < 1 ) )); then
+    dfatal 'You need at least Bash 3.1 to use dracut, sorry.'
+    exit 1
+fi
+
+dracutfunctions=$dracutbasedir/dracut-functions.sh
 export dracutfunctions
 
+if (( ${#drivers_l[@]} )); then
+    drivers=''
+    while pop drivers_l val; do
+        drivers+="$val "
+    done
+fi
+drivers=${drivers/-/_}
+
+if (( ${#add_drivers_l[@]} )); then
+    while pop add_drivers_l val; do
+        add_drivers+=" $val "
+    done
+fi
+add_drivers=${add_drivers/-/_}
+
+if (( ${#omit_drivers_l[@]} )); then
+    while pop omit_drivers_l val; do
+        omit_drivers+=" $val "
+    done
+fi
+omit_drivers=${omit_drivers/-/_}
+
+omit_drivers_corrected=""
+for d in $omit_drivers; do
+    strstr " $drivers $add_drivers " " $d " && continue
+    omit_drivers_corrected+="$d|"
+done
+omit_drivers="${omit_drivers_corrected%|}"
+unset omit_drivers_corrected
+
+
 ddebug "Executing $0 $dracut_args"
 
 [[ $do_list = yes ]] && {
@@ -445,51 +546,159 @@ elif [[ -f "$outfile" && ! -w "$outfile" ]]; then
     exit 1
 fi
 
-[[ $TMPDIR && ! -w $TMPDIR ]] && unset TMPDIR
-readonly initdir=$(mktemp -d -t initramfs.XXXXXX)
+readonly TMPDIR=/var/tmp
+readonly initdir=$(mktemp --tmpdir=/var/tmp/ -d -t initramfs.XXXXXX)
+[ -d "$initdir" ] || {
+    dfatal "mktemp failed."
+    exit 1
+}
 
 # clean up after ourselves no matter how we die.
-trap 'ret=$?;rm -rf "$initdir";exit $ret;' EXIT 
+trap 'ret=$?;[[ $keep ]] && echo "Not removing $initdir." >&2 || rm -rf "$initdir";exit $ret;' EXIT
 # clean up after ourselves no matter how we die.
-trap 'exit 1;' SIGINT 
+trap 'exit 1;' SIGINT
 
 # Need to be able to have non-root users read stuff (rpcbind etc)
 chmod 755 "$initdir"
 
-export initdir dracutbasedir dracutmodules drivers \
-    fw_dir drivers_dir debug no_kernel kernel_only \
-    add_drivers mdadmconf lvmconf filesystems \
-    use_fstab libdir usrlibdir \
-    stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
-    debug
+for line in "${fstab_lines[@]}"; do
+    set -- $line
+    #dev mp fs fsopts
+    push host_devs "$1"
+    push host_fs_types "$1|$3"
+done
 
-if [[ $kernel_only != yes ]]; then
-    # Create some directory structure first
-    for d in bin sbin usr/bin usr/sbin usr/lib etc \
-        proc sys sysroot tmp dev/pts var/run; do 
-        inst_dir "/$d"; 
+for f in $add_fstab; do
+    [ -e $f ] || continue
+    while read dev rest; do
+        push host_devs $dev
+    done < $f
+done
+
+if [[ $hostonly ]]; then
+    # in hostonly mode, determine all devices, which have to be accessed
+    # and examine them for filesystem types
+
+    push host_mp \
+        "/" \
+        "/etc" \
+        "/usr" \
+        "/usr/bin" \
+        "/usr/sbin" \
+        "/usr/lib" \
+        "/usr/lib64" \
+        "/boot"
+
+    for mp in "${host_mp[@]}"; do
+        mountpoint "$mp" >/dev/null 2>&1 || continue
+        push host_devs $(readlink -f "/dev/block/$(find_block_device "$mp")")
     done
 fi
 
+_get_fs_type() (
+    [[ $1 ]] || return
+    if [[ -b $1 ]] && get_fs_env $1; then
+        echo "$1|$ID_FS_TYPE"
+        return 1
+    fi
+    if [[ -b /dev/block/$1 ]] && get_fs_env /dev/block/$1; then
+        echo "/dev/block/$1|$ID_FS_TYPE"
+        return 1
+    fi
+    if fstype=$(find_dev_fstype $1); then
+        echo "$1|$fstype"
+        return 1
+    fi
+    return 1
+)
+
+for dev in "${host_devs[@]}"; do
+    unset fs_type
+    for fstype in $(_get_fs_type $dev) \
+        $(check_block_and_slaves _get_fs_type $(get_maj_min $dev)); do
+        if ! strstr " ${host_fs_types[*]} " " $fstype ";then
+            push host_fs_types "$fstype"
+        fi
+    done
+done
+
+export initdir dracutbasedir dracutmodules drivers \
+    fw_dir drivers_dir debug no_kernel kernel_only \
+    add_drivers omit_drivers mdadmconf lvmconf filesystems \
+    use_fstab fstab_lines libdir usrlibdir fscks nofscks cttyhack \
+    stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
+    debug host_fs_types host_devs sshkey
+
+# Create some directory structure first
+[[ $prefix ]] && mkdir -m 0755 -p "${initdir}${prefix}"
+
+[[ -h /lib ]] || mkdir -m 0755 -p "${initdir}${prefix}/lib"
+[[ $prefix ]] && ln -sfn "${prefix#/}/lib" "$initdir/lib"
+
+if [[ $prefix ]]; then
+    for d in bin etc lib "$libdir" sbin tmp usr var; do
+        ln -sfn "${prefix#/}/${d#/}" "$initdir/$d"
+    done
+fi
+
+if [[ $kernel_only != yes ]]; then
+    for d in usr/bin usr/sbin bin etc lib "$libdir" sbin tmp usr var var/log; do
+        [[ -e "${initdir}${prefix}/$d" ]] && continue
+        if [ -L "/$d" ]; then
+            inst_symlink "/$d" "${prefix}/$d"
+        else
+            mkdir -m 0755 -p "${initdir}${prefix}/$d"
+        fi
+    done
+
+    for d in dev proc sys sysroot root run run/lock run/initramfs; do
+        if [ -L "/$d" ]; then
+            inst_symlink "/$d"
+        else
+            mkdir -m 0755 -p "$initdir/$d"
+        fi
+    done
+
+    ln -sfn /run "$initdir/var/run"
+    ln -sfn /run/lock "$initdir/var/lock"
+else
+    for d in lib "$libdir"; do
+        [[ -e "${initdir}${prefix}/$d" ]] && continue
+        if [ -h "/$d" ]; then
+            inst "/$d" "${prefix}/$d"
+        else
+            mkdir -m 0755 -p "${initdir}${prefix}/$d"
+        fi
+    done
+fi
+
+if [[ $kernel_only != yes ]]; then
+    mkdir -p "${initdir}/etc/cmdline.d"
+fi
+
+mods_to_load=""
 # check all our modules to see if they should be sourced.
 # This builds a list of modules that we will install next.
-check_module_dir
+for_each_module_dir check_module
+for_each_module_dir check_mount
 
+modules_loaded=" "
 # source our modules.
 for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
-    mod=${moddir##*/}; mod=${mod#[0-9][0-9]}
-    if strstr "$mods_to_load" " $mod "; then
-        [[ $show_modules = yes ]] && echo "$mod" || \
-            dinfo "*** Including module: $mod ***"
+    _d_mod=${moddir##*/}; _d_mod=${_d_mod#[0-9][0-9]}
+    if strstr "$mods_to_load" " $_d_mod "; then
+        [[ $show_modules = yes ]] && echo "$_d_mod" || \
+            dinfo "*** Including module: $_d_mod ***"
         if [[ $kernel_only = yes ]]; then
-            module_installkernel $mod
+            module_installkernel $_d_mod
         else
-            module_install $mod
+            module_install $_d_mod
             if [[ $no_kernel != yes ]]; then
-                module_installkernel $mod
+                module_installkernel $_d_mod
             fi
         fi
-        mods_to_load=${mods_to_load// $mod /}
+        mods_to_load=${mods_to_load// $_d_mod /}
+        modules_loaded+="$_d_mod "
     fi
 done
 unset moddir
@@ -511,25 +720,49 @@ while pop include_src src && pop include_target tgt; do
         else
             ddebug "Including directory: $src"
             mkdir -p "${initdir}/${tgt}"
-            cp -a -t "${initdir}/${tgt}" "$src"/*
+            # check for preexisting symlinks, so we can cope with the
+            # symlinks to $prefix
+            for i in "$src"/*; do
+                [[ -e "$i" || -h "$i" ]] || continue
+                s=${initdir}/${tgt}/${i#$src/}
+                if [[ -d "$i" ]]; then
+                    if ! [[ -e "$s" ]]; then
+                        mkdir -m 0755 -p "$s"
+                        chmod --reference="$i" "$s"
+                    fi
+                    cp -a -t "$s" "$i"/*
+                else
+                    cp -a -t "$s" "$i"
+                fi
+            done
         fi
     fi
 done
 
-while pop install_items items; do
-    for item in $items; do
-        dracut_install "$item"
+if [[ $kernel_only != yes ]]; then
+    for item in $install_items; do
+        dracut_install -o "$item"
     done
-done
-unset item
+    unset item
 
-# make sure that library links are correct and up to date
-dracut_install /etc/ld.so.conf /etc/ld.so.conf.d/*
-if ! ldconfig -r "$initdir"; then
-    if [[ $UID = 0 ]]; then
-        derror "ldconfig exited ungracefully"
-    else
-        derror "ldconfig might need uid=0 (root) for chroot()"
+    while pop fstab_lines line; do
+        echo "$line 0 0" >> "${initdir}/etc/fstab"
+    done
+
+    for f in $add_fstab; do
+        cat $f >> "${initdir}/etc/fstab"
+    done
+
+    # make sure that library links are correct and up to date
+    for f in /etc/ld.so.conf /etc/ld.so.conf.d/*; do
+        [[ -f $f ]] && inst_simple "$f"
+    done
+    if ! ldconfig -r "$initdir"; then
+        if [[ $UID = 0 ]]; then
+            derror "ldconfig exited ungracefully"
+        else
+            derror "ldconfig might need uid=0 (root) for chroot()"
+        fi
     fi
 fi
 
@@ -538,9 +771,9 @@ if (($maxloglvl >= 5)); then
     du -c "$initdir" | sort -n | ddebug
 fi
 
-# strip binaries 
+# strip binaries
 if [[ $do_strip = yes ]] ; then
-    for p in strip grep find; do 
+    for p in strip grep find; do
         if ! type -P $p >/dev/null; then
             derror "Could not find '$p'. You should run $0 with '--nostrip'."
             do_strip=no
@@ -561,11 +794,23 @@ type hardlink &>/dev/null && {
     hardlink "$initdir" 2>&1
 }
 
-if ! ( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet | \
-    $compress > "$outfile"; ); then 
+if strstr "$modules_loaded" " fips " && command -v prelink >/dev/null; then
+    for dir in "$initdir/bin" \
+       "$initdir/sbin" \
+       "$initdir/usr/bin" \
+       "$initdir/usr/sbin"; do
+        [[ -L "$dir" ]] && continue
+        for i in "$dir"/*; do
+            [[ -x $i ]] && prelink -u $i &>/dev/null
+        done
+    done
+fi
+
+if ! ( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet| \
+    $compress > "$outfile"; ); then
     dfatal "dracut: creation of $outfile failed"
     exit 1
-fi 
+fi
 
 dinfo "Wrote $outfile:"
 dinfo "$(ls -l "$outfile")"

dracut.spec

@@ -1,3 +1,5 @@
+%define dracutlibdir %{_prefix}/lib/dracut
+
 # Variables must be defined
 %define with_nbd                1
 
@@ -6,41 +8,34 @@
 %define with_nbd 0
 %endif
 
-%if %{defined gittag}
-%define rdist .git%{gittag}%{?dist}
-%define dashgittag -%{gittag}
-%else
-%define rdist %{?dist}
-%endif
-
 Name: dracut
-Version: 010
-%define release_prefix 0%{?rdist}
-Release: %{release_prefix}
+Version: xxx
+Release: xxx
 
 Summary: Initramfs generator using udev
-%if 0%{?fedora}
-Group: System Environment/Base          
+%if 0%{?fedora} || 0%{?rhel}
+Group: System Environment/Base
 %endif
 %if 0%{?suse_version}
 Group: System/Base
 %endif
-License: GPLv2+ 
+License: GPLv2+
 URL: https://dracut.wiki.kernel.org/
-# Source can be generated by 
-# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{?dashgittag};sf=tgz
-Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}%{?dashgittag}.tar.bz2
+# Source can be generated by
+# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
+Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
 
 BuildArch: noarch
+BuildRequires: dash bash git
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %endif
 %if 0%{?suse_version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 %endif
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
 BuildRequires: docbook-style-xsl docbook-dtds libxslt
 %endif
 
@@ -48,7 +43,7 @@ BuildRequires: docbook-style-xsl docbook-dtds libxslt
 BuildRequires: docbook-xsl-stylesheets libxslt
 %endif
 
-%if 0%{?fedora} > 12 || 0%{?rhel} >= 6
+%if 0%{?fedora} > 12 || 0%{?rhel}
 # no "provides", because dracut does not offer
 # all functionality of the obsoleted packages
 Obsoletes: mkinitrd <= 6.0.93
@@ -57,6 +52,10 @@ Obsoletes: nash <= 6.0.93
 Obsoletes: libbdevid-python <= 6.0.93
 %endif
 
+%if 0%{?fedora} > 16 || 0%{?rhel} > 6
+BuildRequires: systemd-units
+%endif
+
 %if 0%{?suse_version} > 9999
 Obsoletes: mkinitrd < 2.6.1
 Provides: mkinitrd = 2.6.1
@@ -69,57 +68,34 @@ Requires: bash
 Requires: bzip2
 Requires: coreutils
 Requires: cpio
-Requires: dash
 Requires: filesystem >= 2.1.0
 Requires: findutils
 Requires: grep
 Requires: gzip
-Requires: kbd
-Requires: mktemp >= 1.5-5
 Requires: module-init-tools >= 3.7-9
 Requires: sed
-Requires: tar
 Requires: udev
-
-%if 0%{?fedora}
-Requires: util-linux >= 2.16
-Requires: initscripts >= 8.63-1
-Requires: plymouth >= 0.8.0-0.2009.29.09.19.1
+%if 0%{?fedora} || 0%{?rhel} > 6
+Requires: util-linux >= 2.20
+%else
+Requires: util-linux-ng >= 2.17.2
 %endif
 
-%if 0%{?suse_version}
-Requires: util-linux >= 2.16
+%if 0%{?fedora} || 0%{?rhel} > 6
+Conflicts: initscripts < 8.63-1
+Conflicts: plymouth < 0.8.0-0.2009.29.09.19.1
 %endif
 
-
 %description
-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 
+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 
-%if %{with_nbd}
-Requires: nbd
-%endif
-Requires: iproute
-Requires: bridge-utils
-
-%if 0%{?fedora}
-Requires: iscsi-initiator-utils
-Requires: nfs-utils 
-Requires: dhclient
-%endif
-
-%if 0%{?suse_version}
-Requires: dhcp-client
-Requires: nfs-client
-Requires: vlan
-%endif
 Obsoletes: dracut-generic < 008
 Provides:  dracut-generic = %{version}-%{release}
 
@@ -127,7 +103,7 @@ Provides:  dracut-generic = %{version}-%{release}
 This package requires everything which is needed to build a generic
 all purpose initramfs with network support with dracut.
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 6
 %package fips
 Summary: Dracut modules to build a dracut initramfs with an integrity check
 Requires: %{name} = %{version}-%{release}
@@ -145,6 +121,15 @@ This package requires everything which is needed to build an
 all purpose initramfs with dracut, which does an integrity check.
 %endif
 
+%package fips-aesni
+Summary: Dracut modules to build a dracut initramfs with an integrity check with aesni-intel
+Requires: %{name}-fips = %{version}-%{release}
+
+%description fips-aesni
+This package requires everything which is needed to build an
+all purpose initramfs with dracut, which does an integrity check
+and adds the aesni-intel kernel module.
+
 %package caps
 Summary: Dracut modules to build a dracut initramfs which drops capabilities
 Requires: %{name} = %{version}-%{release}
@@ -162,26 +147,43 @@ Requires: %{name} = %{version}-%{release}
 This package contains tools to assemble the local initrd and host configuration.
 
 %prep
-%setup -q -n %{name}-%{version}%{?dashgittag}
+%setup -q -n %{name}-%{version}
+
+%if %{defined PATCH1}
+git init
+git config user.email "dracut-maint@redhat.com"
+git config user.name "Fedora dracut team"
+git add .
+git commit -a -q -m "%{version} baseline."
+
+# Apply all the patches.
+git am -p1 %{patches}
+%endif
 
 %build
-make WITH_SWITCH_ROOT=0%{?with_switch_root}
+make
 
 %install
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
 rm -rf $RPM_BUILD_ROOT
 %endif
-make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
-     sysconfdir=/etc mandir=%{_mandir} WITH_SWITCH_ROOT=0%{?with_switch_root}
+make install DESTDIR=$RPM_BUILD_ROOT \
+     libdir=%{_prefix}/lib \
+     bindir=%{_bindir} \
+%if %{defined _unitdir}
+     systemdsystemunitdir=%{_unitdir} \
+%endif
+     sysconfdir=/etc mandir=%{_mandir}
 
-echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
+echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/10rpmversion/dracut-version
 
-%if 0%{?fedora} == 0
-rm -fr $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/01fips
+%if 0%{?fedora} == 0 && 0%{?rhel} == 0
+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
 %endif
 
 # remove gentoo specific modules
-rm -fr $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/50gensplash
+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
 
 mkdir -p $RPM_BUILD_ROOT/boot/dracut
 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
@@ -189,7 +191,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
 touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
 mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
 install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf
 install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/40-fips.conf
 %endif
@@ -199,12 +201,16 @@ install -m 0644 dracut.conf.d/suse.conf.example   $RPM_BUILD_ROOT/etc/dracut.con
 %endif
 
 %if 0%{?fedora} <= 12 && 0%{?rhel} < 6 && 0%{?suse_version} <= 9999
-rm $RPM_BUILD_ROOT/sbin/mkinitrd
-rm $RPM_BUILD_ROOT/sbin/lsinitrd
+rm $RPM_BUILD_ROOT%{_bindir}/mkinitrd
+rm $RPM_BUILD_ROOT%{_bindir}/lsinitrd
 %endif
 
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d/dracut
-install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
+
+# create compat symlink
+mkdir -p $RPM_BUILD_ROOT/sbin
+ln -s /usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -212,88 +218,109 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,0755)
 %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
+%{_bindir}/dracut
+# compat symlink
 /sbin/dracut
-%if 0%{?with_switch_root}
-/sbin/switch_root
-%endif
 %if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
-/sbin/mkinitrd
-/sbin/lsinitrd
+%{_bindir}/mkinitrd
+%{_bindir}/lsinitrd
 %endif
-%dir %{_datadir}/dracut
-%dir %{_datadir}/dracut/modules.d
-%{_datadir}/dracut/dracut-functions
-%{_datadir}/dracut/dracut-logger
+%dir %{dracutlibdir}
+%dir %{dracutlibdir}/modules.d
+%{dracutlibdir}/dracut-functions.sh
+%{dracutlibdir}/dracut-functions
+%{dracutlibdir}/dracut-logger.sh
+%{dracutlibdir}/dracut-initramfs-restore
 %config(noreplace) /etc/dracut.conf
-%if 0%{?fedora} || 0%{?suse_version}
-%config(noreplace) /etc/dracut.conf.d/01-dist.conf
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+%config /etc/dracut.conf.d/01-dist.conf
 %endif
 %dir /etc/dracut.conf.d
-%config(noreplace) /etc/logrotate.d/dracut
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man7/dracut.kernel.7*
+%{_mandir}/man7/dracut.cmdline.7*
 %{_mandir}/man5/dracut.conf.5*
-%{_datadir}/dracut/modules.d/00bootchart
-%{_datadir}/dracut/modules.d/00dash
-%{_datadir}/dracut/modules.d/05busybox
-%{_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
-%{_datadir}/dracut/modules.d/90dmsquash-live
-%{_datadir}/dracut/modules.d/90kernel-modules
-%{_datadir}/dracut/modules.d/90lvm
-%{_datadir}/dracut/modules.d/90mdraid
-%{_datadir}/dracut/modules.d/90multipath
-%{_datadir}/dracut/modules.d/95debug
-%{_datadir}/dracut/modules.d/95resume
-%{_datadir}/dracut/modules.d/95rootfs-block
-%{_datadir}/dracut/modules.d/95dasd
-%{_datadir}/dracut/modules.d/95dasd_mod
-%{_datadir}/dracut/modules.d/95fstab-sys
-%{_datadir}/dracut/modules.d/95zfcp
-%{_datadir}/dracut/modules.d/95terminfo
-%{_datadir}/dracut/modules.d/95udev-rules
-%{_datadir}/dracut/modules.d/97biosdevname
-%{_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
+%{dracutlibdir}/modules.d/00bootchart
+%{dracutlibdir}/modules.d/00dash
+%{dracutlibdir}/modules.d/05busybox
+%{dracutlibdir}/modules.d/10i18n
+%{dracutlibdir}/modules.d/10rpmversion
+%{dracutlibdir}/modules.d/30convertfs
+%{dracutlibdir}/modules.d/45url-lib
+%{dracutlibdir}/modules.d/50plymouth
+%{dracutlibdir}/modules.d/90btrfs
+%{dracutlibdir}/modules.d/90crypt
+%{dracutlibdir}/modules.d/90dm
+%{dracutlibdir}/modules.d/90dmraid
+%{dracutlibdir}/modules.d/90dmsquash-live
+%{dracutlibdir}/modules.d/90kernel-modules
+%{dracutlibdir}/modules.d/90lvm
+%{dracutlibdir}/modules.d/90mdraid
+%{dracutlibdir}/modules.d/90multipath
+%{dracutlibdir}/modules.d/91crypt-gpg
+%{dracutlibdir}/modules.d/95debug
+%{dracutlibdir}/modules.d/95resume
+%{dracutlibdir}/modules.d/95rootfs-block
+%{dracutlibdir}/modules.d/95dasd
+%{dracutlibdir}/modules.d/95dasd_mod
+%{dracutlibdir}/modules.d/95fstab-sys
+%{dracutlibdir}/modules.d/95zfcp
+%{dracutlibdir}/modules.d/95terminfo
+%{dracutlibdir}/modules.d/95udev-rules
+%{dracutlibdir}/modules.d/96securityfs
+%{dracutlibdir}/modules.d/97biosdevname
+%{dracutlibdir}/modules.d/97masterkey
+%{dracutlibdir}/modules.d/98ecryptfs
+%{dracutlibdir}/modules.d/98integrity
+%{dracutlibdir}/modules.d/98selinux
+%{dracutlibdir}/modules.d/98syslog
+%{dracutlibdir}/modules.d/98usrmount
+%{dracutlibdir}/modules.d/99base
+%{dracutlibdir}/modules.d/99fs-lib
+%{dracutlibdir}/modules.d/99img-lib
+%{dracutlibdir}/modules.d/99shutdown
+%config(noreplace) /etc/logrotate.d/dracut_log
 %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
 %dir %{_sharedstatedir}/initramfs
+%if %{defined _unitdir}
+%{_unitdir}/*.service
+%{_unitdir}/*/*.service
+%endif
 
 %files network
 %defattr(-,root,root,0755)
-%{_datadir}/dracut/modules.d/40network
-%{_datadir}/dracut/modules.d/95fcoe
-%{_datadir}/dracut/modules.d/95iscsi
-%{_datadir}/dracut/modules.d/95nbd
-%{_datadir}/dracut/modules.d/95nfs
-%{_datadir}/dracut/modules.d/45ifcfg
-%{_datadir}/dracut/modules.d/95znet
+%{dracutlibdir}/modules.d/40network
+%{dracutlibdir}/modules.d/95fcoe
+%{dracutlibdir}/modules.d/95iscsi
+%{dracutlibdir}/modules.d/90livenet
+%{dracutlibdir}/modules.d/95nbd
+%{dracutlibdir}/modules.d/95nfs
+%{dracutlibdir}/modules.d/95ssh-client
+%{dracutlibdir}/modules.d/45ifcfg
+%{dracutlibdir}/modules.d/95znet
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
 %files fips
 %defattr(-,root,root,0755)
-%{_datadir}/dracut/modules.d/01fips
+%{dracutlibdir}/modules.d/01fips
 %config(noreplace) /etc/dracut.conf.d/40-fips.conf
 %endif
 
+%files fips-aesni
+%defattr(-,root,root,0755)
+%doc COPYING
+%{dracutlibdir}/modules.d/02fips-aesni
+
 %files caps
 %defattr(-,root,root,0755)
-%{_datadir}/dracut/modules.d/02caps
+%{dracutlibdir}/modules.d/02caps
 
-%files tools 
+%files tools
 %defattr(-,root,root,0755)
 %{_mandir}/man8/dracut-gencmdline.8*
 %{_mandir}/man8/dracut-catimages.8*
-/sbin/dracut-gencmdline
-/sbin/dracut-catimages
+%{_bindir}/dracut-gencmdline
+%{_bindir}/dracut-catimages
 %dir /boot/dracut
 %dir /var/lib/dracut
 %dir /var/lib/dracut/overlay

dracut.xml

@@ -74,7 +74,7 @@
           <para>A <acronym>TFTP</acronym> server (on systems that can boot from Ethernet) </para>
         </listitem>
       </itemizedlist>
-      <para>The bootloader will load the kernel and initial root file system image into memory and then start the kernel, passing in the memory address of the image. 
+      <para>The bootloader will load the kernel and initial root file system image into memory and then start the kernel, passing in the memory address of the image.
     </para>
       <para>Depending on which algorithms were compiled statically into it, the kernel can currently unpack initrd/initramfs images compressed with gzip, bzip2 and <acronym>LZMA</acronym>. </para>
     </section>
@@ -170,7 +170,7 @@ include ld.so.conf.d/*.conf</screen>
         <para>To see a list of available dracut modules, use the <option>--list-modules</option> option:</para>
         <screen># dracut --list-modules</screen>
         <para>or, if you have a dracut version earlier than <literal>008</literal>, issue the command:</para>
-        <screen># for mod in /usr/share/dracut/modules.d/*; do echo ${mod##*/??}; done</screen>
+        <screen># for mod in /usr/lib/dracut/modules.d/*; do echo ${mod##*/??}; done</screen>
       </section>
       <section>
         <title>Omitting dracut Modules</title>
@@ -301,7 +301,7 @@ rd.live.overlay/
 </para>
           </listitem>
           <listitem>
-            <para>Add &apos;&apos;rd.shell rd.debug&apos;&apos; to the kernel command line so that dracut shell commands are printed as they are executed
+            <para>Add &apos;&apos;rd.shell rd.debug log_buf_len=1M&apos;&apos; to the kernel command line so that dracut shell commands are printed as they are executed
 </para>
           </listitem>
           <listitem>
@@ -431,7 +431,7 @@ title Fedora (2.6.29.5-191.fc11.x86_64)
                 <para>Remove the boot arguments &apos;&apos;rhgb&apos;&apos; and &apos;&apos;quiet&apos;&apos;
 </para>
                 <para>
-A sample <filename>/etc/grub.conf</filename> bootloader configuration file is listed below. 
+A sample <filename>/etc/grub.conf</filename> bootloader configuration file is listed below.
 </para>
                 <para><screen>default=0
 timeout=5
@@ -439,12 +439,12 @@ serial --unit=0 --speed=9600
 terminal --timeout=5 serial console
 title Fedora (2.6.29.5-191.fc11.x86_64)
   root (hd0,0)
-  kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 rd.shell 
+  kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 rd.shell
   initrd /dracut-2.6.29.5-191.fc11.x86_64.img</screen></para>
               </listitem>
               <listitem>
                 <para>If system boot fails, you will be dropped into a shell as seen in the example below.
-<screen>No root device found 
+<screen>No root device found
 Dropping to debug shell.
 
 sh: can&apos;t access tty; job control turned off
@@ -534,7 +534,7 @@ Key slot 0 unlocked. </screen></para>
     <title>Developer Manual</title>
     <section>
       <title>dracut Components</title>
-      <para>dracut uses a modular system to build and extend the initramfs image. All modules are located in <filename>/usr/share/dracut/modules.d</filename> or in <filename><replaceable>&lt;git-src&gt;</replaceable>/modules.d</filename>. The most basic dracut module is <filename>99base</filename>. In <filename>99base</filename> the initial shell script <command>init</command> is defined, which gets run by the kernel after initramfs loading. Although you can replace <command>init</command> with your own version of <filename>99base</filename>, this is not encouraged. Instead you should use, if possible, the hooks of dracut. All hooks, and the point of time in which they are executed, are described in <xref linkend="stages"/>.</para>
+      <para>dracut uses a modular system to build and extend the initramfs image. All modules are located in <filename>/usr/lib/dracut/modules.d</filename> or in <filename><replaceable>&lt;git-src&gt;</replaceable>/modules.d</filename>. The most basic dracut module is <filename>99base</filename>. In <filename>99base</filename> the initial shell script <command>init</command> is defined, which gets run by the kernel after initramfs loading. Although you can replace <command>init</command> with your own version of <filename>99base</filename>, this is not encouraged. Instead you should use, if possible, the hooks of dracut. All hooks, and the point of time in which they are executed, are described in <xref linkend="stages"/>.</para>
       <para>The main script, which creates the initramfs is <command>dracut</command> itsself. It parses all arguments and sets up the directory, in which everything is installed. It then executes all <command>check</command>, <command>install</command>, <command>installkernel</command> scripts found in the modules, which are to be processed. After everything is installed, the install directory is archived and compressed to the final initramfs image. All helper functions used by <command>check</command>, <command>install</command> and <command>installkernel</command> are found in in the file <filename>dracut-functions</filename>. These shell functions are available to all module installer (<command>install</command>, <command>installkernel</command>) scripts, without the need to source <filename>dracut-functions</filename>.</para>
       <para>A module can check the preconditions for <command>install</command> and <command>installkernel</command> with the <command>check</command> script. Also dependencies can be expressed with <command>check</command>. If a module passed <command>check</command>, <command>install</command> and <command>installkernel</command> will be called to install all of the necessary files for the module. To split between kernel and non-kernel parts of the installation, all kernel module related parts have to be in <command>installkernel</command>. All other files found in a module directory are module specific and mostly are hook scripts and udev rules.</para>
     </section>
@@ -572,7 +572,7 @@ Common used functions are in <filename>dracut-lib.sh</filename>, which can be so
       </section>
       <section>
         <title>Main Loop</title>
-        <para>Now the main loop of <command>99base/init</command> begins. Here we loop until <command>udev</command> has settled and all scripts in <filename>initqueue-finished</filename> returned true. In this loop there are three hooks, where scripts can be inserted by calling <command>/sbin/initqueue</command>.
+        <para>Now the main loop of <command>99base/init</command> begins. Here we loop until <command>udev</command> has settled and all scripts in <filename>initqueue/finished</filename> returned true. In this loop there are three hooks, where scripts can be inserted by calling <command>/sbin/initqueue</command>.
  </para>
         <section>
           <title>Initqueue</title>
@@ -582,6 +582,10 @@ Common used functions are in <filename>dracut-lib.sh</filename>, which can be so
           <title>Initqueue settled</title>
           <para>This hooks gets executed every time <command>udev</command> has settled.</para>
         </section>
+        <section>
+          <title>Initqueue timeout</title>
+          <para>This hooks gets executed, when the main loop counter becomes half of the rd.retry counter.</para>
+        </section>
         <section>
           <title>Initqueue finished</title>
           <para>This hook is called after <command>udev</command> has settled and if all scripts herein return <errorcode>0</errorcode> the main loop will be ended.</para>
@@ -621,9 +625,9 @@ Common used functions are in <filename>dracut-lib.sh</filename>, which can be so
       <para><function>install()</function>:</para>
       <programlisting>inst_hook cmdline 20 &quot;$moddir/parse-insmodpost.sh&quot;
 inst_simple &quot;$moddir/insmodpost.sh&quot; /sbin/insmodpost.sh</programlisting>
-      <para>The <filename>pase-instmodpost.sh</filename> parses the kernel command line for a argument <envar>rd.driver.post</envar>, blacklists the module from being autoloaded and installs the hook <filename>insmodpost.sh</filename> in the <filename>initqueue-settled</filename>.</para>
+      <para>The <filename>pase-instmodpost.sh</filename> parses the kernel command line for a argument <envar>rd.driver.post</envar>, blacklists the module from being autoloaded and installs the hook <filename>insmodpost.sh</filename> in the <filename>initqueue/settled</filename>.</para>
       <para><filename>parse-insmodpost.sh</filename>:</para>
-      <programlisting>for p in $(getargs rd.driver.post=); do 
+      <programlisting>for p in $(getargs rd.driver.post=); do
     echo &quot;blacklist $p&quot; &gt;&gt; /etc/modprobe.d/initramfsblacklist.conf
     _do_insmodpost=1
 done
@@ -631,11 +635,11 @@ done
 [ -n &quot;$_do_insmodpost&quot; ] &amp;&amp; /sbin/initqueue --settled --unique --onetime /sbin/insmodpost.sh
 unset _do_insmodpost
 </programlisting>
-      <para><filename>insmodpost.sh</filename>, which is called in the <filename>initqueue-settled</filename> hook will just modprobe the kernel modules specified in all <envar>rd.driver.post</envar> kernel command line parameters. It runs after <command>udev</command> has settled and is only called once (<parameter>--onetime</parameter>).</para>
+      <para><filename>insmodpost.sh</filename>, which is called in the <filename>initqueue/settled</filename> hook will just modprobe the kernel modules specified in all <envar>rd.driver.post</envar> kernel command line parameters. It runs after <command>udev</command> has settled and is only called once (<parameter>--onetime</parameter>).</para>
       <para><filename>insmodpost.sh</filename>:</para>
       <programlisting>. /lib/dracut-lib.sh
 
-for p in $(getargs rd.driver.post=); do 
+for p in $(getargs rd.driver.post=); do
     modprobe $p
 done
 </programlisting>
@@ -717,9 +721,9 @@ done
       <title>dracut.conf</title>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dracut.conf.5.xml" encoding="UTF-8" parse="xml"/>
     </section>
-    <section id="dracut.kernel">
-      <title>dracut.kernel</title>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dracut.kernel.7.xml" encoding="UTF-8" parse="xml"/>
+    <section id="dracut.cmdline">
+      <title>dracut.cmdline</title>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dracut.cmdline.7.xml" encoding="UTF-8" parse="xml"/>
     </section>
   </appendix>
 </book>

git2spec.pl

@@ -0,0 +1,61 @@
+#!/usr/bin/perl
+
+sub last_tag {
+    open( GIT, 'git log  --pretty=format:%H |');
+  LINE: while( <GIT> ) {
+      open( GIT2, "git tag --contains $_ |");
+      while( <GIT2> ) {
+	  chomp;
+	  last LINE if /..*/;
+      }
+      close GIT2;
+  }
+    $tag=$_;
+    close GIT2;
+    close GIT;         # be done
+    return $tag;
+};
+
+sub create_patches {
+    my $tag=shift;
+    my $pdir=shift;
+    my $num=0;
+    open( GIT, 'git format-patch -M -N --no-signature -o "'.$pdir.'" '.$tag.' |');
+    @lines=<GIT>;
+    close GIT;         # be done
+    return @lines;
+};
+
+use POSIX qw(strftime);
+my $datestr = strftime "%Y%m%d", gmtime;
+
+my $tag=shift;
+my $pdir=shift;
+$tag=&last_tag if not defined $tag;
+my @patches=&create_patches($tag, $pdir);
+my $num=$#patches + 2;
+$tag=~s/[^0-9]+?([0-9]+)/$1/;
+my $release="$num.git$datestr";
+$release="1" if $num == 1;
+
+while(<>) {
+    if (/^Version:/) {
+	print "Version: $tag\n";
+    }
+    elsif (/^Release:/) {
+	print "Release: $release%{?dist}\n";
+    }
+    elsif ((/^Source0:/) || (/^Source:/)) {
+	print $_;
+	$num=1;
+	for(@patches) {
+	    s/.*\///g;
+	    print "Patch$num: $_";
+	    $num++;
+	}
+	print "\n";
+    }
+    else {
+	print $_;
+    }
+}

lsinitrd.sh

@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 #
@@ -19,17 +19,33 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-[[ $# -le 2 ]] || { echo "Usage: $(basename $0) [<initramfs file> [<filename>]]" ; exit 1 ; }
+[[ $# -le 2 ]] || { echo "Usage: $(basename $0) [-s] [<initramfs file> [<filename>]]" ; exit 1 ; }
+
+sorted=0
+while getopts "s" opt; do
+    case $opt in
+        s)  sorted=1;;
+        \?) exit 1;;
+    esac
+done
+shift $((OPTIND-1))
+
 image="${1:-/boot/initramfs-$(uname -r).img}"
 [[ -f "$image" ]]    || { echo "$image does not exist" ; exit 1 ; }
 
 CAT=zcat
 FILE_T=$(file "$image")
 
+if echo "test"|xz|xz -dc --single-stream >/dev/null 2>&1; then
+    XZ_SINGLE_STREAM="--single-stream"
+fi
+
 if [[ "$FILE_T" =~ ": gzip compressed data" ]]; then
     CAT=zcat
 elif [[ "$FILE_T" =~ ": xz compressed data" ]]; then
-    CAT=xzcat
+    CAT="xzcat $XZ_SINGLE_STREAM"
+elif [[ "$FILE_T" =~ ": XZ compressed data" ]]; then
+    CAT="xzcat $XZ_SINGLE_STREAM"
 elif [[ "$FILE_T" =~ ": data" ]]; then
     CAT=lzcat
 fi
@@ -39,9 +55,13 @@ if [[ $# -eq 2 ]]; then
     exit $?
 fi
 
-echo "$image:"
+echo "$image: $(du -h $image | awk '{print $1}')"
 echo "========================================================================"
-$CAT "$image" | cpio --extract --verbose --quiet --to-stdout 'lib/dracut/dracut-*' 2>/dev/null 
+$CAT "$image" | cpio --extract --verbose --quiet --to-stdout 'lib/dracut/dracut-*' 2>/dev/null
 echo "========================================================================"
-$CAT "$image" | cpio --extract --verbose --quiet --list
+if [ "$sorted" -eq 1 ]; then
+    $CAT "$image" | cpio --extract --verbose --quiet --list | sort -n -k5
+else
+    $CAT "$image" | cpio --extract --verbose --quiet --list
+fi
 echo "========================================================================"

mkinitrd-dracut.sh

@@ -8,6 +8,7 @@ usage () {
 
     $cmd "usage: ${0##*/} [--version] [--help] [-v] [-f] [--preload <module>]"
     $cmd "       [--image-version] [--with=<module>]"
+    $cmd "       [--nocompress]"
     $cmd "       <initrd-image> <kernel-version>"
     $cmd ""
     $cmd "       (ex: ${0##*/} /boot/initramfs-$kver.img $kver)"
@@ -49,10 +50,10 @@ while (($# > 0)); do
             exit 0;;
         -v|--verbose) dracut_args="${dracut_args} -v";;
         -f|--force) dracut_args="${dracut_args} -f";;
-        --preload) read_args modname "$@" || shift
+        --preload) read_arg modname "$@" || shift
             basicmodules="$basicmodules $modname";;
         --image-version) img_vers=yes;;
-        --rootfs) read_args rootfs "$@" || shift
+        --rootfs) read_arg rootfs "$@" || shift
             dracut_args="${dracut_args} --filesystems $rootfs";;
         --nocompress) dracut_args="$dracut_args --no-compress";;
         --help) usage -n;;

modules.d/00bootchart/module-setup.sh

@@ -3,6 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
+    [[ "$mount_needs" ]] && return 1
     [ -x /sbin/bootchartd ] || return 1
     return 255
 }
@@ -12,16 +13,16 @@ depends() {
 }
 
 install() {
-    inst /sbin/bootchartd 
-    inst /bin/bash 
+    inst /sbin/bootchartd
+    inst /bin/bash
     inst_symlink /init /sbin/init
     inst_dir /lib/bootchart/tmpfs
-    inst /lib/bootchart/bootchart-collector 
-    inst /etc/bootchartd.conf 
-    inst /sbin/accton 
+    inst /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/grep
     inst /bin/usleep
     inst /usr/bin/[  /bin/[
 

modules.d/01fips/fips-boot.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
+    rm -f /etc/modprobe.d/fips.conf >/dev/null 2>&1
+elif getarg boot= >/dev/null; then
+    . /sbin/fips.sh
+    if mount_boot; then
+        do_fips || die "FIPS integrity test failed"
+    fi
+fi

modules.d/01fips/fips-noboot.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
+    rm -f /etc/modprobe.d/fips.conf >/dev/null 2>&1
+elif ! [ -f /tmp/fipsdone ]; then
+    . /sbin/fips.sh
+    mount_boot
+    do_fips || die "FIPS integrity test failed"
+fi

modules.d/01fips/fips.sh

@@ -1,12 +1,13 @@
 #!/bin/sh
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-do_fips()
+
+mount_boot()
 {
-    FIPSMODULES=$(cat /etc/fipsmodules)
     boot=$(getarg boot=)
-    KERNEL=$(uname -r)
-    case "$boot" in
+
+    if [ -n "$boot" ]; then
+        case "$boot" in
         LABEL=*)
             boot="$(echo $boot | sed 's,/,\\x2f,g')"
             boot="/dev/disk/by-label/${boot#LABEL=}"
@@ -18,36 +19,51 @@ do_fips()
             ;;
         *)
             die "You have to specify boot=<boot device> as a boot option for fips=1" ;;
-    esac
+        esac
 
-    if ! [ -e "$boot" ]; then
-        udevadm trigger --action=add >/dev/null 2>&1
-        [ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
-
-        if [ $UDEVVERSION -ge 143 ]; then
-            udevadm settle --exit-if-exists=$boot
-        else
-            udevadm settle --timeout=30
+        if ! [ -e "$boot" ]; then
+            udevadm trigger --action=add >/dev/null 2>&1
+            [ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
+            i=0
+            while ! [ -e $boot ]; do
+                if [ $UDEVVERSION -ge 143 ]; then
+                    udevadm settle --exit-if-exists=$boot
+                else
+                    udevadm settle --timeout=30
+                fi
+                [ -e $boot ] && break
+                modprobe scsi_wait_scan && rmmod scsi_wait_scan
+                [ -e $boot ] && break
+                sleep 0.5
+                i=$(($i+1))
+                [ $i -gt 40 ] && break
+            done
         fi
+
+        [ -e "$boot" ] || return 1
+
+        mkdir /boot
+        info "Mounting $boot as /boot"
+        mount -oro "$boot" /boot || return 1
     fi
+}
 
-    [ -e "$boot" ]
-
-    mkdir /boot
-    info "Mounting $boot as /boot"
-    mount -oro "$boot" /boot
-
+do_fips()
+{
     info "Checking integrity of kernel"
+    newroot=$NEWROOT
+    KERNEL=$(uname -r)
 
-    if ! [ -e "/boot/.vmlinuz-${KERNEL}.hmac" ]; then
-        warn "/boot/.vmlinuz-${KERNEL}.hmac does not exist"
+    [ -e "$newroot/boot/.vmlinuz-${KERNEL}.hmac" ] || unset newroot
+
+    if ! [ -e "$newroot/boot/.vmlinuz-${KERNEL}.hmac" ]; then
+        warn "$newroot/boot/.vmlinuz-${KERNEL}.hmac does not exist"
         return 1
     fi
 
-    sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1
+    sha512hmac -c "$newroot/boot/.vmlinuz-${KERNEL}.hmac" || return 1
 
-    info "Umounting /boot"
-    umount /boot
+    FIPSMODULES=$(cat /etc/fipsmodules)
 
     info "Loading and integrity checking all crypto modules"
     for module in $FIPSMODULES; do
@@ -58,15 +74,11 @@ do_fips()
     info "Self testing crypto algorithms"
     modprobe tcrypt || return 1
     rmmod tcrypt
-    info "All initrd crypto checks done"  
+    info "All initrd crypto checks done"
+
+    > /tmp/fipsdone
+
+    umount /boot >/dev/null 2>&1
 
     return 0
 }
-
-if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
-    rm -f /etc/modprobe.d/fips.conf >/dev/null 2>&1
-else
-    set -e
-    do_fips || die "FIPS integrity test failed"
-    set +e
-fi

modules.d/01fips/module-setup.sh

@@ -11,31 +11,39 @@ depends() {
 }
 
 installkernel() {
-    FIPSMODULES="aead aes_generici aes-xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr"
-    FIPSMODULES="$FIPSMODULES des deflate ecb eseqiv hmac seqiv sha256 sha512"
-    FIPSMODULES="$FIPSMODULES cryptomgr crypto_null tcrypt" 
+    local _fipsmodules _mod
+    _fipsmodules="aead aes_generici aes-xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr"
+    _fipsmodules+=" des deflate ecb eseqiv hmac seqiv sha256 sha512"
+    _fipsmodules+=" cryptomgr crypto_null tcrypt dm-mod dm-crypt"
 
-    mkdir -p "${initdir}/etc/modprobe.d"
+    mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
 
-    for mod in $FIPSMODULES; do 
-        if instmods $mod; then
-            echo $mod >> "${initdir}/etc/fipsmodules"
-            echo "blacklist $mod" >> "${initdir}/etc/modprobe.d/fips.conf"
+    for _mod in $_fipsmodules; do
+        if instmods $_mod; then
+            echo $_mod >> "${initdir}/etc/fipsmodules"
+            echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
         fi
     done
 }
 
 install() {
-    inst_hook pre-trigger 01 "$moddir/fips.sh"
+    local _dir
+    inst_hook pre-trigger 01 "$moddir/fips-boot.sh"
+    inst_hook pre-pivot 01 "$moddir/fips-noboot.sh"
+    inst "$moddir/fips.sh" /sbin/fips.sh
+
     dracut_install sha512hmac rmmod insmod mount uname umount
 
-    for dir in "$usrlibdir" "$libdir"; do
-        [[ -e $dir/libsoftokn3.so ]] && \
-            dracut_install $dir/libsoftokn3.so $dir/libsoftokn3.chk \
-            $dir/libfreebl3.so $dir/libfreebl3.chk && \
+    for _dir in "$usrlibdir" "$libdir"; do
+        [[ -e $_dir/libsoftokn3.so ]] && \
+            dracut_install $_dir/libsoftokn3.so $_dir/libsoftokn3.chk \
+            $_dir/libfreebl3.so $_dir/libfreebl3.chk && \
             break
     done
 
     dracut_install $usrlibdir/hmaccalc/sha512hmac.hmac
+    if command -v prelink >/dev/null; then
+        dracut_install prelink
+    fi
 }
 

modules.d/02caps/README

@@ -2,7 +2,7 @@ This adds the following parameters:
 rd.caps=1
         turn the caps module on/off
 rd.caps.initdrop=cap_sys_module,cap_sys_rawio
-        drop the specified comma seperated capabilities
+        drop the specified comma separated capabilities
 rd.caps.disablemodules=1
         turn off module loading
 rd.caps.disablekexec=1

modules.d/02caps/caps.sh

@@ -12,7 +12,7 @@ if [ "$capsmode" = "1" ]; then
 
     info "Loading CAPS_MODULES $CAPS_MODULES"
     for i in $CAPS_MODULES;do modprobe $i 2>&1 >/dev/null | vinfo; done
-    
+
     if [ "$CAPS_MODULES_DISABLED" = "1" -a -e /proc/sys/kernel/modules_disabled ]; then
         info "Disabling module loading."
         echo $CAPS_MODULES_DISABLED > /proc/sys/kernel/modules_disabled
@@ -29,7 +29,7 @@ if [ "$capsmode" = "1" ]; then
         echo $CAPS_USERMODEHELPER_BSET > /proc/sys/kernel/usermodehelper/bset
         echo $CAPS_USERMODEHELPER_BSET > /proc/sys/kernel/usermodehelper/inheritable
     fi
-    
+
     echo "CAPS_INIT_DROP=\"$CAPS_INIT_DROP\"" > /etc/capsdrop
     info "Will drop capabilities $CAPS_INIT_DROP from init."
 fi

modules.d/02fips-aesni/module-setup.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    return 255
+}
+
+depends() {
+    return 0
+}
+
+installkernel() {
+    local _fipsmodules _mod
+    _fipsmodules="aesni-intel"
+
+    mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
+
+    for _mod in $_fipsmodules; do
+        if instmods $_mod; then
+            echo $_mod >> "${initdir}/etc/fipsmodules"
+            echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
+        fi
+    done
+}
+
+install() {
+    return 0
+}
+

modules.d/05busybox/module-setup.sh

@@ -13,19 +13,24 @@ depends() {
 }
 
 install() {
-    inst busybox /sbin/busybox
-
-    # List of shell programs that we use in other official dracut modules, that
-    # must be supported by the busybox installed on the host system
-    progs="echo grep usleep [ rmmod insmod mount uname umount setfont kbd_mode stty gzip bzip2 chvt readlink blkid dd losetup tr sed seq ps more cat rm free ping netstat vi ping6 fsck ip hostname basename mknod mkdir pidof sleep chroot ls cp mv dmesg mkfifo less ln modprobe"
+    local _i _progs _path
+    inst busybox /usr/bin/busybox
+    for _i in `/sbin/busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}'`
+    do
+        _progs="$_progs $_i"
+    done
 
     # FIXME: switch_root should be in the above list, but busybox version hangs
     # (using busybox-1.15.1-7.fc14.i686 at the time of writing)
 
-    for i in $progs; do
-	path=$(find_binary "$i")
-	ln -s /sbin/busybox "$initdir/$path"
+    for _i in $_progs; do
+        _path=$(find_binary "$_i")
+        [ -z "$_path" ] && continue
+        if [[ $_path != ${_path#/usr} ]]; then
+            ln -sf ../../usr/bin/busybox "$initdir/$_path"
+        else
+            ln -sf ../usr/bin/busybox "$initdir/$_path"
+        fi
     done
-
 }
 

modules.d/10i18n/README

@@ -23,7 +23,7 @@ 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. 
+with us, so we can include it in source package.
 
 
 1. Hostonly vs Generic
@@ -47,6 +47,8 @@ The following variables are used by i18n install script and at initramfs
 runtime:
 
     KEYMAP - keyboard translation table loaded by loadkeys
+    KEYTABLE - base name for keyboard translation table; if UNICODE is
+    true, Unicode version will be loaded. Overrides KEYMAP.
     EXT_KEYMAPS - list of extra keymaps to bo loaded (sep. by space)
     UNICODE - boolean, indicating UTF-8 mode
     FONT - console font

modules.d/10i18n/console_init.sh

@@ -22,6 +22,7 @@ set_terminal() {
         stty -F ${dev} iutf8
     else
         printf '\033%%@' >&7
+        stty -F ${dev} -iutf8
     fi
 }
 
@@ -61,7 +62,6 @@ dev_open() {
         exec 7>>${dev}
 }
 
-
 dev=/dev/${1#/dev/}
 devname=${dev#/dev/}
 
@@ -70,8 +70,6 @@ devname=${dev#/dev/}
     exit 1
 }
 
-[ -e /tmp/console_init.${devname} ] && exit 0
-
 dev_open ${dev}
 
 for fd in 6 7; do
@@ -88,4 +86,4 @@ set_font ${dev}
 set_keymap
 
 dev_close
->/tmp/console_init.${devname}
+

modules.d/10i18n/module-setup.sh

@@ -3,6 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
+    [[ "$mount_needs" ]] && return 1
     return 0
 }
 
@@ -11,6 +12,7 @@ depends() {
 }
 
 install() {
+    [ -x /lib/systemd/systemd-vconsole-setup ] && dracut_install /lib/systemd/systemd-vconsole-setup
     KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
     DEFAULT_FONT=LatArCyrHeb-16
     I18N_CONF="/etc/locale.conf"
@@ -82,7 +84,7 @@ install() {
     install_base() {
         dracut_install setfont loadkeys kbd_mode stty
 
-        inst ${moddir}/console_init /lib/udev/console_init
+        inst ${moddir}/console_init.sh /lib/udev/console_init
         inst_rules ${moddir}/10-console.rules
         inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
     }
@@ -92,7 +94,7 @@ install() {
 
         for f in $(eval find ${kbddir}/{${KBDSUBDIRS}} -type f -print)
         do
-            inst $f
+            inst_simple $f
         done
 
         # remove unnecessary files
@@ -109,8 +111,38 @@ install() {
         [ -f $I18N_CONF ] && . $I18N_CONF
         [ -f $VCONFIG_CONF ] && . $VCONFIG_CONF
 
+        shopt -q -s nocasematch
+        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
+        shopt -q -u nocasematch
+
         # Gentoo user may have KEYMAP set to something like "-u pl2",
         KEYMAP=${KEYMAP#-* }
+
+        # KEYTABLE is a bit special - it defines base keymap name and UNICODE
+        # determines whether non-UNICODE or UNICODE version is used
+
+        if [[ ${KEYTABLE} ]]; then
+           if [[ ${UNICODE} == 1 ]]; then
+               [[ ${KEYTABLE} =~ .*\.uni.* ]] || KEYTABLE=${KEYTABLE%.map*}.uni
+           fi
+           KEYMAP=${KEYTABLE}
+        fi
+
         # 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}
@@ -140,30 +172,13 @@ install() {
         if [[ ${FONT_MAP} ]]
         then
             FONT_MAP=${FONT_MAP%.trans}
-            inst ${kbddir}/consoletrans/${FONT_MAP}.trans
+            inst_simple ${kbddir}/consoletrans/${FONT_MAP}.trans
         fi
 
         if [[ ${FONT_UNIMAP} ]]
         then
             FONT_UNIMAP=${FONT_UNIMAP%.uni}
-            inst ${kbddir}/unimaps/${FONT_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
+            inst_simple ${kbddir}/unimaps/${FONT_UNIMAP}.uni
         fi
 
         mksubdirs ${initdir}${I18N_CONF}
@@ -177,12 +192,12 @@ install() {
         for kbddir in ${kbddir} /usr/lib/kbd /lib/kbd /usr/share /usr/share/kbd
         do
             [[ -d "${kbddir}" ]] && \
-                for dir in ${KBDSUBDIRS//,/ } 
+                for dir in ${KBDSUBDIRS//,/ }
             do
                 [[ -d "${kbddir}/${dir}" ]] && continue
                 false
             done && break
-            kbddir='' 
+            kbddir=''
         done
 
         [[ ${kbddir} ]] || {

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

@@ -20,9 +20,9 @@ inst_key_val() {
 }
 
 inst_key_val '' /etc/vconsole.conf KEYMAP      vconsole.keymap      KEYTABLE
-inst_key_val '' /etc/vconsole.conf FONT        vconsole.font        SYSFONT 
-inst_key_val '' /etc/vconsole.conf FONT_MAP    vconsole.font.map    CONTRANS 
-inst_key_val '' /etc/vconsole.conf FONT_UNIMAP vconsole.font.unimap UNIMAP 
+inst_key_val '' /etc/vconsole.conf FONT        vconsole.font        SYSFONT
+inst_key_val '' /etc/vconsole.conf FONT_MAP    vconsole.font.map    CONTRANS
+inst_key_val '' /etc/vconsole.conf FONT_UNIMAP vconsole.font.unimap UNIMAP
 inst_key_val 1  /etc/vconsole.conf UNICODE     vconsole.unicode vconsole.font.unicode
 inst_key_val '' /etc/vconsole.conf EXT_KEYMAP  vconsole.keymap.ext
 
@@ -35,3 +35,10 @@ if [ -f /etc/locale.conf ]; then
     export LC_ALL
 fi
 
+# FIXME: fix systemd-vconsole-setup
+#if [ -x /lib/systemd/systemd-vconsole-setup ]; then
+#    /lib/systemd/systemd-vconsole-setup
+#    rm -f /{etc,lib}/udev/rules.d/10-console.rules
+#    rm -f /lib/udev/console_init
+#    ln -s /lib/systemd/systemd-vconsole-setup /lib/udev/console_init
+#fi

modules.d/10rpmversion/module-setup.sh

@@ -3,6 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
+    [[ "$mount_needs" ]] && return 1
     [ -f /etc/redhat-release ]
 }
 
@@ -11,14 +12,16 @@ depends() {
 }
 
 install() {
+    local _line
+    local _dracut_rpm_version
     if [ -e "$moddir/dracut-version" ]; then
-        dracut_rpm_version=$(cat "$moddir/dracut-version")
-        inst "$moddir/dracut-version" /lib/dracut/$dracut_rpm_version
+        _dracut_rpm_version=$(cat "$moddir/dracut-version")
+        inst "$moddir/dracut-version" /lib/dracut/$_dracut_rpm_version
     else
         if rpm -qf $(type -P $0) &>/dev/null; then
-            dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(type -P $0) | { ver="";while read line;do ver=$line;done;echo $ver;} )
-            mkdir -m 0755 -p $initdir/lib $initdir/lib/dracut
-            echo $dracut_rpm_version > $initdir/lib/dracut/$dracut_rpm_version
+            _dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(type -P $0) | { ver="";while read _line;do ver=$_line;done;echo $ver;} )
+            mkdir -m 0755 -p $initdir/lib/dracut
+            echo $_dracut_rpm_version > $initdir/lib/dracut/$_dracut_rpm_version
         fi
     fi
     inst_hook cmdline 01 "$moddir/version.sh"

modules.d/30convertfs/convertfs.sh

@@ -0,0 +1,181 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+ROOT="$1"
+
+if [[ ! -d "$ROOT" ]]; then
+    echo "Usage: $0 <rootdir>"
+    exit 1
+fi
+
+if [[ "$ROOT" -ef / ]]; then
+    echo "Can't convert the running system."
+    echo "Please boot with 'rd.convertfs' on the kernel command line,"
+    echo "to update with the help of the initramfs,"
+    echo "or run this script from a rescue system."
+    exit 1
+fi
+
+while [[ "$ROOT" != "${ROOT%/}" ]]; do
+    ROOT=${ROOT%/}
+done
+
+if [ ! -L $ROOT/var/run ]; then
+    echo "Converting /var/run to symlink"
+    mv -f $ROOT/var/run $ROOT/var/run.runmove~
+    ln -sfn ../run $ROOT/var/run
+fi
+
+if [ ! -L $ROOT/var/lock ]; then
+    echo "Converting /var/lock to symlink"
+    mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~
+    ln -sfn ../run/lock $ROOT/var/lock
+fi
+
+needconvert() {
+    for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64"; do
+        if [[ -e "$dir" ]]; then
+            [[ -L "$dir" ]] || return 0
+        fi
+    done
+    return 1
+}
+
+if ! needconvert; then
+    echo "Your system is already converted."
+    exit 0
+fi
+
+if [ -e "$ROOT/usr/bin" ]; then
+    echo "$ROOT/usr/bin does not exist"
+    exit 1
+fi
+
+testfile="$ROOT/.usrmovecheck$$"
+rm -f "$testfile"
+> "$testfile"
+if [[ ! -e "$testfile" ]]; then
+    echo "Cannot write to $ROOT/"
+    exit 1
+fi
+rm -f "$testfile"
+
+testfile="$ROOT/usr/.usrmovecheck$$"
+rm -f "$testfile"
+> "$testfile"
+if [[ ! -e "$testfile" ]]; then
+    echo "Cannot write to $ROOT/usr/"
+    exit 1
+fi
+rm -f "$testfile"
+
+ismounted() {
+    while read a m a; do
+        [[ "$m" = "$1" ]] && return 0
+    done < /proc/mounts
+    return 1
+}
+
+# clean up after ourselves no matter how we die.
+cleanup() {
+    echo "Something failed. Move back to the original state"
+    for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" \
+	"$ROOT/usr/bin" "$ROOT/usr/sbin" "$ROOT/usr/lib" \
+        "$ROOT/usr/lib64"; do
+        [[ -d "${dir}.usrmove-new" ]] && rm -fr "${dir}.usrmove-new"
+        if [[ -d "${dir}.usrmove-old" ]]; then
+            mv "$dir" "${dir}.del~"
+            mv "${dir}.usrmove-old" "$dir"
+            rm -fr "${dir}.del~"
+        fi
+    done
+}
+
+trap 'ret=$?; [[ $ret -ne 0 ]] && cleanup;exit $ret;' EXIT
+trap 'exit 1;' SIGINT
+
+ismounted "$ROOT/usr" || CP_HARDLINK="-l"
+
+set -e
+
+# merge / and /usr in new dir in /usr
+for dir in bin sbin lib lib64; do
+    rm -rf "$ROOT/usr/${dir}.usrmove-new"
+    [[ -L "$ROOT/$dir" ]] && continue
+    [[ -d "$ROOT/$dir" ]] || continue
+    echo "Make a copy of \`$ROOT/usr/$dir'."
+    [[ -d "$ROOT/usr/$dir" ]] \
+        && cp -ax $CP_HARDLINK "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
+    echo "Merge the copy with \`$ROOT/$dir'."
+    [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \
+        || mkdir -p "$ROOT/usr/${dir}.usrmove-new"
+    cp -axT $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new"
+    echo "Clean up duplicates in \`$ROOT/usr/$dir'."
+    # delete all symlinks that have been backed up
+    find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || :
+    # replace symlink with backed up binary
+    find "$ROOT/usr/${dir}.usrmove-new" \
+        -name '*.usrmove~' \
+        -type f \
+        -exec bash -c 'p="{}";o=${p%%%%.usrmove~};
+                       [[ -L "$o" ]] && mv -f "$p" "$o"' ';' || :
+done
+# switch over merged dirs in /usr
+for dir in bin sbin lib lib64; do
+    [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
+    echo "Switch to new \`$ROOT/usr/$dir'."
+    rm -fr "$ROOT/usr/${dir}.usrmove-old"
+    mv "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-old"
+    mv "$ROOT/usr/${dir}.usrmove-new" "$ROOT/usr/$dir"
+done
+
+# replace dirs in / with links to /usr
+for dir in bin sbin lib lib64; do
+    [[ -L "$ROOT/$dir" ]] && continue
+    [[ -d "$ROOT/$dir" ]] || continue
+    echo "Create \`$ROOT/$dir' symlink."
+    rm -rf "$ROOT/${dir}.usrmove-old" || :
+    mv "$ROOT/$dir" "$ROOT/${dir}.usrmove-old"
+    ln -sfn usr/$dir "$ROOT/$dir"
+done
+
+echo "Clean up backup files."
+# everything seems to work; cleanup
+for dir in bin sbin lib lib64; do
+     # if we get killed in the middle of "rm -rf", ensure not to leave
+     # an incomplete directory, which is moved back by cleanup()
+    [[ -d "$ROOT/usr/${dir}.usrmove-old" ]] \
+        && mv "$ROOT/usr/${dir}.usrmove-old" "$ROOT/usr/${dir}.usrmove-old~"
+    [[ -d "$ROOT/${dir}.usrmove-old" ]] \
+        && mv "$ROOT/${dir}.usrmove-old" "$ROOT/${dir}.usrmove-old~"
+done
+
+for dir in bin sbin lib lib64; do
+    [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
+        && rm -rf "$ROOT/usr/${dir}.usrmove-old~" || :
+    [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
+        && rm -rf "$ROOT/${dir}.usrmove-old~" || :
+done
+
+for dir in lib lib64; do
+    [[ -d "$ROOT/$dir" ]] || continue
+    for lib in "$ROOT"/usr/${dir}/lib*.so*.usrmove~; do
+        [[ -f $lib ]] || continue
+        mv $lib ${lib/.so/_so}
+    done
+done
+
+set +e
+
+echo "Run ldconfig."
+ldconfig -r "$ROOT"
+
+. $ROOT/etc/selinux/config
+if [ -n "$(command -v setfiles)" ] && [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts ]; then
+    echo "Fixing SELinux labels"
+    setfiles -r $ROOT -p /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts $ROOT/sbin $ROOT/bin $ROOT/lib $ROOT/lib64 $ROOT/usr/lib $ROOT/usr/lib64 $ROOT/etc/ld.so.cache $ROOT/var/cache/ldconfig || :
+fi
+
+echo "Done."
+exit 0

modules.d/30convertfs/do-convertfs.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+if getargbool 0 rd.convertfs; then
+    if getargbool 0 rd.debug; then
+        bash -x convertfs "$NEWROOT" 2>&1 | vinfo
+    else
+        convertfs "$NEWROOT" 2>&1 | vinfo
+    fi
+fi

modules.d/30convertfs/module-setup.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    [[ $mount_needs ]] && return 1
+    return 255
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    dracut_install bash
+    dracut_install find ldconfig mv rm cp ln 
+    inst_hook pre-pivot 99 "$moddir/do-convertfs.sh"
+    inst "$moddir/convertfs.sh" /usr/bin/convertfs
+}
+

modules.d/40network/dhclient-script.sh

@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
@@ -37,17 +37,19 @@ setup_interface() {
     [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
     if  [ -n "$namesrv" ] ; then
         for s in $namesrv; do
-            echo nameserver $s 
+            echo nameserver $s
         done
     fi >> /tmp/net.$netif.resolv.conf
 
-    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+    # Note: hostname can be fqdn OR short hostname, so chop off any
+    # trailing domain name and explicity add any domain if set.
+    [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
 }
 
-PATH=$PATH:/sbin:/usr/sbin
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
 
 export PS4="dhclient.$interface.$$ + "
-exec >>/run/initramfs/initlog.pipe 2>>/run/initramfs/initlog.pipe
+exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
 # We already need a set netif here
@@ -68,13 +70,19 @@ case $reason in
             warn "Duplicate address detected for $new_ip_address while doing dhcp. retrying"
             exit 1
         fi
-        setup_interface 
+        setup_interface
         set | while read line; do
             [ "${line#new_}" = "$line" ] && continue
-            echo "$line" 
+            echo "$line"
         done >/tmp/dhclient.$netif.dhcpopts
         echo online > /sys/class/net/$netif/uevent
-        /sbin/initqueue --onetime --name netroot-$netif  /sbin/netroot $netif 
+
+        if [ -e /tmp/net.$netif.manualup ]; then
+            /sbin/netroot $netif -m
+            rm -f /tmp/net.$netif.manualup
+        else
+            initqueue --onetime --name netroot-$netif netroot $netif
+        fi
         ;;
     *) echo "dhcp: $reason";;
 esac

modules.d/40network/dhclient.conf

@@ -1,3 +1,3 @@
 request subnet-mask, broadcast-address, time-offset, routers,
         domain-name, domain-name-servers, domain-search, host-name,
-        root-path, interface-mtu; 
+        root-path, interface-mtu;

modules.d/40network/ifup.sh

@@ -5,85 +5,13 @@
 # We don't need to check for ip= errors here, that is handled by the
 # cmdline parser script
 #
-PATH=$PATH:/sbin:/usr/sbin
+# without $2 means this is for real netroot case
+# or it is for manually bring up network ie. for kdump scp vmcore
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
 
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
-# 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
-    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
-        # 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 >>/run/initramfs/initlog.pipe 2>>/run/initramfs/initlog.pipe
+exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
 # Huh? No $1?
@@ -119,7 +47,91 @@ fi
 [ -f "/tmp/net.$netif.up" ] && exit 0
 [ -f "/tmp/root.info" ] || exit 0
 . /tmp/root.info
-[ -z "$netroot" ] && exit 0
+
+# disable manual ifup while netroot is set for simplifying our logic
+# in netroot case we prefer netroot to bringup $netif automaticlly
+[ -n "$2" ] && [ -z "$netroot" ] && manualup="$2"
+[ -z "$netroot" ] && [ -z "$manualup" ] && exit 0
+[ -n "$manualup" ] && >/tmp/net.$netif.manualup
+
+# Run dhclient
+do_dhcp() {
+    # dhclient-script will mark the netif up and generate the online
+    # event for nfsroot
+    # XXX add -V vendor class and option parsing per kernel
+    echo "Starting dhcp for interface $netif"
+    dhclient "$@" -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid -lf /tmp/dhclient.$netif.lease $netif \
+        || echo "dhcp failed"
+}
+
+load_ipv6() {
+    modprobe ipv6
+    i=0
+    while [ ! -d /proc/sys/net/ipv6 ]; do
+        i=$(($i+1))
+        [ $i -gt 10 ] && break
+        sleep 0.1
+    done
+}
+
+do_ipv6auto() {
+    load_ipv6
+    {
+        echo 0 > /proc/sys/net/ipv6/conf/$netif/forwarding
+        echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra
+        echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects
+        echo ip link set $netif up
+        echo wait_for_if_up $netif
+    } > /tmp/net.$netif.up
+
+    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+
+    namesrv=$(getargs nameserver)
+    if  [ -n "$namesrv" ] ; then
+        for s in $namesrv; do
+            echo nameserver $s
+        done
+    fi >> /tmp/net.$netif.resolv.conf
+
+
+    echo online > /sys/class/net/$netif/uevent
+    if [ -n "$manualup" ]; then
+        /sbin/netroot $netif -m
+    else
+        initqueue --onetime --name netroot-$netif netroot $netif
+    fi
+}
+
+# Handle static ip configuration
+do_static() {
+    strstr $ip '*:*:*' && load_ipv6
+
+    {
+        echo ip link set $netif up
+        echo wait_for_if_up $netif
+        # do not flush addr for ipv6
+        strstr $ip '*:*:*' || \
+            echo ip addr flush dev $netif
+        echo ip addr add $ip/$mask brd + dev $netif
+    } > /tmp/net.$netif.up
+
+    [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
+    [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+
+    namesrv=$(getargs nameserver)
+    if  [ -n "$namesrv" ] ; then
+        for s in $namesrv; do
+            echo nameserver $s
+        done
+    fi >> /tmp/net.$netif.resolv.conf
+
+    echo online > /sys/class/net/$netif/uevent
+    if [ -n "$manualup" ]; then
+        /sbin/netroot $netif -m
+    else
+        initqueue --onetime --name netroot-$netif netroot $netif
+    fi
+}
 
 # loopback is always handled the same way
 if [ "$netif" = "lo" ] ; then
@@ -181,7 +193,7 @@ fi
 # start bridge if necessary
 if [ "$netif" = "$bridgename" ] && [ ! -e /tmp/net.$bridgename.up ]; then
     if [ "$ethname" = "$bondname" ] ; then
-        DO_BOND_SETUP=yes /sbin/ifup $bondname
+        DO_BOND_SETUP=yes ifup $bondname
     else
         ip link set $ethname up
     fi
@@ -225,10 +237,9 @@ for p in $(getargs ip=); do
             do_dhcp -6 ;;
         auto6)
             do_ipv6auto ;;
-        *) 
+        *)
             do_static ;;
     esac
     break
 done
-
 exit 0

modules.d/40network/module-setup.sh

@@ -3,11 +3,12 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
+    local _program
     . $dracutfunctions
 
-    for program in ip arping dhclient ; do 
-        if ! type -P $program >/dev/null; then
-            derror "Could not find program \"$program\" required by network."
+    for _program in ip arping dhclient ; do
+        if ! type -P $_program >/dev/null; then
+            derror "Could not find program \"$_program\" required by network."
             return 1
         fi
     done
@@ -23,15 +24,42 @@ depends() {
 installkernel() {
     # Include wired net drivers, excluding wireless
 
-    net_module_test() {
-        local net_drivers='eth_type_trans|register_virtio_device'
-        local unwanted_drivers='/(wireless|isdn|uwb)/'
-        egrep -q $net_drivers "$1" && \
-            egrep -qv 'iw_handler_get_spy' "$1" && \
-            [[ ! $1 =~ $unwanted_drivers ]]
+    net_module_filter() {
+        local _net_drivers='eth_type_trans|register_virtio_device'
+        local _unwanted_drivers='/(wireless|isdn|uwb)/'
+        # subfunctions inherit following FDs
+        local _merge=8 _side2=9
+        function nmf1() {
+            local _fname _fcont
+            while read _fname; do
+                [[ $_fname =~ $_unwanted_drivers ]] && continue
+                case "$_fname" in
+                    *.ko)    _fcont="$(<        $_fname)" ;;
+                    *.ko.gz) _fcont="$(gzip -dc $_fname)" ;;
+                    *.ko.xz) _fcont="$(xz -dc   $_fname)" ;;
+                esac
+                [[   $_fcont =~ $_net_drivers
+                && ! $_fcont =~ iw_handler_get_spy ]] \
+                && echo "$_fname"
+            done
+        }
+        function rotor() {
+            local _f1 _f2
+            while read _f1; do
+                echo "$_f1"
+                if read _f2; then
+                    echo "$_f2" 1>&${_side2}
+                fi
+            done | nmf1 1>&${_merge}
+        }
+        # Use two parallel streams to filter alternating modules.
+        set +x
+        eval "( ( rotor ) ${_side2}>&1 | nmf1 ) ${_merge}>&1"
+        [[ $debug ]] && set -x
     }
 
-    instmods $(filter_kernel_modules net_module_test)
+    { find_kernel_modules_by_path drivers/net; find_kernel_modules_by_path drivers/s390/net; } \
+        | net_module_filter | instmods
 
     instmods ecb arc4
     # bridge modules
@@ -42,12 +70,14 @@ installkernel() {
 }
 
 install() {
-    dracut_install ip arping tr dhclient 
+    local _arch _i _dir
+    dracut_install ip arping tr dhclient
     dracut_install -o brctl ifenslave
-    inst "$moddir/ifup" "/sbin/ifup"
-    inst "$moddir/netroot" "/sbin/netroot"
-    inst "$moddir/dhclient-script" "/sbin/dhclient-script"
-    inst "$moddir/dhclient.conf" "/etc/dhclient.conf" 
+    inst "$moddir/ifup.sh" "/sbin/ifup"
+    inst "$moddir/netroot.sh" "/sbin/netroot"
+    inst "$moddir/dhclient-script.sh" "/sbin/dhclient-script"
+    inst "$moddir/net-lib.sh" "/lib/net-lib.sh"
+    inst_simple "$moddir/dhclient.conf" "/etc/dhclient.conf"
     inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
     inst_hook pre-udev 60 "$moddir/net-genrules.sh"
     inst_hook cmdline 91 "$moddir/dhcp-root.sh"
@@ -57,12 +87,12 @@ install() {
     inst_hook cmdline 99 "$moddir/parse-ifname.sh"
     inst_hook pre-pivot 10 "$moddir/kill-dhclient.sh"
 
-    arch=$(uname -m)
+    _arch=$(uname -m)
 
-    for dir in "$usrlibdir/tls/$arch" "$usrlibdir/tls" "$usrlibdir/$arch" \
+    for _dir in "$usrlibdir/tls/$_arch" "$usrlibdir/tls" "$usrlibdir/$_arch" \
         "$usrlibdir" "$libdir"; do
-        for i in "$dir"/libnss_dns.so.* "$dir"/libnss_mdns4_minimal.so.*; do
-            [ -e "$i" ] && dracut_install "$i"
+        for _i in "$_dir"/libnss_dns.so.* "$_dir"/libnss_mdns4_minimal.so.*; do
+            [ -e "$_i" ] && dracut_install "$_i"
         done
     done
 

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

@@ -14,7 +14,7 @@ fix_bootif() {
 }
 
 # Don't continue if we don't need network
-[ -z "$netroot" ] && return;
+[ -z "$netroot" ] && ! getargbool 0 rd.neednet && return;
 
 # Write udev rules
 {
@@ -35,17 +35,29 @@ fix_bootif() {
     BOOTIF=$(getarg 'BOOTIF=')
     if [ -n "$BOOTIF" ] ; then
         BOOTIF=$(fix_bootif "$BOOTIF")
-        printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", RUN+="/sbin/ifup $env{INTERFACE}"\n' "$BOOTIF"
+        if [ -n "$netroot" ]; then
+            printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE}"\n' "$BOOTIF"
+        else
+            printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE} -m"\n' "$BOOTIF"
+        fi
 
     # If we have to handle multiple interfaces, handle only them.
     elif [ -n "$IFACES" ] ; then
         for iface in $IFACES ; do
-            printf 'ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="%s", RUN+="/sbin/ifup $env{INTERFACE}"\n' "$iface"
+            if [ -n "$netroot" ]; then
+                printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE}"\n' "$iface"
+            else
+                printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE} -m"\n' "$iface"
+            fi
         done
 
     # Default: We don't know the interface to use, handle all
     else
-        printf 'ACTION=="add", SUBSYSTEM=="net", RUN+="/sbin/ifup $env{INTERFACE}"\n'
+        if [ -n "$netroot" ]; then
+            printf 'SUBSYSTEM=="net", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE}"\n'
+        else
+            printf 'SUBSYSTEM=="net", OPTIONS+="event_timeout=360", RUN+="/sbin/ifup $env{INTERFACE} -m"\n'
+        fi
     fi
 
 } > /etc/udev/rules.d/60-net.rules

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

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+get_ip() {
+    local iface="$1" ip=""
+    ip=$(ip -o -f inet addr show $iface)
+    ip=${ip%%/*}
+    ip=${ip##* }
+}
+
+iface_for_remote_addr() {
+    set -- $(ip -o route get to $1)
+    echo $5
+}
+
+iface_for_mac() {
+    local interface="" mac="$(echo $1 | tr '[:upper:]' '[:lower:]')"
+    for interface in /sys/class/net/*; do
+        if [ $(cat $interface/address) = "$mac" ]; then
+            echo ${interface##*/}
+        fi
+    done
+}
+
+iface_has_link() {
+    local interface="$1" flags=""
+    [ -n "$interface" ] || return 2
+    interface="/sys/class/net/$interface"
+    [ -d "$interface" ] || return 2
+    flags=$(cat $interface/flags)
+    echo $(($flags|0x41)) > $interface/flags # 0x41: IFF_UP|IFF_RUNNING
+    [ "$(cat $interface/carrier)" = 1 ] || return 1
+    # XXX Do we need to reset the flags here? anaconda never bothered..
+}

modules.d/40network/netroot.sh

@@ -2,8 +2,7 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-PATH=$PATH:/sbin:/usr/sbin
-
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
 # Huh? Empty $1?
@@ -12,62 +11,72 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 # Huh? No interface config?
 [ ! -e /tmp/net.$1.up ] && exit 1
 
-# There's no sense in doing something if no (net)root info is available
+# [ ! -z $2 ] means this is for manually bringing up network
+# instead of real netroot; If It's called without $2, then there's
+# no sense in doing something if no (net)root info is available
 # or root is already there
 [ -e /tmp/root.info ] || exit 1
 . /tmp/root.info
-[ -d $NEWROOT/proc ] && exit 0
-[ -z "$netroot" ] && exit 1
+if [ -z "$2" ]; then
+    [ -d $NEWROOT/proc ] && exit 0
+    [ -z "$netroot" ] && exit 1
+fi
 
 # Let's see if we have to wait for other interfaces
-# Note: exit works just fine, since the last interface to be 
+# Note: exit works just fine, since the last interface to be
 #       online'd should see all files
 [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
 for iface in $IFACES ; do
     [ -e /tmp/net.$iface.up ] || exit 1
 done
 
-# Set or override primary interface 
+# Set or override primary interface
 netif=$1
 [ -e "/tmp/net.bootdev" ] && read netif < /tmp/net.bootdev
 
-# Figure out the handler for root=dhcp by recalling all netroot cmdline 
-# handlers
-if [ "$netroot" = "dhcp" ] || [ "$netroot" = "dhcp6" ] ; then
-    # Unset root so we can check later
-    unset root
-
-    # Load dhcp options
-    [ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
-
-    # If we have a specific bootdev with no dhcpoptions or empty root-path, 
-    # we die. Otherwise we just warn
-    if [ -z "$new_root_path" ] ; then
-        [ -n "$BOOTDEV" ] && die "No dhcp root-path received for '$BOOTDEV'"
-        warn "No dhcp root-path received for '$BOOTDEV' trying other interfaces if available"
-        exit 1
-    fi
-
-    # Set netroot to new_root_path, so cmdline parsers don't call
-    netroot=$new_root_path
-
-    # FIXME!
-    for f in $hookdir/cmdline/90*.sh; do
-        [ -f "$f" ] && . "$f";
-    done
-else 
-    rootok="1"
+if [ -e /tmp/net.$netif.manualup ]; then
+    rm -f /tmp/net.$netif.manualup
 fi
 
-# Check: do we really know how to handle (net)root?
-[ -z "$root" ] && die "No or empty root= argument"
-[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
+# Figure out the handler for root=dhcp by recalling all netroot cmdline
+# handlers when this is not called from manually network bringing up.
+if [ -z "$2" ]; then
+    if [ "$netroot" = "dhcp" ] || [ "$netroot" = "dhcp6" ] ; then
+        # Unset root so we can check later
+        unset root
 
-handler=${netroot%%:*}
-handler=${handler%%4}
-handler="/sbin/${handler}root"
-if [ -z "$netroot" ] || [ ! -e "$handler" ] ; then
-    die "No handler for netroot type '$netroot'"
+        # Load dhcp options
+        [ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
+
+        # If we have a specific bootdev with no dhcpoptions or empty root-path,
+        # we die. Otherwise we just warn
+        if [ -z "$new_root_path" ] ; then
+            [ -n "$BOOTDEV" ] && die "No dhcp root-path received for '$BOOTDEV'"
+            warn "No dhcp root-path received for '$BOOTDEV' trying other interfaces if available"
+            exit 1
+        fi
+
+        # Set netroot to new_root_path, so cmdline parsers don't call
+        netroot=$new_root_path
+
+        # FIXME!
+        for f in $hookdir/cmdline/90*.sh; do
+            [ -f "$f" ] && . "$f";
+        done
+    else
+        rootok="1"
+    fi
+
+    # Check: do we really know how to handle (net)root?
+    [ -z "$root" ] && die "No or empty root= argument"
+    [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
+
+    handler=${netroot%%:*}
+    handler=${handler%%4}
+    handler=$(command -v ${handler}root)
+    if [ -z "$netroot" ] || [ ! -e "$handler" ] ; then
+        die "No handler for netroot type '$netroot'"
+    fi
 fi
 
 # We're here, so we can assume that upping interfaces is now ok
@@ -89,7 +98,7 @@ done
 # Note: This assumes that if no router is present the
 # root server is on the same subnet.
 #
-# TODO There's some netroot variants that don't (yet) have their 
+# TODO There's some netroot variants that don't (yet) have their
 # server-ip netroot
 
 # Get router IP if set
@@ -119,11 +128,14 @@ if [ -n "$netroot_ip" ]; then
     fi
 fi
 if [ -n "$dest" ] && ! arping -q -f -w 60 -I $netif $dest ; then
-    die "Resolving $dest via ARP on $netif failed"
+    dinfo "Resolving $dest via ARP on $netif failed"
 fi
 
+# exit in case manually bring up network
+[ -n "$2" ] && exit 0
+
 # Source netroot hooks before we start the handler
-source_all netroot
+source_all $hookdir/netroot
 
 # Run the handler; don't store the root, it may change from device to device
 # XXX other variables to export?
@@ -136,7 +148,7 @@ if $handler $netif $netroot $NEWROOT; then
 
     # Save used netif for later use
     [ ! -f /tmp/net.ifaces ] && echo $netif > /tmp/net.ifaces
-else 
+else
     warn "Mounting root via '$netif' failed"
     # If we're trying with multiple interfaces, put that one down.
     # ip down/flush ensures that routeing info goes away as well

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

@@ -13,11 +13,12 @@
 # return if bond already parsed
 [ -n "$bondname" ] && return
 
-# Check if bond parameter is valid 
+# Check if bond parameter is valid
 if getarg bond= >/dev/null ; then
     if [ -z "$netroot" ] ; then
         die "No netboot configured, bond is invalid"
     fi
+    command -v brctl >/dev/null 2>&1 || die "No 'brctl' installed"
 fi
 
 # We translate list of slaves to space-separated here to mwke it easier to loop over them in ifup
@@ -46,7 +47,7 @@ unset bondname bondslaves bondoptions
 if getarg bond >/dev/null; then
     # Read bond= parameters if they exist
     bond="$(getarg bond=)"
-    if [ ! "$bond" = "bond" ]; then 
+    if [ ! "$bond" = "bond" ]; then
         parsebond "$(getarg bond=)"
     fi
     # Simple default bond

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

@@ -11,11 +11,12 @@
 # return if bridge already parsed
 [ -n "$bridgename" ] && return
 
-# Check if bridge parameter is valid 
+# Check if bridge parameter is valid
 if getarg bridge= >/dev/null ; then
     if [ -z "$netroot" ] ; then
         die "No netboot configured, bridge is invalid"
     fi
+    command -v brctl >/dev/null 2>&1 || die "No 'brctl' installed" 
 fi
 
 parsebridge() {
@@ -46,11 +47,10 @@ if [ -e /tmp/bond.info ]; then
 fi
 
 # Parse bridge for bridgename and ethname
-if getarg bridge >/dev/null; then
+if bridge="$(getarg bridge)"; then
     # Read bridge= parameters if they exist
-    bridge="$(getarg bridge=)"
-    if [ ! "$bridge" = "bridge" ]; then 
-        parsebridge "$(getarg bridge=)"
+    if [ -n "$bridge" ]; then
+        parsebridge $bridge
     fi
     # Simple default bridge
     if [ -z "$bridgename" ]; then

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

@@ -25,7 +25,8 @@ parse_ifname_opts() {
     case $# in
         7)
             ifname_if=$1
-            ifname_mac=$2:$3:$4:$5:$6:$7
+            # udev requires MAC addresses to be lower case
+            ifname_mac=`echo $2:$3:$4:$5:$6:$7 | tr '[:upper:]' '[:lower:]'`
             ;;
         *)
             die "Invalid arguments for ifname="

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

@@ -7,7 +7,7 @@
 #
 #       ip=<interface>:[dhcp|on|any]
 #
-#       ip=<client-IP-number>:<server-id>:<gateway-IP-number>:<netmask>:<client-hostname>:<interface>:[dhcp|on|any|none|off]
+#       ip=<client-IP-number>:<server-IP-number>:<gateway-IP-number>:<netmask>:<client-hostname>:<interface>:[dhcp|on|any|none|off]
 #
 # When supplying more than only ip= line, <interface> is mandatory and
 # bootdev= must contain the name of the primary interface to use for
@@ -38,12 +38,13 @@ fi
 
 # Count ip= lines to decide whether we need bootdev= or not
 if [ -z "$NEEDBOOTDEV" ] ; then
-    local count=0
+    count=0
     for p in $(getargs ip=); do
         count=$(( $count + 1 ))
     done
     [ $count -gt 1 ] && NEEDBOOTDEV=1
 fi
+unset count
 
 # If needed, check if bootdev= contains anything usable
 if [ -n "$NEEDBOOTDEV" ] ; then
@@ -52,17 +53,26 @@ if [ -n "$NEEDBOOTDEV" ] ; then
 fi
 
 if [ "ibft" = "$(getarg ip=)" ]; then
-    modprobe ibft
+    modprobe iscsi_ibft
     num=0
-    (   
+    (
 	for iface in /sys/firmware/ibft/ethernet*; do
 	    [ -e ${iface}/mac ] || continue
             ifname_mac=$(read a < ${iface}/mac; echo $a)
-	    [ -z "$ifname_mac" ] || continue
-            ifname_if=ibft$num
-	    num=$(( $num + 1 ))
-	    echo "ifname=$ifname_if:$ifname_mac"
-	    dev=$ifname_if
+	    [ -z "$ifname_mac" ] && continue
+            unset dev
+            for ifname in $(getargs ifname=); do
+		if strstr "$ifname" "$ifname_mac"; then
+		    dev=${ifname%%:*}
+                    break
+                fi
+	    done
+            if [ -z "$dev" ]; then
+		ifname_if=ibft$num
+		num=$(( $num + 1 ))
+		echo "ifname=$ifname_if:$ifname_mac"
+		dev=$ifname_if
+	    fi
 
 	    dhcp=$(read a < ${iface}/dhcp; echo $a)
 	    if [ -n "$dhcp" ]; then
@@ -147,7 +157,7 @@ for p in $(getargs ip=); do
 done
 
 # This ensures that BOOTDEV is always first in IFACES
-if [ -n "$BOOTDEV" ] && [ -n "$IFACES" ] ; then 
+if [ -n "$BOOTDEV" ] && [ -n "$IFACES" ] ; then
     IFACES="${IFACES%$BOOTDEV*} ${IFACES#*$BOOTDEV}"
     IFACES="$BOOTDEV $IFACES"
 fi
@@ -156,5 +166,5 @@ fi
 [ -n "$BOOTDEV" ] && echo $BOOTDEV > /tmp/net.bootdev
 [ -n "$IFACES" ]  && echo $IFACES > /tmp/net.ifaces
 
-# We need a ip= line for the configured bootdev= 
+# We need a ip= line for the configured bootdev=
 [ -n "$NEEDBOOTDEV" ] && [ -z "$BOOTDEVOK" ] && die "Bootdev Argument '$BOOTDEV' not found"

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

@@ -17,7 +17,7 @@ if [ -e /tmp/bridge.info ]; then
     . /tmp/bridge.info
 fi
 
-mkdir -p /tmp/ifcfg/
+mkdir -m 0755 -p /tmp/ifcfg/
 
 for netif in $IFACES ; do
     # bridge?
@@ -31,18 +31,18 @@ for netif in $IFACES ; do
     fi
     cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
     {
-        echo "# Generated by dracut initrd" 
+        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" 
+            echo "DHCPV6C=yes"
+            echo "BOOTPROTO=dhcp"
         else
-            echo "BOOTPROTO=none" 
+            echo "BOOTPROTO=none"
         # If we've booted with static ip= lines, the override file is there
-            . /tmp/net.$netif.override 
+            [ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override
             echo "IPADDR=$ip"
             echo "NETMASK=$mask"
             [ -n "$gw" ] && echo "GATEWAY=$gw"
@@ -55,7 +55,7 @@ for netif in $IFACES ; do
         {
             echo "HWADDR=$(cat /sys/class/net/$netif/address)"
             echo "TYPE=Ethernet"
-            echo "NAME=\"Boot Disk\"" 
+            echo "NAME=\"Boot Disk\""
         } >> /tmp/ifcfg/ifcfg-$netif
     fi
 
@@ -88,7 +88,7 @@ for netif in $IFACES ; do
         # bridge
         {
             echo "TYPE=Bridge"
-            echo "NAME=\"Boot Disk\"" 
+            echo "NAME=\"Boot Disk\""
         } >> /tmp/ifcfg/ifcfg-$netif
         if [ "$ethname" = "$bondname" ] ; then
             {
@@ -100,7 +100,7 @@ for netif in $IFACES ; do
                 # This variable is an indicator of a bond interface for initscripts
                 echo "BONDING_OPTS=\"$bondoptions\""
                 echo "BRIDGE=$netif"
-                echo "NAME=\"$bondname\"" 
+                echo "NAME=\"$bondname\""
             } >> /tmp/ifcfg/ifcfg-$bondname
             for slave in $bondslaves ; do
                 # write separate ifcfg file for the raw eth interface
@@ -134,9 +134,11 @@ for netif in $IFACES ; do
 done
 
 # Pass network opts
-mkdir -p /run/initramfs
+[ -d /run/initramfs ] || mkdir -m 0755 -p /run/initramfs
 cp /tmp/net.* /run/initramfs/ >/dev/null 2>&1
-mkdir -p /run/initramfs/state/etc/sysconfig/network-scripts/
+for i in /run/initramfs/state /run/initramfs/state/etc/ /run/initramfs/state/etc/sysconfig /run/initramfs/state/etc/sysconfig/network-scripts; do
+    [ -d $i ] || mkdir -m 0755 -p $i
+done
 cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ >/dev/null 2>&1
 echo "files /etc/sysconfig/network-scripts" > /run/initramfs/rwtab
-cp -a /tmp/ifcfg/* /run/initramfs/state/etc/sysconfig/network-scripts/ >/dev/null 2>&1
+cp -a -t /run/initramfs/state/etc/sysconfig/network-scripts/ /tmp/ifcfg/* >/dev/null 2>&1

modules.d/45url-lib/module-setup.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# module-setup for url-lib
+
+check() {
+    command -v curl >/dev/null || return 1
+    return 255
+}
+
+depends() {
+    echo network
+    return 0
+}
+
+install() {
+    inst "$moddir/url-lib.sh" "/lib/url-lib.sh"
+    dracut_install curl
+    mkdir -m 0755 -p "$initdir/etc/ssl/certs"
+    if ! inst_any -t /etc/ssl/certs/ca-bundle.crt \
+            /etc/ssl/certs/ca-bundle.crt \
+            /etc/ssl/certs/ca-certificates.crt; then
+        dwarn "Couldn't find SSL CA cert bundle; HTTPS won't work."
+    fi
+}
+

modules.d/45url-lib/url-lib.sh

@@ -0,0 +1,115 @@
+#!/bin/sh
+# url-lib.sh - functions for handling URLs (file fetching etc.)
+#
+# Authors:
+#   Will Woods <wwoods@redhat.com>
+
+type mkuniqdir >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+# fetch_url URL [OUTFILE]
+#   fetch the given URL to a locally-visible location.
+#   if OUTFILE is given, the URL will be fetched to that filename,
+#   overwriting it if present.
+#   If the URL is something mountable (e.g. nfs://) and no OUTFILE is given,
+#   the server will be left mounted until pre-pivot.
+#   the return values are as follows:
+#   0: success
+#   253: unknown error (file missing)
+#   254: unhandled URL scheme / protocol
+#   255: bad arguments / unparseable URLs
+#   other: fetch command failure (whatever curl/mount/etc return)
+fetch_url() {
+    local url="$1" outloc="$2"
+    local handler="$(get_url_handler $url)"
+    [ -n "$handler" ] || return 254
+    [ -n "$url" ] || return 255
+    $handler "$url" "$outloc"
+}
+
+# get_url_handler URL
+#   returns the first HANDLERNAME corresponding to the URL's scheme
+get_url_handler() {
+    local scheme="${1%%:*}" item=""
+    for item in $url_handler_map; do
+        [ "$scheme" = "${item%%:*}" ] && echo "${item#*:}" && return 0
+    done
+    return 1
+}
+
+# add_url_handler HANDLERNAME SCHEME [SCHEME...]
+#   associate the named handler with the named scheme(s).
+add_url_handler() {
+    local handler="$1"; shift
+    local schemes="$@" scheme=""
+    set --
+    for scheme in $schemes; do
+        set -- "$@" "$scheme:$handler"
+    done
+    set -- $@ $url_handler_map # add new items to *front* of list
+    url_handler_map="$@"
+}
+
+### HTTP, HTTPS, FTP #################################################
+
+export CURL_HOME="/run/initramfs/url-lib"
+mkdir -p $CURL_HOME
+curl_args="--location --retry 3 --fail --show-error"
+curl_fetch_url() {
+    local url="$1" outloc="$2"
+    if [ -n "$outloc" ]; then
+        curl $curl_args --output "$outloc" "$url" || return $?
+    else
+        local outdir="$(mkuniqdir /tmp curl_fetch_url)"
+        ( cd "$outdir"; curl $curl_args --remote-name "$url" || return $? )
+        outloc="$outdir/$(ls -A $outdir)"
+    fi
+    [ -f "$outloc" ] || return 253
+    echo "$outloc"
+}
+add_url_handler curl_fetch_url http https ftp
+
+set_http_header() {
+    echo "header = \"$1: $2\"" >> $CURL_HOME/.curlrc
+}
+
+### NFS ##############################################################
+
+. /lib/nfs-lib.sh
+
+nfs_already_mounted() {
+    local server="$1" path="$2" localdir="" s="" p=""
+    cat /proc/mounts | while read src mnt rest; do
+        splitsep ":" "$src" s p
+        if [ "$server" = "$s" ]; then
+            if [ "$path" = "$p" ]; then
+                echo $mnt
+            elif str_starts "$path" "$p"; then
+                echo $mnt/${path#$p/}
+            fi
+        fi
+    done
+}
+
+nfs_fetch_url() {
+    local url="$1" outloc="$2" nfs="" server="" path="" options=""
+    nfs_to_var "$url" || return 255
+    local filepath="${path%/*}" filename="${path##*/}" mntdir=""
+
+    # skip mount if server:/filepath is already mounted
+    mntdir=$(nfs_already_mounted $server $path)
+    if [ -z "$mntdir" ]; then
+        local mntdir="$(mkuniqdir /run nfs_mnt)"
+        mount_nfs $nfs:$server:$path${options:+:$options} $mntdir
+        # lazy unmount during pre-pivot hook
+        inst_hook --hook pre-pivot --name 99url-lib-umount-nfs umount -l $mntdir
+    fi
+
+    if [ -z "$outloc" ]; then
+        outloc="$mntdir/$filename"
+    else
+        cp -f "$mntdir/$filename" "$outloc" || return $?
+    fi
+    [ -f "$outloc" ] || return 253
+    echo "$outloc"
+}
+add_url_handler nfs_fetch_url nfs nfs4

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

@@ -9,8 +9,9 @@ if getargbool 1 rd.splash -n rd_NO_SPLASH; then
 
     info "Starting Gentoo Splash"
 
-    [ -x /lib/udev/console_init ] && /lib/udev/console_init tty0
+    [ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0
     CDROOT=0
     . /lib/gensplash-lib.sh
     splash init
+    [ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0
 fi

modules.d/50gensplash/module-setup.sh

@@ -13,55 +13,57 @@ depends() {
 }
 
 install() {
+    local _opts
+    local _splash_theme
+    local _splash_res
+
     call_splash_geninitramfs() {
-        local out ret 
+        local _out _ret
 
-        out=$(splash_geninitramfs -c "$1" ${@:2} 2>&1)
-        ret=$?
+        _out=$(splash_geninitramfs -c "$1" ${@:2} 2>&1)
+        _ret=$?
 
-        if [[ ${out} ]]; then
+        if [[ ${_out} ]]; then
             local IFS='
 '
-            for line in ${out}; do
+            for line in ${_out}; do
                 if [[ ${line} =~ ^Warning ]]; then
                     dwarn "${line}"
                 else
                     derror "${line}"
-                    (( ret == 0 )) && ret=1
+                    (( $_ret == 0 )) && _ret=1
                 fi
             done
         fi
 
-        return ${ret}
+        return ${_ret}
     }
 
-
     type -P splash_geninitramfs >/dev/null || return 1
 
-    opts=''
-
+    _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}
+        _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}"
+        [[ ! ${_splash_theme} ]] && _splash_theme=default
+        [[ ${_splash_res} ]] && _opts+=" -r ${_splash_res}"
     else
         # generic
-        SPLASH_THEME=--all
+        _splash_theme=--all
     fi
 
-    dinfo "Installing Gentoo Splash (using the ${SPLASH_THEME} theme)"
+    dinfo "Installing Gentoo Splash (using the ${_splash_theme} theme)"
 
     pushd "${initdir}" >/dev/null
     mv dev dev.old
-    call_splash_geninitramfs "${initdir}" ${opts} ${SPLASH_THEME} || {
+    call_splash_geninitramfs "${initdir}" ${_opts} ${_splash_theme} || {
         derror "Could not build splash"
         return 1
     }

modules.d/50plymouth/module-setup.sh

@@ -3,6 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
+    [[ "$mount_needs" ]] && return 1
     [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
 }
 
@@ -11,9 +12,25 @@ depends() {
 }
 
 installkernel() {
+    local _modname
     # Include KMS capable drm drivers
-    for modname in $(find "$srcmods/kernel/drivers/gpu/drm" "$srcmods/extra" -name '*.ko' 2>/dev/null); do
-        grep -q drm_crtc_init  $modname && instmods $modname
+    for _modname in $(find "$srcmods/kernel/drivers/gpu/drm" "$srcmods/extra" \( -name '*.ko' -o -name '*.ko.gz' -o -name '*.ko.xz' \) 2>/dev/null); do
+        case $_modname in
+            *.ko)      grep -q drm_crtc_init $_modname ;;
+            *.ko.gz)  zgrep -q drm_crtc_init $_modname ;;
+            *.ko.xz) xzgrep -q drm_crtc_init $_modname ;;
+        esac
+        if test $? -eq 0; then
+            # if the hardware is present, include module even if it is not currently loaded,
+            # as we could e.g. be in the installer; nokmsboot boot parameter will disable
+            # loading of the driver if needed
+            if [[ $hostonly ]] && modinfo -F alias $_modname | sed -e 's,\?,\.,g' -e 's,\*,\.\*,g' \
+                                  | grep -qxf - /sys/bus/pci/devices/*/modalias; then
+                hostonly='' instmods $_modname
+                continue
+            fi
+            instmods $_modname
+        fi
     done
 }
 
@@ -21,7 +38,7 @@ install() {
     if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
         || ! grep -q PLYMOUTH_POPULATE_SOURCE_FUNCTIONS /usr/libexec/plymouth/plymouth-populate-initrd \
         || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
-        . "$moddir"/plymouth-populate-initrd
+        . "$moddir"/plymouth-populate-initrd.sh
     else
         PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
             /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir

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

@@ -7,11 +7,11 @@ PLYMOUTH_THEME=$(plymouth-set-default-theme)
 inst /sbin/plymouthd /bin/plymouthd
 dracut_install /bin/plymouth \
     "${PLYMOUTH_LOGO_FILE}" \
-    /etc/system-release 
+    /etc/system-release
 
-mkdir -p "${initdir}/usr/share/plymouth"
+mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
 
-if [[ $hostonly ]]; then 
+if [[ $hostonly ]]; then
     dracut_install "${usrlibdir}/plymouth/text.so" \
         "${usrlibdir}/plymouth/details.so" \
         "/usr/share/plymouth/themes/details/details.plymouth" \
@@ -34,7 +34,7 @@ else
     for x in /usr/share/plymouth/themes/{text,details}/* ; do
         [[ -f "$x" ]] || continue
         THEME_DIR=$(dirname "$x")
-        mkdir -p "${initdir}/$THEME_DIR"
+        mkdir -m 0755 -p "${initdir}/$THEME_DIR"
         dracut_install "$x"
     done
     for x in "${usrlibdir}"/plymouth/{text,details}.so ; do
@@ -44,6 +44,6 @@ else
     done
     (
         cd ${initdir}/usr/share/plymouth/themes;
-        ln -s text/text.plymouth default.plymouth 2>&1;       
+        ln -s text/text.plymouth default.plymouth 2>&1;
     )
 fi

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

@@ -2,7 +2,7 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-if getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then
+if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then
     [ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3
     # first trigger graphics subsystem
     udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
@@ -17,8 +17,12 @@ if getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then
     [ -e /dev/fb ] || ln -s fb0 /dev/fb
 
     info "Starting plymouth daemon"
-    mkdir -m 0755 -p /run/plymouth
+    mkdir -m 0755 /run/plymouth
+    consoledev=$(getarg console= | sed -e 's/,.*//')
+    consoledev=${consoledev:-tty0}
+    [ -x /lib/udev/console_init ] && /lib/udev/console_init "/dev/$consoledev"
     [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
-    [ -x /lib/udev/console_init ] && /lib/udev/console_init tty0
     /bin/plymouth --show-splash 2>&1 | vinfo
+    # reset tty after plymouth messed with it
+    [ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0
 fi

modules.d/60xen/module-setup.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-check() {
-    # No Xen-detect? Boo!!
-    if ! hash xen-detect 2>/dev/null; then
-        [[ -d /usr/lib/xen-default ]] && \
-            hash -p /usr/lib/xen-default/bin/xen-detect xen-detect || return 1
-    fi
-
-    . $dracutfunctions
-    [[ $debug ]] && set -x
-
-    # Yes, we are under Xen PV env.
-    xen-detect | grep -q -v PV || return 0
-
-    return 1
-}
-
-depends() {
-    return 0
-}
-
-installkernel() {
-    for i in \
-        xenbus_probe_frontend xen-pcifront \
-        xen-fbfront xen-kbdfront xen-blkfront xen-netfront \
-        ; do
-        modinfo -k $kernel $i >/dev/null 2>&1 && instmods $i
-    done
-
-}
-
-install() {
-    hash xen-detect 2>/dev/null || \
-        hash -p /usr/lib/xen-default/bin/xen-detect xen-detect
-    inst "$(hash -t xen-detect)" /sbin/xen-detect
-    inst_hook pre-udev 40 "$moddir/xen-pre-udev.sh"
-}
-

modules.d/60xen/xen-pre-udev.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-xen-detect
-RC=$?
-if [ "$RC" = "1" ] ; then
-    modprobe xenbus_probe_frontend
-    modprobe xen-kbdfront
-    modprobe xen-fbfront
-    modprobe xen-blkfront
-    modprobe xen-netfront
-    modprobe xen-pcifront
-fi

modules.d/90btrfs/80-btrfs.rules

@@ -1,8 +1,11 @@
 SUBSYSTEM!="block", GOTO="btrfs_end"
 ACTION!="add|change", GOTO="btrfs_end"
+ENV{ID_FS_TYPE}!="btrfs", GOTO="btrfs_end"
+RUN+="/sbin/modprobe btrfs"
+RUN+="/sbin/btrfs device scan $env{DEVNAME}"
 
-ENV{ID_FS_TYPE}=="btrfs", RUN+="/sbin/modprobe btrfs"
-ENV{ID_FS_TYPE}=="btrfs", RUN+="/sbin/btrfs device scan $env{DEVNAME}"
+RUN+="/sbin/initqueue --finished --unique --name btrfs_finished /sbin/btrfs_finished"
+RUN+="/sbin/initqueue --timeout --onetime --unique --name btrfs_timeout /sbin/btrfs_timeout"
 
 LABEL="btrfs_end"
 

modules.d/90btrfs/btrfs_finished.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+btrfs_check_complete() {
+    local _rootinfo _dev
+    _dev="${1:-/dev/root}"
+    [ -e "$_dev" ] || return 0
+    _rootinfo=$(udevadm info --query=env "--name=$_dev" 2>/dev/null)
+    if strstr "$_rootinfo" "ID_FS_TYPE=btrfs"; then
+        info "Checking, if btrfs device complete"
+        unset __btrfs_mount
+        mount -o ro "$_dev" /tmp >/dev/null 2>&1
+        __btrfs_mount=$?
+        [ $__btrfs_mount -eq 0 ] && umount "$_dev" >/dev/null 2>&1
+        return $__btrfs_mount
+    fi
+    return 0
+}
+
+btrfs_check_complete $1
+exit $?

modules.d/90btrfs/btrfs_timeout.sh

@@ -1,7 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
+
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
-info "Autoassembling MD Raid"    
-/sbin/mdadm -As --auto=yes --run 2>&1 | vinfo
+info "Scanning for all btrfs devices"
+/sbin/btrfs device scan 2>&1 | vinfo
+exit 0

modules.d/90btrfs/module-setup.sh

@@ -3,6 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
+    local _rootdev
     # if we don't have btrfs installed on the host system,
     # no point in trying to support it in the initramfs.
     type -P btrfs >/dev/null || return 1
@@ -10,14 +11,14 @@ check() {
     . $dracutfunctions
     [[ $debug ]] && set -x
 
-    is_btrfs() { get_fs_type /dev/block/$1 | grep -q btrfs; }
-
-    if [[ $hostonly ]]; then
-        rootdev=$(find_root_block_device)
-        if [[ $rootdev ]]; then
-            is_btrfs "$rootdev" || return 1
-        fi
-    fi
+    [[ $hostonly ]] || [[ $mount_needs ]] && {
+        local _found
+        for fs in ${host_fs_types[@]}; do
+            strstr "$fs" "\|btrfs" && _found="1"
+        done
+        [[ $_found ]] || return 1
+        unset _found
+    }
 
     return 0
 }
@@ -28,11 +29,13 @@ depends() {
 }
 
 installkernel() {
-    instmods btrfs
+    instmods btrfs crc32c
 }
 
 install() {
     inst_rules "$moddir/80-btrfs.rules"
-    dracut_install btrfs
+    inst "$moddir/btrfs_finished.sh" /sbin/btrfs_finished
+    inst "$moddir/btrfs_timeout.sh" /sbin/btrfs_timeout
+    dracut_install btrfs btrfsck
 }
 

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

@@ -4,7 +4,7 @@
 # close everything which is not busy
 rm -f /etc/udev/rules.d/70-luks.rules >/dev/null 2>&1
 
-if ! getarg rd.luks.uuid rd_LUKS_UUID && getargbool 1 rd.luks -n rd_NO_LUKS; then
+if ! getarg rd.luks.uuid rd_LUKS_UUID >/dev/null 2>&1 && getargbool 1 rd.luks -n rd_NO_LUKS >/dev/null 2>&1; then
     while true; do
         local do_break="y"
         for i in /dev/mapper/luks-*; do

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

@@ -2,7 +2,79 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+command -v getarg >/dev/null || . /lib/dracut-lib.sh
+
+# ask_for_password
+#
+# Wraps around plymouth ask-for-password and adds fallback to tty password ask
+# if plymouth is not present.
+#
+# --cmd command
+#   Command to execute. Required.
+# --prompt prompt
+#   Password prompt. Note that function already adds ':' at the end.
+#   Recommended.
+# --tries n
+#   How many times repeat command on its failure.  Default is 3.
+# --ply-[cmd|prompt|tries]
+#   Command/prompt/tries specific for plymouth password ask only.
+# --tty-[cmd|prompt|tries]
+#   Command/prompt/tries specific for tty password ask only.
+# --tty-echo-off
+#   Turn off input echo before tty command is executed and turn on after.
+#   It's useful when password is read from stdin.
+ask_for_password() {
+    local cmd; local prompt; local tries=3
+    local ply_cmd; local ply_prompt; local ply_tries=3
+    local tty_cmd; local tty_prompt; local tty_tries=3
+    local ret
+
+    while [ $# -gt 0 ]; do
+        case "$1" in
+            --cmd) ply_cmd="$2"; tty_cmd="$2" shift;;
+            --ply-cmd) ply_cmd="$2"; shift;;
+            --tty-cmd) tty_cmd="$2"; shift;;
+            --prompt) ply_prompt="$2"; tty_prompt="$2" shift;;
+            --ply-prompt) ply_prompt="$2"; shift;;
+            --tty-prompt) tty_prompt="$2"; shift;;
+            --tries) ply_tries="$2"; tty_tries="$2"; shift;;
+            --ply-tries) ply_tries="$2"; shift;;
+            --tty-tries) tty_tries="$2"; shift;;
+            --tty-echo-off) tty_echo_off=yes;;
+        esac
+        shift
+    done
+
+    { flock -s 9;
+        # Prompt for password with plymouth, if installed and running.
+        if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
+            /bin/plymouth ask-for-password \
+                --prompt "$ply_prompt" --number-of-tries=$ply_tries \
+                --command="$ply_cmd"
+            ret=$?
+        else
+            if [ "$tty_echo_off" = yes ]; then
+                stty_orig="$(stty -g)"
+                stty -echo
+            fi
+
+            local i=1
+            while [ $i -le $tty_tries ]; do
+                [ -n "$tty_prompt" ] && \
+                    printf "$tty_prompt [$i/$tty_tries]:" >&2
+                eval "$tty_cmd" && ret=0 && break
+                ret=$?
+                i=$(($i+1))
+                [ -n "$tty_prompt" ] && printf '\n' >&2
+            done
+
+            [ "$tty_echo_off" = yes ] && stty $stty_orig
+        fi
+    } 9>/.console_lock
+
+    [ $ret -ne 0 ] && echo "Wrong password" >&2
+    return $ret
+}
 
 # Try to mount specified device (by path, by UUID or by label) and check
 # the path with 'test'.
@@ -28,43 +100,6 @@ test_dev() {
     return $ret
 }
 
-# Get kernel name for given device.  Device may be the name too (then the same
-# is returned), a symlink (full path), UUID (prefixed with "UUID=") or label
-# (prefixed with "LABEL=").  If just a beginning of the UUID is specified or
-# even an empty, function prints all device names which UUIDs match - every in
-# single line.
-#
-# NOTICE: The name starts with "/dev/".
-#
-# Example:
-#   devnames UUID=123
-# May print:
-#   /dev/dm-1
-#   /dev/sdb1
-#   /dev/sdf3
-devnames() {
-    local dev="$1"; local d; local names
-
-    case "$dev" in
-    UUID=*)
-        dev="$(foreach_uuid_until '! blkid -U $___' "${dev#UUID=}")" \
-            && return 255
-        [ -z "$dev" ] && return 255
-        ;;
-    LABEL=*) dev="$(blkid -L "${dev#LABEL=}")" || return 255 ;;
-    /dev/?*) ;;
-    *) return 255 ;;
-    esac
-
-    for d in $dev; do
-        names="$names
-$(readlink -e -q "$d")" || return 255
-    done
-
-    echo "${names#
-}"
-}
-
 # match_dev devpattern dev
 #
 # Returns true if 'dev' matches 'devpattern'.  Both 'devpattern' and 'dev' are
@@ -118,3 +153,33 @@ getkey() {
 
     return 1
 }
+
+# readkey keypath keydev device
+#
+# Mounts <keydev>, reads key from file <keypath>, optionally processes it (e.g.
+# if encrypted with GPG) and prints to standard output which is supposed to be
+# read by cryptsetup.  <device> is just passed to helper function for
+# informational purpose.
+readkey() {
+    local keypath="$1"
+    local keydev="$2"
+    local device="$3"
+
+    local mntp=$(mkuniqdir /mnt keydev)
+    mount -r "$keydev" "$mntp" || die 'Mounting rem. dev. failed!'
+
+    case "${keypath##*.}" in
+        gpg)
+            if [ -f /lib/dracut-crypt-gpg-lib.sh ]; then
+                . /lib/dracut-crypt-gpg-lib.sh
+                gpg_decrypt "$mntp" "$keypath" "$keydev" "$device"
+            else
+                die "No GPG support to decrypt '$keypath' on '$keydev'."
+            fi
+            ;;
+        *) cat "$mntp/$keypath" ;;
+    esac
+
+    umount "$mntp"
+    rmdir "$mntp"
+}

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

@@ -2,8 +2,11 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+NEWROOT=${NEWROOT:-"/sysroot"}
+
 # do not ask, if we already have root
-[ -f /sysroot/proc ] && exit 0
+[ -f $NEWROOT/proc ] && exit 0
 
 # check if destination already exists
 [ -b /dev/mapper/$2 ] && exit 0
@@ -19,6 +22,9 @@
 # default luksname - luks-UUID
 luksname=$2
 
+# fallback to passphrase
+ask_passphrase=1
+
 # if device name is /dev/dm-X, convert to /dev/mapper/name
 if [ "${1##/dev/dm-}" != "$1" ]; then
     device="/dev/mapper/$(dmsetup info -c --noheadings -o name "$1")"
@@ -28,7 +34,7 @@ fi
 
 # TODO: improve to support what cmdline does
 if [ -f /etc/crypttab ] && getargbool 1 rd.luks.crypttab -n rd_NO_CRYPTTAB; then
-    while read name dev rest; do
+    while read name dev luksfile rest; do
         # ignore blank lines and comments
         if [ -z "$name" -o "${name#\#}" != "$name" ]; then
             continue
@@ -40,7 +46,7 @@ if [ -f /etc/crypttab ] && getargbool 1 rd.luks.crypttab -n rd_NO_CRYPTTAB; then
                 luksname="$name"
                 break
             fi
-            
+
         # path used in crypttab
         else
             cdev=$(readlink -f $dev)
@@ -58,60 +64,60 @@ fi
 # Open LUKS device
 #
 
-info "luksOpen $device $luksname"
+info "luksOpen $device $luksname $luksfile"
 
-if [ -n "$(getarg rd.luks.key)" ]; then
-    if tmp=$(getkey /tmp/luks.keys $device); then
-        keydev="${tmp%%:*}"
-        keypath="${tmp#*:}"
-    else
-        info "No key found for $device.  Will try later."
-        /sbin/initqueue --unique --onetime --settled \
-            --name cryptroot-ask-$luksname \
-            /sbin/cryptroot-ask "$@"
-        exit 0
+if [ -n "$luksfile" -a "$luksfile" != "none" -a -e "$luksfile" ]; then
+    if cryptsetup --key-file "$luksfile" luksOpen "$device" "$luksname"; then
+        ask_passphrase=0
     fi
-    unset tmp
-
-    mntp=$(mkuniqdir /mnt keydev)
-    mount -r "$keydev" "$mntp" || die 'Mounting rem. dev. failed!'
-    cryptsetup -d "$mntp/$keypath" luksOpen "$device" "$luksname"
-    umount "$mntp"
-    rmdir "$mntp"
-    unset mntp keypath keydev
 else
-    # Prompt for password with plymouth, if installed and running.
-    if [ -x /bin/plymouth ] && /bin/plymouth --has-active-vt; then
-        prompt="Password [$device ($luksname)]:" 
-        if [ ${#luksname} -gt 8 ]; then
-            sluksname=${sluksname##luks-}
-            sluksname=${luksname%%${luksname##????????}}
-            prompt="Password for $device ($sluksname...)"
+    while [ -n "$(getarg rd.luks.key)" ]; do
+        if tmp=$(getkey /tmp/luks.keys $device); then
+            keydev="${tmp%%:*}"
+            keypath="${tmp#*:}"
+        else
+            if [ $# -eq 3 ]; then
+                if [ $3 -eq 0 ]; then
+                    info "No key found for $device.  Fallback to passphrase mode."
+                    break
+                fi
+                info "No key found for $device.  Will try $3 time(s) more later."
+                set -- "$1" "$2" "$(($3 - 1))"
+            else
+                info "No key found for $device.  Will try later."
+            fi
+            initqueue --unique --onetime --settled \
+                --name cryptroot-ask-$luksname \
+                $(command -v cryptroot-ask) "$@"
+            exit 0
         fi
-        
-        # flock against other interactive activities
-        { flock -s 9; 
-            /bin/plymouth ask-for-password \
-                --prompt "$prompt" --number-of-tries=5 \
-                --command="/sbin/cryptsetup luksOpen -T1 $device $luksname"
-        } 9>/.console.lock
-        
-        unset sluksname prompt
-        
-    else
-        # flock against other interactive activities
-        { flock -s 9;
-            echo "$device ($luksname) is password protected"
-            cryptsetup luksOpen -T5 $device $luksname
-        } 9>/.console.lock
-    fi
+        unset tmp
+
+        info "Using '$keypath' on '$keydev'"
+        readkey "$keypath" "$keydev" "$device" \
+            | cryptsetup -d - luksOpen "$device" "$luksname"
+        unset keypath keydev
+        ask_passphrase=0
+        break
+    done
 fi
 
-unset device luksname
+if [ $ask_passphrase -ne 0 ]; then
+    luks_open="$(command -v cryptsetup) luksOpen"
+    ask_for_password --ply-tries 5 \
+        --ply-cmd "$luks_open -T1 $device $luksname" \
+        --ply-prompt "Password ($device)" \
+        --tty-tries 1 \
+        --tty-cmd "$luks_open -T5 $device $luksname"
+    unset luks_open
+fi
+
+unset device luksname luksfile
 
 # mark device as asked
 >> /tmp/cryptroot-asked-$2
 
+need_shutdown
 udevsettle
 
 exit 0

modules.d/90crypt/module-setup.sh

@@ -3,23 +3,31 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
+    local _rootdev
     # if cryptsetup is not installed, then we cannot support encrypted devices.
     type -P cryptsetup >/dev/null || return 1
 
     . $dracutfunctions
 
-    is_crypt() { [[ $(get_fs_type /dev/block/$1) = crypto_LUKS ]]; }
-
-    [[ $hostonly ]] && {
-        rootdev=$(find_root_block_device)
-        if [[ $rootdev ]]; then
-            # root lives on a block device, so we can be more precise about 
-            # hostonly checking
-            check_block_and_slaves is_crypt "$rootdev" || return 1
-        else
-            # root is not on a block device, use the shotgun approach
-            blkid | grep -q crypto\?_LUKS || return 1
+    check_crypt() {
+        local dev=$1 fs=$2
+        [[ $fs = "crypto_LUKS" ]] || return 1
+        ID_FS_UUID=$(udevadm info --query=property --name=$dev \
+            | while read line; do
+                [[ ${line#ID_FS_UUID} = $line ]] && continue
+                eval "$line"
+                echo $ID_FS_UUID
+                break
+                done)
+        [[ ${ID_FS_UUID} ]] || return 1
+        if ! [[ $kernel_only ]]; then
+            echo " rd.luks.uuid=luks-${ID_FS_UUID} " >> "${initdir}/etc/cmdline.d/90crypt.conf"
         fi
+        return 0
+    }
+
+    [[ $hostonly ]] || [[ $mount_needs ]] && {
+        for_each_host_dev_fs check_crypt || return 1
     }
 
     return 0
@@ -35,15 +43,13 @@ installkernel() {
 }
 
 install() {
-    inst cryptsetup 
-    inst rmdir
-    inst readlink
+    dracut_install cryptsetup rmdir readlink umount
     inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
     inst "$moddir"/probe-keydev.sh /sbin/probe-keydev
     inst_hook cmdline 10 "$moddir/parse-keydev.sh"
     inst_hook cmdline 30 "$moddir/parse-crypt.sh"
     inst_hook pre-pivot 30 "$moddir/crypt-cleanup.sh"
-    inst /etc/crypttab
+    inst_simple /etc/crypttab
     inst "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
 }
 

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

@@ -8,34 +8,51 @@ else
     {
         echo 'SUBSYSTEM!="block", GOTO="luks_end"'
         echo 'ACTION!="add|change", GOTO="luks_end"'
-    } > /etc/udev/rules.d/70-luks.rules
+    } > /etc/udev/rules.d/70-luks.rules.new
 
     LUKS=$(getargs rd.luks.uuid rd_LUKS_UUID)
+    tout=$(getarg rd.luks.key.tout)
 
     if [ -n "$LUKS" ]; then
-        for luksid in $LUKS; do 
+        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 '
-                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 -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
+                printf -- 'ENV{ID_FS_UUID}=="*%s*", ' $luksid
+                printf -- 'RUN+="%s --unique --onetime ' $(command -v initqueue)
+                printf -- '--name cryptroot-ask-%%k %s ' $(command -v cryptroot-ask)
+                printf -- '$env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $tout
+            } >> /etc/udev/rules.d/70-luks.rules.new
 
-            printf '[ -e /dev/disk/by-uuid/*%s* ] || exit 1\n' $luksid \
-                >> $hookdir/initqueue/finished/90-crypt.sh
+
+            [ -e $hookdir/initqueue/finished/90-crypt.sh ] || \
             {
-                printf '[ -e /dev/disk/by-uuid/*%s* ] || ' $luksid
-                printf 'warn "crypto LUKS UUID "%s" not found"\n' $luksid
+                printf -- 'UUIDS=:\n'
+                printf -- 'for dm in /dev/dm-*; do\n'
+                printf -- '[ -e "$dm" ] || exit 1\n'
+                printf -- 'dmid=`/sbin/dmsetup info -c -o uuid --noheadings "$dm"`\n'
+                printf -- 'uuid=${dmid#CRYPT-LUKS*-}\n'
+                printf -- '[ "x$uuid" = "x$dmid" ] && continue\n'
+                printf -- 'UUIDS="${UUIDS}${uuid%%%%-*}:"\n'
+                printf -- 'done\n'
+            } > $hookdir/initqueue/finished/90-crypt.sh
+            uuid=$luksid
+            while [ "$uuid" != "${uuid#*-}" ]; do uuid=${uuid%%-*}${uuid#*-}; done
+            printf -- '[ "x${UUIDS#*:%s*:}" != "x$UUIDS" ] || exit 1\n' $uuid >> $hookdir/initqueue/finished/90-crypt.sh
+
+            {
+                printf -- '[ -e /dev/disk/by-uuid/*%s* ] || ' $luksid
+                printf -- 'warn "crypto LUKS UUID "%s" not found"\n' $luksid
             } >> $hookdir/emergency/90-crypt.sh
         done
     else
-        echo '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}"' \
-            >> /etc/udev/rules.d/70-luks.rules
+        {
+            printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' $(command -v initqueue)
+            printf -- '--unique --onetime --name cryptroot-ask-%%k '
+            printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $(command -v cryptroot-ask) $tout
+        } >> /etc/udev/rules.d/70-luks.rules.new
     fi
 
-    echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules
+    echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules.new
+    mv /etc/udev/rules.d/70-luks.rules.new /etc/udev/rules.d/70-luks.rules
 fi

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

@@ -28,10 +28,10 @@ if getargbool 1 rd.luks -n rd_NO_LUKS && \
         fi
 
         {
-            printf 'RUN+="/sbin/initqueue --unique --onetime '
+            printf -- 'RUN+="%s --unique --onetime ' $(command -v initqueue)
             printf -- '--name probe-keydev-%%k '
-            printf '/sbin/probe-keydev /dev/%%k %s %s"\n' \
-                "${keypath}" "${luksdev}"
+            printf -- '%s /dev/%%k %s %s"\n' \
+                $(command -v probe-keydev) "${keypath}" "${luksdev}"
         } >&7
     done
     unset arg keypath keydev luksdev

modules.d/90dm/11-dm.rules

@@ -0,0 +1,5 @@
+SUBSYSTEM!="block", GOTO="dm_end"
+KERNEL!="dm-[0-9]*", GOTO="dm_end"
+ACTION!="add|change", GOTO="dm_end"
+OPTIONS+="db_persist"
+LABEL="dm_end"

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

@@ -1,4 +1,5 @@
 #!/bin/sh
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-strstr "$(cat /proc/misc)" device-mapper || modprobe dm_mod 
+strstr "$(cat /proc/misc)" device-mapper || modprobe dm_mod
+modprobe dm_mirror 2>/dev/null

modules.d/90dm/dm-shutdown.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+_do_dm_shutdown() {
+    local ret
+    local final=$1
+    info "Disassembling device-mapper devices"
+    dmsetup -v remove_all
+    ret=$?
+    if [ "x$final" != "x" ]; then
+        info "dmsetup ls --tree"
+        dmsetup ls --tree 2>&1 | vinfo
+    fi
+    return $ret
+}
+_do_dm_shutdown $1

modules.d/90dm/module-setup.sh

@@ -21,9 +21,18 @@ install() {
     inst dmsetup
 
     type -P dmeventd >/dev/null && dracut_install dmeventd
-    inst_rules 10-dm.rules 95-dm-notify.rules
+
+    for _i in {"$libdir","$usrlibdir"}/libdevmapper-event.so*; do
+        [ -e "$_i" ] && dracut_install "$_i"
+    done
+
+    inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules
     # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
     # files, but provides the one below:
     inst_rules 64-device-mapper.rules
+
+    inst_rules "$moddir/11-dm.rules"
+
+    inst_hook shutdown 30 "$moddir/dm-shutdown.sh"
 }
 

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

@@ -10,6 +10,7 @@ ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="dm_end"
 ENV{ID_FS_TYPE}!="*_raid_member", , GOTO="dm_end"
 
 ENV{ID_FS_TYPE}=="isw_raid_member", ENV{rd_NO_MDIMSM}!="?*", GOTO="dm_end"
+ENV{ID_FS_TYPE}=="ddf_raid_member", ENV{rd_NO_MDDDF}!="?*", GOTO="dm_end"
 
 ENV{rd_NO_DM}=="?*", GOTO="dm_end"
 

modules.d/90dmraid/dmraid.sh

@@ -21,8 +21,8 @@ echo $SETS|vinfo
 
 if [ -n "$DM_RAIDS" ]; then
     # only activate specified DM RAIDS
-    for r in $DM_RAIDS; do 
-        for s in $SETS; do 
+    for r in $DM_RAIDS; do
+        for s in $SETS; do
             if [ "${s##$r}" != "$s" ]; then
                 info "Activating $s"
                 dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
@@ -31,7 +31,7 @@ if [ -n "$DM_RAIDS" ]; then
             fi
         done
     done
-else 
+else
     # scan and activate all DM RAIDS
     for s in $SETS; do
         info "Activating $s"
@@ -40,3 +40,4 @@ else
     done
 fi
 
+need_shutdown

modules.d/90dmraid/module-setup.sh

@@ -3,6 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
+    local _rootdev
     # if we don't have dmraid installed on the host system, no point
     # in trying to support it in the initramfs.
     type -P dmraid >/dev/null || return 1
@@ -10,19 +11,37 @@ check() {
     . $dracutfunctions
     [[ $debug ]] && set -x
 
-    is_dmraid() { get_fs_type /dev/block/$1 |grep -v linux_raid_member | \
-        grep -q _raid_member; }
+    check_dmraid() {
+        local dev=$1 fs=$2 holder DEVPATH DM_NAME
+        [[ "$fs" = "${fs%%_raid_member}" ]] && return 1
 
-    [[ $hostonly ]] && {
-        rootdev=$(find_root_block_device)
-        if [[ $rootdev ]]; then
-        # root lives on a block device, so we can be more precise about 
-        # hostonly checking
-            check_block_and_slaves is_dmraid "$rootdev" || return 1
-        else
-        # root is not on a block device, use the shotgun approach
-            dmraid -r | grep -q ok || return 1
+        DEVPATH=$(udevadm info --query=property --name=$dev \
+            | while read line; do
+                [[ ${line#DEVPATH} = $line ]] && continue
+                eval "$line"
+                echo $DEVPATH
+                break
+                done)
+        for holder in /sys/$DEVPATH/holders/*; do
+            [[ -e $holder ]] || continue
+            DM_NAME=$(udevadm info --query=property --path=$holder \
+                | while read line; do
+                    [[ ${line#DM_NAME} = $line ]] && continue
+                    eval "$line"
+                    echo $DM_NAME
+                    break
+                    done)
+        done
+
+        [[ ${DM_NAME} ]] || return 1
+        if ! [[ $kernel_only ]]; then
+            echo " rd.dm.uuid=${DM_NAME} " >> "${initdir}/etc/cmdline.d/90dmraid.conf"
         fi
+        return 0
+    }
+
+    [[ $hostonly ]] || [[ $mount_needs ]] && {
+        for_each_host_dev_fs check_dmraid || return 1
     }
 
     return 0
@@ -34,18 +53,8 @@ depends() {
 }
 
 install() {
-    dracut_install dmraid partx kpartx 
-
-    inst  dmeventd
-
-    for i in {"$libdir","$usrlibdir"}/libdmraid-events*.so; do
-        [ -e "$i" ] && dracut_install "$i"
-    done
-
-    inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 
-    # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
-    # files, but provides the one below:
-    inst_rules 64-device-mapper.rules
+    local _i
+    dracut_install dmraid partx kpartx
 
     inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 
@@ -53,9 +62,11 @@ install() {
         inst_rules 64-md-raid.rules
     fi
 
+    for _i in {"$libdir","$usrlibdir"}/libdmraid-events*.so*; do
+        [ -e "$_i" ] && dracut_install "$_i"
+    done
+
     inst_rules "$moddir/61-dmraid-imsm.rules"
-    inst "$moddir/dmraid-cleanup.sh" /sbin/dmraid-cleanup
+    #inst "$moddir/dmraid-cleanup.sh" /sbin/dmraid-cleanup
     inst_hook pre-trigger 30 "$moddir/parse-dm.sh"
-
 }
-