Don't call udevadm control --exit in systemd mode

This partly reverts commit a43f97c4e3.

(cherry picked from commit 765d8408e9)

https://bugzilla.redhat.com/show_bug.cgi?id=1276983

.dir-locals.el

@@ -0,0 +1,2 @@
+(setq sh-basic-offset: 4)
+(setq indent-tabs-mode nil)

.gitignore

@@ -13,3 +13,7 @@ test*.img
 /.project
 /dracut-version.sh
 /install/dracut-install
+/*.rpm
+/*.[0-9]
+/modules.d/98systemd/*.service.8
+/*.sign

.kateconfig

@@ -0,0 +1 @@
+kate: space-indent on; tab-width 4; indent-width 4; replace-tabs on; eol unix;

.kateproject

@@ -0,0 +1,9 @@
+{
+  "name": "Kate"
+  , "files": [ { "git": 1 } ]
+  , "build": {
+    "directory": "build"
+  , "build": "make -j $(getconf _NPROCESSORS_ONLN) all"
+  , "clean": "make clean"
+  }
+}

.mailmap

@@ -1,12 +1,15 @@
-Philippe Seewer <philippe.seewer@bfh.ch> <philippe.seewer-omB+W0Dpw2o@public.gmane.org>
-Seewer Philippe <philippe.seewer@bfh.ch> <philippe.seewer@bfh.ch>
-Philippe Seewer <philippe.seewer@bfh.ch> <philippe.seewer@bfh.ch>
-Victor Lowther <victor.lowther@gmail.com> <victor.lowther-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-Harald Hoyer <harald@redhat.com> <harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
-Harald Hoyer <harald@redhat.com> <harald@eeepc.(none)>
-Mike Snitzer <snitzer@redhat.com> <msnitzer@redhat.com> 
-Amerigo Wang <amwang@redhat.com> <xiyou.wangcong@gmail.com>
-Andrey Borzenkov <arvidjaar@gmail.com> <arvidjaar@mail.ru>
-Dan Horák <dhorak@redhat.com> <dan@danny.cz>
-John Reiser <jreiser@bitwagon.com> <jreiser@BitWagon.com>
-Luca Berra <bluca@vodka.it> <bluca@comedia.it>
+Philippe Seewer <philippe.seewer@bfh.ch> 	<philippe.seewer-omB+W0Dpw2o@public.gmane.org>
+Seewer Philippe <philippe.seewer@bfh.ch> 	<philippe.seewer@bfh.ch>
+Philippe Seewer <philippe.seewer@bfh.ch> 	<philippe.seewer@bfh.ch>
+Victor Lowther <victor.lowther@gmail.com> 	<victor.lowther-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+Harald Hoyer <harald@redhat.com> 		<harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+Harald Hoyer <harald@redhat.com> 		<harald@eeepc.(none)>
+Mike Snitzer <snitzer@redhat.com> 		<msnitzer@redhat.com>
+Amerigo Wang <amwang@redhat.com> 		<xiyou.wangcong@gmail.com>
+Andrey Borzenkov <arvidjaar@gmail.com> 		<arvidjaar@mail.ru>
+Dan Horák <dhorak@redhat.com> 			<dan@danny.cz>
+John Reiser <jreiser@bitwagon.com> 		<jreiser@BitWagon.com>
+Luca Berra <bluca@vodka.it> 			<bluca@comedia.it>
+Dave Young <dyoung@redhat.com>	 		dyoung@redhat.com
+Frederick Grose <fgrose@sugarlabs.org> 		<fgrose@gmail.com>
+Frederic Crozat <fcrozat@suse.com> 		<fcrozat@mandriva.com>

50-dracut.install

@@ -2,14 +2,31 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
+if [[ -f /etc/kernel/cmdline ]]; then
+    readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
+fi
+
+if ! [[ "${BOOT_OPTIONS[@]}" ]]; then
+    readarray -t BOOT_OPTIONS < /proc/cmdline
+fi
+
+unset noimageifnotneeded
+
+for ((i=0; i < "${#BOOT_OPTIONS[@]}"; i++)); do
+    if [[ ${BOOT_OPTIONS[$i]} == root\=PARTUUID\=* ]]; then
+        noimageifnotneeded="yes"
+        break
+    fi
+done
+
 ret=0
 case "$1" in
     add)
-	dracut "$3"/initrd "$2"
+	dracut ${noimageifnotneeded:+--noimageifnotneeded} "$3"/initrd "$2"
         ret=$?
 	;;
     remove)
-        rm -f "$3"/initrd
+        rm -f -- "$3"/initrd
         ret=$?
 	;;
 esac

51-dracut-rescue-postinst.sh

@@ -0,0 +1,70 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+export LANG=C
+
+KERNEL_VERSION="$1"
+KERNEL_IMAGE="$2"
+
+[[ -f /etc/os-release ]] && . /etc/os-release
+
+if [[ ! -f /etc/machine-id ]] || [[ ! -s /etc/machine-id ]]; then
+    systemd-machine-id-setup
+fi
+
+[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
+
+[[ $MACHINE_ID ]] || exit 1
+[[ -f $KERNEL_IMAGE ]] || exit 1
+
+INITRDFILE="/boot/initramfs-0-rescue-${MACHINE_ID}.img"
+NEW_KERNEL_IMAGE="${KERNEL_IMAGE%/*}/vmlinuz-0-rescue-${MACHINE_ID}"
+
+[[ -f $INITRDFILE ]] && [[ -f $NEW_KERNEL_IMAGE ]] && exit 0
+
+dropindirs_sort()
+{
+    suffix=$1; shift
+    args=("$@")
+    files=$(
+        while (( $# > 0 )); do
+            for i in ${1}/*${suffix}; do
+                [[ -f $i ]] && echo ${i##*/}
+            done
+            shift
+        done | sort -Vu
+    )
+
+    for f in $files; do
+        for d in "${args[@]}"; do
+            if [[ -f "$d/$f" ]]; then
+                echo "$d/$f"
+                continue 2
+            fi
+        done
+    done
+}
+
+# source our config dir
+for f in $(dropindirs_sort ".conf" "/etc/dracut.conf.d" "/usr/lib/dracut/dracut.conf.d"); do
+    [[ -e $f ]] && . "$f"
+done
+
+[[ $dracut_rescue_image != "yes" ]] && exit 0
+
+if [[ ! -f $INITRDFILE ]]; then
+    dracut --no-hostonly -a "rescue" "$INITRDFILE" "$KERNEL_VERSION"
+    ((ret+=$?))
+fi
+
+if [[ ! -f $NEW_KERNEL_IMAGE ]]; then
+    cp "$KERNEL_IMAGE" "$NEW_KERNEL_IMAGE"
+    ((ret+=$?))
+fi
+
+new-kernel-pkg --install "$KERNEL_VERSION" --kernel-image "$NEW_KERNEL_IMAGE" --initrdfile "$INITRDFILE" --banner "$NAME $VERSION_ID Rescue $MACHINE_ID"
+
+((ret+=$?))
+
+exit $ret

51-dracut-rescue.install

@@ -0,0 +1,103 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+export LANG=C
+
+COMMAND="$1"
+KERNEL_VERSION="$2"
+BOOT_DIR_ABS="${3%/*}/0-rescue"
+KERNEL_IMAGE="$4"
+
+
+dropindirs_sort()
+{
+    suffix=$1; shift
+    args=("$@")
+    files=$(
+        while (( $# > 0 )); do
+            for i in ${1}/*${suffix}; do
+                [[ -f $i ]] && echo ${i##*/}
+            done
+            shift
+        done | sort -Vu
+    )
+
+    for f in $files; do
+        for d in "${args[@]}"; do
+            if [[ -f "$d/$f" ]]; then
+                echo "$d/$f"
+                continue 2
+            fi
+        done
+    done
+}
+
+[[ -f /etc/os-release ]] && . /etc/os-release
+
+if [[ ! -f /etc/machine-id ]] || [[ ! -s /etc/machine-id ]]; then
+    systemd-machine-id-setup
+fi
+
+[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
+
+if [[ -f /etc/kernel/cmdline ]]; then
+    readarray -t BOOT_OPTIONS < /etc/kernel/cmdline
+fi
+if ! [[ "${BOOT_OPTIONS[@]}" ]]; then
+    readarray -t BOOT_OPTIONS < /proc/cmdline
+fi
+if ! [[ $BOOT_OPTIONS ]]; then
+    exit 1
+fi
+
+LOADER_ENTRY="/boot/loader/entries/${MACHINE_ID}-0-rescue.conf"
+BOOT_DIR="/${MACHINE_ID}/0-rescue"
+
+ret=0
+
+case "$COMMAND" in
+    add)
+        for i in "/boot/loader/entries/${MACHINE_ID}-0-rescue.conf"; do
+            [[ -f $i ]] && exit 0
+        done
+
+        # source our config dir
+        for f in $(dropindirs_sort ".conf" "/etc/dracut.conf.d" "/usr/lib/dracut/dracut.conf.d"); do
+            [[ -e $f ]] && . "$f"
+        done
+
+        [[ $dracut_rescue_image != "yes" ]] && exit 0
+
+        [[ -d "$BOOT_DIR_ABS" ]] || mkdir -p "$BOOT_DIR_ABS"
+
+        if ! cp "$KERNEL_IMAGE" "$BOOT_DIR_ABS"/linux; then
+            echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/linux'!" >&2
+        fi
+
+        dracut --no-hostonly  -a "rescue" "$BOOT_DIR_ABS"/initrd "$2"
+        ((ret+=$?))
+
+        {
+            echo "title      $PRETTY_NAME - Rescue Image"
+            echo "version    $KERNEL_VERSION"
+            echo "machine-id $MACHINE_ID"
+            echo "options    ${BOOT_OPTIONS[@]} rd.auto=1"
+            echo "linux      $BOOT_DIR/linux"
+            echo "initrd     $BOOT_DIR/initrd"
+        } > $LOADER_ENTRY
+        ((ret+=$?))
+        ;;
+
+    remove)
+        exit 0
+        ;;
+
+    *)
+        usage
+        ret=1;;
+esac
+
+((ret+=$?))
+
+exit $ret

AUTHORS

@@ -1,69 +1,84 @@
 Harald Hoyer <harald@redhat.com>
 Victor Lowther <victor.lowther@gmail.com>
 Amadeusz Żołnowski <aidecoe@aidecoe.name>
+Will Woods <wwoods@redhat.com>
 Philippe Seewer <philippe.seewer@bfh.ch>
 Warren Togami <wtogami@redhat.com>
-Will Woods <wwoods@redhat.com>
 Jeremy Katz <katzj@redhat.com>
+Dave Young <dyoung@redhat.com>
 David Dillow <dave@thedillows.org>
 Michal Soltys <soltys@ziu.info>
 Amerigo Wang <amwang@redhat.com>
-Dave Young <dyoung@redhat.com>
 Colin Guthrie <colin@mageia.org>
 Andrey Borzenkov <arvidjaar@gmail.com>
+Peter Jones <pjones@redhat.com>
 Andreas Thienemann <andreas@bawue.net>
 Hans de Goede <hdegoede@redhat.com>
-Peter Jones <pjones@redhat.com>
 John Reiser <jreiser@bitwagon.com>
 Luca Berra <bluca@vodka.it>
+WANG Chao <chaowang@redhat.com>
 Daniel Drake <dsd@laptop.org>
+Dan Horák <dhorak@redhat.com>
+Baoquan He <bhe@redhat.com>
 Leho Kraav <leho@kraav.com>
 Brian C. Lane <bcl@redhat.com>
+Kamil Rytarowski <n54@gmx.com>
 Marc Grimme <grimme@atix.de>
 Chao Wang <chaowang@redhat.com>
-Dan Horák <dhorak@redhat.com>
+Frederic Crozat <fcrozat@suse.com>
 Jesse Keating <jkeating@redhat.com>
 Milan Broz <mbroz@redhat.com>
+Radek Vykydal <rvykydal@redhat.com>
 Roberto Sassu <roberto.sassu@polito.it>
-dyoung@redhat.com <dyoung@redhat.com>
 Anton Blanchard <anton@samba.org>
 Bill Nottingham <notting@redhat.com>
+Colin Walters <walters@verbum.org>
 David Cantrell <dcantrell@redhat.com>
-Frederic Crozat <fcrozat@suse.com>
+Dennis Gilmore <dennis@ausil.us>
 Jon Ander Hernandez <jonan.h@gmail.com>
 Juan RP <xtraeme@gmail.com>
 Lance Albertson <lance@osuosl.org>
 Marian Ganisin <mganisin@redhat.com>
 Michael Ploujnikov <plouj@somanetworks.com>
 Peter Rajnoha <prajnoha@redhat.com>
+Wim Muskee <wimmuskee@gmail.com>
 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
 Alan Pevec <apevec@redhat.com>
-Colin Walters <walters@verbum.org>
-Dennis Gilmore <dennis@ausil.us>
+Frederick Grose <fgrose@sugarlabs.org>
 Ian Dall <ian@beware.dropbear.id.au>
 James Buren <ryuo@frugalware.org>
+James Lee <jlee@thestaticvoid.com>
 Joey Boggs <jboggs@redhat.com>
+Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 Mike Snitzer <snitzer@redhat.com>
 Przemysław Rudy <prudy1@o2.pl>
+Stefan Reimer <it@startux.de>
 Thomas Lange <lange@informatik.uni-koeln.de>
 Vivek Goyal <vgoyal@redhat.com>
 Vladislav Bogdanov <bubble@hoster-ok.com>
-Wim Muskee <wimmuskee@gmail.com>
+Adam Williamson <awilliam@redhat.com>
 Alexander Todorov <atodorov@redhat.com>
 Andy Lutomirski <luto@mit.edu>
 Anssi Hannula <anssi@mageia.org>
+Brandon Philips <brandon@ifup.co>
 Canek Peláez Valdés <caneko@gmail.com>
 Chris Leech <cleech@redhat.com>
 Christian Heinz <christian.ch.heinz@gmail.com>
+Cong Wang <amwang@redhat.com>
+Daniel Schaal <farbing@web.de>
 Dave Jones <davej@redhat.com>
+Dave Young <dave@redhat.com>
+Dennis Schridde <devurandom@gmx.net>
 Duane Griffin <duaneg@dghda.com>
-Frederic Crozat <fcrozat@mandriva.com>
-Frederick Grose <fgrose@gmail.com>
 Glen Gray <slaine@slaine.org>
 Hermann Gausterer <git-dracut-2012@mrq1.org>
 James Laska <jlaska@redhat.com>
 Jan Stodola <jstodola@redhat.com>
-Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Jiri Pirko <jiri@resnulli.us>
+Joe Lawrence <Joe.Lawrence@stratus.com>
+Kevin Yung <Kevin.Yung@myob.com>
+Kyle McMartin <kyle@redhat.com>
+Lars R. Damerow <lars@pixar.com>
 Lennert Buytenhek <buytenh@wantstofly.org>
 Lubomir Rintel <lkundrak@v3.sk>
 Matt <smoothsailing72@hotmail.com>
@@ -71,17 +86,18 @@ Matt Smith <shadowfax@gmx.com>
 Michal Schmidt <mschmidt@redhat.com>
 Mike Gorse <mgorse@suse.com>
 Munehiro Matsuda <haro@kgt.co.jp>
+Nicolas Chauvet <kwizart@gmail.com>
 Nikoli <nikoli@lavabit.com>
 Olivier Blin <dev@blino.org>
 Paolo Bonzini <pbonzini@redhat.com>
 Peter Robinson <pbrobinson@fedoraproject.org>
 Pádraig Brady <P@draigBrady.com>
 Quentin Armitage <quentin@armitage.org.uk>
-Radek Vykydal <rvykydal@redhat.com>
+Robert Buchholz <rbu@goodpoint.de>
 Sergey Fionov <fionov@gmail.com>
 Srinivasa T N <seenutn@linux.vnet.ibm.com>
-Stefan Reimer <it@startux.de>
 Thilo Bangert <thilo.bangert@gmx.net>
+Thomas Backlund <tmb@mageia.org>
 Tomasz Torcz <tomek@pipebreaker.pl>
 Vadim Kuznetsov <vadimk@gentoo.org>
 Ville Skyttä <ville.skytta@iki.fi>

Makefile

@@ -1,5 +1,7 @@
-VERSION=026
-GITVERSION=$(shell [ -d .git ] && git rev-list  --abbrev-commit  -n 1 HEAD  |cut -b 1-8)
+-include dracut-version.sh
+
+VERSION = $(shell [ -d .git ] && git describe --abbrev=0 --tags 2>/dev/null || echo $(DRACUT_VERSION))
+GITVERSION = $(shell [ -d .git ] && { v=$$(git describe --tags 2>/dev/null); [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
 
 -include Makefile.inc
 
@@ -11,13 +13,16 @@ sysconfdir ?= ${prefix}/etc
 bindir ?= ${prefix}/bin
 mandir ?= ${prefix}/share/man
 CFLAGS ?= -O2 -g -Wall
-CFLAGS += -std=gnu99
+CFLAGS += -std=gnu99  -D_FILE_OFFSET_BITS=64
+bashcompletiondir ?= ${datadir}/bash-completion/completions
 
 man1pages = lsinitrd.1
 
 man5pages = dracut.conf.5
 
-man7pages = dracut.cmdline.7
+man7pages = dracut.cmdline.7 \
+            dracut.bootup.7 \
+            dracut.modules.7
 
 man8pages = dracut.8 \
             dracut-catimages.8 \
@@ -25,18 +30,17 @@ man8pages = dracut.8 \
             modules.d/98systemd/dracut-cmdline.service.8 \
             modules.d/98systemd/dracut-initqueue.service.8 \
             modules.d/98systemd/dracut-mount.service.8 \
+            modules.d/98systemd/dracut-shutdown.service.8 \
             modules.d/98systemd/dracut-pre-mount.service.8 \
             modules.d/98systemd/dracut-pre-pivot.service.8 \
             modules.d/98systemd/dracut-pre-trigger.service.8 \
-            modules.d/98systemd/dracut-pre-udev.service.8 \
-            modules.d/98systemd/udevadm-cleanup-db.service.8
+            modules.d/98systemd/dracut-pre-udev.service.8
 
 manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
 
+.PHONY: install clean archive rpm testimage test all check AUTHORS doc dracut-version.sh
 
-.PHONY: install clean archive rpm testimage test all check AUTHORS doc
-
-all: syncheck dracut-version.sh dracut-install
+all: dracut-version.sh dracut-install skipcpio/skipcpio
 
 DRACUT_INSTALL_OBJECTS = \
         install/dracut-install.o \
@@ -57,8 +61,15 @@ install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
 dracut-install: install/dracut-install
 	ln -fs $< $@
 
+SKIPCPIO_OBJECTS= \
+	skipcpio/skipcpio.o
+
+skipcpio/skipcpio.o: skipcpio/skipcpio.c
+skipcpio/skipcpio: skipcpio/skipcpio.o
+
 indent:
 	indent -i8 -nut -br -linux -l120 install/dracut-install.c
+	indent -i8 -nut -br -linux -l120 skipcpio/skipcpio.c
 
 doc: $(manpages) dracut.html
 
@@ -72,13 +83,15 @@ endif
 %.xml: %.asc
 	asciidoc -d manpage -b docbook -o $@ $<
 
-dracut.html: dracut.asc $(manpages)
+dracut.8: dracut.usage.asc dracut.8.asc
+
+dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
 	asciidoc -a numbered -d book -b docbook -o dracut.xml dracut.asc
 	xsltproc -o dracut.html --xinclude -nonet \
-		--stringparam html.stylesheet \
-		http://docs.fedoraproject.org/en-US/Common_Content/css/default.css \
+		--stringparam custom.css.source dracut.css \
+		--stringparam generate.css.header 1 \
 		http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml
-	rm dracut.xml
+	rm -f -- dracut.xml
 
 install: dracut-version.sh
 	mkdir -p $(DESTDIR)$(pkglibdir)
@@ -93,6 +106,7 @@ install: dracut-version.sh
 	install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
 	mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
 	mkdir -p $(DESTDIR)$(pkglibdir)/dracut.conf.d
+	install -m 0755 dracut-init.sh $(DESTDIR)$(pkglibdir)/dracut-init.sh
 	install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh
 	install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh
 	ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions
@@ -108,19 +122,40 @@ ifneq ($(enable_documentation),no)
 endif
 	if [ -n "$(systemdsystemunitdir)" ]; then \
 		mkdir -p $(DESTDIR)$(systemdsystemunitdir); \
-		install -m 0644 dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir); \
+		ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98systemd/dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir)/dracut-shutdown.service; \
 		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants; \
 		ln -s ../dracut-shutdown.service \
 		$(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants/dracut-shutdown.service; \
+		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants; \
+		for i in \
+		    dracut-cmdline.service \
+		    dracut-initqueue.service \
+		    dracut-mount.service \
+		    dracut-pre-mount.service \
+		    dracut-pre-pivot.service \
+		    dracut-pre-trigger.service \
+		    dracut-pre-udev.service \
+		    ; do \
+			ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98systemd/$$i $(DESTDIR)$(systemdsystemunitdir); \
+			ln -s ../$$i \
+			$(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants/$$i; \
+		done \
 	fi
 	if [ -f install/dracut-install ]; then \
 		install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
 	fi
+	if [ -f skipcpio/skipcpio ]; then \
+		install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
+	fi
 	mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d
 	install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
+	install -m 0755 51-dracut-rescue.install $(DESTDIR)${prefix}/lib/kernel/install.d/51-dracut-rescue.install
+	mkdir -p $(DESTDIR)${bashcompletiondir}
+	install -m 0644 dracut-bash-completion.sh $(DESTDIR)${bashcompletiondir}/dracut
+	install -m 0644 lsinitrd-bash-completion.sh $(DESTDIR)${bashcompletiondir}/lsinitrd
 
 dracut-version.sh:
-	@echo "DRACUT_VERSION=$(VERSION)-$(GITVERSION)" > dracut-version.sh
+	@echo "DRACUT_VERSION=$(VERSION)$(GITVERSION)" > dracut-version.sh
 
 clean:
 	$(RM) *~
@@ -129,45 +164,46 @@ clean:
 	$(RM) $(manpages:%=%.xml) dracut.xml
 	$(RM) test-*.img
 	$(RM) dracut-*.rpm dracut-*.tar.bz2
+	$(RM) dracut-version.sh
 	$(RM) dracut-install install/dracut-install $(DRACUT_INSTALL_OBJECTS)
+	$(RM) skipcpio/skipcpio $(SKIPCPIO_OBJECTS)
 	$(RM) $(manpages) dracut.html
 	$(MAKE) -C test clean
 
-archive: dracut-$(VERSION)-$(GITVERSION).tar.bz2
-
 dist: dracut-$(VERSION).tar.bz2
 
-dracut-$(VERSION).tar.bz2: doc
+dracut-$(VERSION).tar.bz2: doc syncheck
+	@echo "DRACUT_VERSION=$(VERSION)" > dracut-version.sh
 	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ > dracut-$(VERSION).tar
 	mkdir -p dracut-$(VERSION)
-	cp $(manpages) dracut.html dracut-$(VERSION)
-	tar -rf dracut-$(VERSION).tar dracut-$(VERSION)/*.[0-9] dracut-$(VERSION)/dracut.html
-	rm -fr dracut-$(VERSION).tar.bz2 dracut-$(VERSION)
+	for i in $(manpages) dracut.html dracut-version.sh; do [ "$${i%/*}" != "$$i" ] && mkdir -p "dracut-$(VERSION)/$${i%/*}"; cp "$$i" "dracut-$(VERSION)/$$i"; done
+	tar --owner=root --group=root -rf dracut-$(VERSION).tar $$(find dracut-$(VERSION) -type f)
+	rm -fr -- dracut-$(VERSION).tar.bz2 dracut-$(VERSION)
 	bzip2 -9 dracut-$(VERSION).tar
-	rm -f dracut-$(VERSION).tar
+	rm -f -- dracut-$(VERSION).tar
 
-rpm: dracut-$(VERSION).tar.bz2
+rpm: dracut-$(VERSION).tar.bz2 syncheck
 	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
 	cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \
 	LC_MESSAGES=C $$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
 	(cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
 	        --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
 		--define "_rpmdir $$PWD" -ba dracut.spec; ) && \
-	( mv "$$rpmbuild"/$$(arch)/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr "$$rpmbuild"; ls *.rpm )
+	( mv "$$rpmbuild"/$$(arch)/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr -- "$$rpmbuild"; ls *.rpm )
 
 syncheck:
-	@ret=0;for i in dracut-initramfs-restore.sh dracut-logger.sh \
-                        modules.d/99base/init.sh modules.d/*/*.sh; do \
+	@ret=0;for i in dracut-initramfs-restore.sh modules.d/*/*.sh; do \
                 [ "$${i##*/}" = "module-setup.sh" ] && continue; \
                 read line < "$$i"; [ "$${line#*bash*}" != "$$line" ] && continue; \
-		dash -n "$$i" ; ret=$$(($$ret+$$?)); \
+		[ $$V ] && echo "posix syntax check: $$i"; bash --posix -n "$$i" ; ret=$$(($$ret+$$?)); \
+		[ $$V ] && echo "checking for [[: $$i"; if grep -Fq '[[ ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains [["; fi \
 	done;exit $$ret
 	@ret=0;for i in *.sh mkinitrd-dracut.sh modules.d/*/*.sh \
 	                modules.d/*/module-setup.sh; do \
-		bash -n "$$i" ; ret=$$(($$ret+$$?)); \
+		[ $$V ] && echo "bash syntax check: $$i"; bash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret
 
-check: all syncheck
+check: all syncheck rpm
 	@[ "$$EUID" == "0" ] || { echo "'check' must be run as root! Please use 'sudo'."; exit 1; }
 	@$(MAKE) -C test check
 
@@ -182,7 +218,7 @@ testimages: all
 	@echo wrote  test-dracut.img
 
 hostimage: all
-	./dracut.sh -H -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
+	./dracut.sh -H -l -f test-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img
 
 AUTHORS:

NEWS

@@ -1,3 +1,189 @@
+dracut-033
+==========
+- improved hostonly device recognition
+- improved hostonly module recognition
+- add dracut.css for dracut.html
+- do not install udev rules from /etc in generic mode
+- fixed LABEL= parsing for swap devices
+- fixed iBFT network setup
+- url-lib.sh: handle 0-size files with curl
+- dracut.asc: document debugging dracut on shutdown
+- if rd.md=0, use dmraid for imsm and ddf
+- skip empty dracut modules
+- removed caching of kernel cmdline
+- fixed iso-scan, if the loop device driver is a kernel module
+- bcache: support new blkid
+- fixed ifup udev rules
+- ifup with dhcp, if no "ip=" specified for the interface
+
+dracut-032
+==========
+- add parameter --print-cmdline
+    This prints the kernel command line parameters for the current disk
+    layout.
+    $ dracut --print-cmdline
+    rd.luks.uuid=luks-e68c8906-6542-4a26-83c4-91b4dd9f0471
+    rd.lvm.lv=debian/root rd.lvm.lv=debian/usr root=/dev/mapper/debian-root
+    rootflags=rw,relatime,errors=remount-ro,user_xattr,barrier=1,data=ordered
+    rootfstype=ext4
+- dracut.sh: add --persistent-policy option and persistent_policy conf option
+    --persistent-policy <policy>:
+        Use <policy> to address disks and partitions.
+        <policy> can be any directory name found in /dev/disk.
+        E.g. "by-uuid", "by-label"
+- dracut now creates the initramfs without udevadm
+  that means the udev database does not have to populated
+  and the initramfs can be built in a chroot with
+  /sys /dev /proc mounted
+- renamed dracut_install() to inst_multiple() for consistent naming
+- if $libdirs is unset, fall back to ld.so.cache paths
+- always assemble /usr device in initramfs
+- bash module added (disable it, if you really want dash)
+- continue to boot, if the main loop times out, in systemd mode
+- removed inst*() shell pure versions, dracut-install binary is in charge now
+- fixed ifcfg file generation for vlan
+- do not include adjtime and localtime anymore
+- fixed generation of zfcp.conf of CMS setups
+- install vt102 terminfo
+  dracut_install() is still there for backwards compat
+- do not strip files in FIPS mode
+- fixed iBFT interface configuration
+- fs-lib: install fsck and fsck.ext*
+- shutdown: fixed killall_proc_mountpoint()
+- network: also wait for ethernet interfaces to setup
+- fixed checking for FIPS mode
+
+Contributions from:
+Harald Hoyer
+WANG Chao
+Baoquan He
+Daniel Schaal
+Dave Young
+James Lee
+Radek Vykydal
+
+
+dracut-031
+==========
+- do not include the resume dracut module in hostonly mode,
+  if no swap is present
+- don't warn twice about omitted modules
+- use systemd-cat for logging on systemd systems, if logfile is unset
+- fixed PARTUUID parsing
+- support kernel module signing keys
+- do not install the usrmount dracut module in hostonly mode,
+  if /sbin/init does not live in /usr
+- add debian udev rule files
+- add support for bcache
+- network: handle bootif style interfaces
+  e.g. ip=77-77-6f-6f-64-73:dhcp
+- add support for kmod static devnodes
+- add vlan support for iBFT
+
+Contributions from:
+Harald Hoyer
+Amadeusz Żołnowski
+Brandon Philips
+Colin Walters
+James Lee
+Kyle McMartin
+Peter Jones
+
+dracut-030
+==========
+- support new persistent network interface names
+- fix findmnt calls, prevents hang on stale NFS mounts
+- add systemd.slice and slice.target units
+- major shell cleanup
+- support root=PARTLABEL= and root=PARTUUID=
+- terminfo: only install l/linux v/vt100 and v/vt220
+- unset all LC_* and LANG, 10% faster
+- fixed dependency loop for dracut-cmdline.service
+- do not wait_for_dev for the root devices
+- do not wait_for_dev for devices, if dracut-initqueue is not needed
+- support early microcode loading with --early-microcode
+- dmraid, let dmraid setup its own partitions
+- sosreport renamed to rdsosreport
+
+Contributions from:
+Harald Hoyer
+Konrad Rzeszutek Wilk
+WANG Chao
+
+dracut-029
+==========
+- wait for IPv6 autoconfiguration
+- i18n: make the default font configurable
+  To set the default font for your distribution, add
+  i18n_default_font="latarcyrheb-sun16"
+  to your /lib/dracut/dracut.conf.d/01-dist.conf distribution config.
+- proper handle "rd.break" in systemd mode before switch-root
+- systemd: make unit files symlinks
+- build without dash requirement
+- add dracut-shutdown.service.8 manpage
+- handle MACs for "ip="
+  "ip=77-77-6f-6f-64-73:dhcp"
+- don't explode when mixing BOOTIF and ip=
+- 90lvm/module-setup.sh: redirect error message of lvs to /dev/null
+
+Contributions from:
+Harald Hoyer
+Will Woods
+Baoquan He
+
+dracut-028
+==========
+- full integration of crypto devs in systemd logic
+- support for bridge over team and vlan tagged team
+- support multiple bonding interfaces
+- new kernel command line param "rd.action_on_fail"
+  to control the emergency action
+- support for bridge over a vlan tagged interface
+- support for "iso-scan/filename" kernel parameter
+- lsinitrd got some love and does not use "file" anymore
+- fixed issue with noexec mounted tmp dirs
+- FIPS mode fixed
+- dracut_install got some love
+- fixed some /usr mounting problems
+- ifcfg dracut module got some love and fixes
+- default installed font is now latarcyrheb-sun16
+- new parameters rd.live.dir and rd.live.squashimg
+- lvm: add tools for thin provisioning
+- also install non-hwcap libs
+- setup correct system time and time zone in initrd
+- s390: fixed cms setup
+- add systemd-udevd persistent network interface naming
+
+Contributions from:
+Harald Hoyer
+Kamil Rytarowski
+WANG Chao
+Baoquan He
+Adam Williamson
+Colin Guthrie
+Dan Horák
+Dave Young
+Dennis Gilmore
+Dennis Schridde
+
+dracut-027
+==========
+- dracut now has bash-completion
+- require bash version 4
+- systemd module now requires systemd >= 199
+- dracut makes use of native systemd initrd units
+- added hooks for new-kernel-pkg and kernel-install
+- hostonly is now default for fedora
+- comply with the BootLoaderSpec paths
+  http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
+- added rescue module
+- host_fs_types is now a hashmap
+- new dracut argument "--regenerate-all"
+- new dracut argument "--noimageifnotneeded"
+- new man page dracut.bootup
+- install all host filesystem drivers
+- use -D_FILE_OFFSET_BITS=64 to build dracut-install
+
 dracut-026
 ==========
 - introduce /usr/lib/dracut/dracut.conf.d/ drop-in directory

README.testsuite

@@ -1,14 +1,16 @@
 For the testsuite to work, you will have to install at least the following software packages:
-dash
-asciidoc
-mdadm
-lvm2
-cryptsetup
-nfs-utils
-netbsd-iscsi
-nbd
-dhcp (dhcp-server on openSUSE)
+dash \
+bridge-utils \
+asciidoc \
+mdadm \
+lvm2 \
+cryptsetup \
+nfs-utils \
+nbd \
+dhcp-server \
+scsi-target-utils \
 iscsi-initiator-utils
+
 TEST-04-FULL-SYSTEMD: systemd >= 187
 
 How to run the testsuite:

TODO

@@ -22,15 +22,16 @@ INITRAMFS TODO
 
 GENERATOR TODO
 
+- remove wait for swap devs, if no "resume=" is given on the kernel command line
 - add presets (predefined set of modules)
 - add interpreter/plugin-scripts to be sourced at the beginning or end (can use dracut-functions)
-- provide "installkernel" and "new-kernel-pkg"
 - add mechanism for module specific command line options
 - pkg-config integration, to make it easy for other packages to use us.
-- add recovery image creator (mkrecovery)
 - default module specification could use some work
 - udev rule copying, as mentioned above, is a bit too hard-coded
 
+- dracut-install parse LD_SHOW_AUXV="" AT_PLATFORM for lib install
+
 CODE TODO
 
 - document more functions

configure

@@ -25,6 +25,7 @@ read_arg() {
         # return 1 to indicate they should do it instead.
         return 1
     fi
+    return 0
 }
 
 while (($# > 0)); do
@@ -36,18 +37,42 @@ while (($# > 0)); do
         --sbindir) read_arg sbindir "$@" || shift;;
         --mandir) read_arg mandir "$@" || shift;;
         --disable-documentation) enable_documentation=no;;
+        --program-prefix) read_arg programprefix "$@" || shift;;
+        --exec-prefix) read_arg execprefix "$@" || shift;;
+        --bindir) read_arg bindir "$@" || shift;;
+        --includedir) read_arg includedir "$@" || shift;;
+        --libexecdir) read_arg libexecdir "$@" || shift;;
+        --localstatedir) read_arg localstatedir "$@" || shift;;
+        --sharedstatedir) read_arg sharedstatedir "$@" || shift;;
+        --infodir) read_arg infodir "$@" || shift;;
+        --systemdsystemunitdir) read_arg systemdsystemunitdir "$@" || shift;;
+        --bashcompletiondir) read_arg bashcompletiondir "$@" || shift;;
         *) echo "Ignoring unknown option '$1'";;
     esac
     shift
 done
 
-cat > Makefile.inc.tmp <<EOF
+cat > Makefile.inc.$$ <<EOF
 prefix ?= ${prefix}
 libdir ?= ${libdir:-${prefix}/lib}
 datadir ?= ${datadir:-${prefix}/share}
 sysconfdir ?= ${sysconfdir:-${prefix}/etc}
 sbindir ?= ${sbindir:-${prefix}/sbin}
 mandir ?= ${mandir:-${prefix}/share/man}
-enable_documentation ?= ${enable_documentation}
+enable_documentation ?= ${enable_documentation:-yes}
+bindir ?= ${bindir:-${prefix}/bin}
 EOF
-mv Makefile.inc.tmp Makefile.inc
+
+{
+    [[ $programprefix ]] && echo "programprefix ?= ${programprefix}"
+    [[ $execprefix ]] && echo "execprefix ?= ${execprefix}"
+    [[ $includedir ]] && echo "includedir ?= ${includedir}"
+    [[ $libexecdir ]] && echo "libexecdir ?= ${libexecdir}"
+    [[ $localstatedir ]] && echo "localstatedir ?= ${localstatedir}"
+    [[ $sharedstatedir ]] && echo "sharedstatedir ?= ${sharedstatedir}"
+    [[ $infodir ]] && echo "infodir ?= ${infodir}"
+    [[ $systemdsystemunitdir ]] && echo "systemdsystemunitdir ?= ${systemdsystemunitdir}"
+    [[ $bashcompletiondir ]] && echo "bashcompletiondir ?= ${bashcompletiondir}"
+} >> Makefile.inc.$$
+
+mv Makefile.inc.$$ Makefile.inc

dracut-bash-completion.sh

@@ -0,0 +1,79 @@
+#
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Copyright 2013 Red Hat, Inc.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+__contains_word () {
+        local word=$1; shift
+        for w in $*; do [[ $w = $word ]] && return 0; done
+        return 1
+}
+
+_dracut() {
+        local field_vals= cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+        local -A OPTS=(
+                [STANDALONE]='-f -v -q -l -H -h -M -N
+                              --ro-mnt --force --kernel-only --no-kernel --strip --nostrip
+                              --hardlink --nohardlink --noprefix --mdadmconf --nomdadmconf
+                              --lvmconf --nolvmconf --debug --profile --verbose --quiet
+                              --local --hostonly --no-hostonly --fstab --help --bzip2 --lzma
+                              --xz --no-compress --gzip --list-modules --show-modules --keep
+                              --printsize --regenerate-all --noimageifnotneeded --early-microcode
+                              --no-early-microcode --print-cmdline --prelink --noprelink'
+
+                       [ARG]='-a -m -o -d -I -k -c -L --kver --add --force-add --add-drivers
+                              --omit-drivers --modules --omit --drivers --filesystems --install
+                              --fwdir --libdirs --fscks --add-fstab --mount --device --nofscks
+                              --kmoddir --conf --confdir --tmpdir --stdlog --compress --prefix
+                              --kernel-cmdline --sshkey --persistent-policy'
+        )
+
+        if __contains_word "$prev" ${OPTS[ARG]}; then
+                case $prev in
+                        --kmoddir|-k|--fwdir|--confdir|--tmpdir)
+                                comps=$(compgen -d -- "$cur")
+                                compopt -o filenames
+                        ;;
+                        -c|--conf|--sshkey|--add-fstab|--add-device|-I|--install)
+                                comps=$(compgen -f -- "$cur")
+                                compopt -o filenames
+                        ;;
+                        -a|-m|-o|--add|--modules|--omit)
+                                comps=$(dracut --list-modules 2>/dev/null)
+                        ;;
+                        --persistent-policy)
+                                comps=$(cd /dev/disk/; echo *)
+                        ;;
+                        --kver)
+                                comps=$(cd /lib/modules; echo [0-9]*)
+                        ;;
+                        *)
+                                return 0
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+        fi
+
+        if [[ $cur = -* ]]; then
+                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+                return 0
+        fi
+}
+
+complete -F _dracut dracut

dracut-catimages.sh

@@ -118,11 +118,11 @@ fi
 images+=($@)
 
 dinfo "Using base image $baseimage"
-cat "$baseimage" > "$outfile"
+cat -- "$baseimage" > "$outfile"
 
 for i in "${images[@]}"; do
     dinfo "Appending $i"
-    cat "$i" >> "$outfile"
+    cat -- "$i" >> "$outfile"
 done
 
 dinfo "Created $outfile"

dracut-init.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# 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/>.
+#
+export LC_MESSAGES=C
+
+if [[ $DRACUT_KERNEL_LAZY ]] && ! [[ $DRACUT_KERNEL_LAZY_HASHDIR ]]; then
+    if ! [[ -d "$initdir/.kernelmodseen" ]]; then
+        mkdir -p "$initdir/.kernelmodseen"
+    fi
+    DRACUT_KERNEL_LAZY_HASHDIR="$initdir/.kernelmodseen"
+fi
+
+if [[ $initdir ]] && ! [[ -d $initdir ]]; then
+    mkdir -p "$initdir"
+fi
+
+[[ $dracutbasedir ]] || export dracutbasedir=${BASH_SOURCE%/*}
+. $dracutbasedir/dracut-functions.sh

dracut-initramfs-restore.sh

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

dracut-logger.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 et filetype=sh
 #
@@ -117,31 +117,48 @@ dlog_init() {
     if [ -z "$fileloglvl" ]; then
         [ -w "$logfile" ] && fileloglvl=4 || fileloglvl=0
     elif (( $fileloglvl > 0 )); then
-        __oldumask=$(umask)
-        umask 0377
-        ! [ -e "$logfile" ] && >"$logfile"
-        umask $__oldumask
-        if [ -w "$logfile" -a -f "$logfile" ]; then
+        if [[ $logfile ]]; then
+            __oldumask=$(umask)
+            umask 0377
+            ! [ -e "$logfile" ] && >"$logfile"
+            umask $__oldumask
+            if [ -w "$logfile" -a -f "$logfile" ]; then
             # Mark new run in the log file
-            echo >>"$logfile"
-            if command -v date >/dev/null; then
-                echo "=== $(date) ===" >>"$logfile"
+                echo >>"$logfile"
+                if command -v date >/dev/null; then
+                    echo "=== $(date) ===" >>"$logfile"
+                else
+                    echo "===============================================" >>"$logfile"
+                fi
+                echo >>"$logfile"
             else
-                echo "===============================================" >>"$logfile"
-            fi
-            echo >>"$logfile"
-        else
             # We cannot log to file, so turn this facility off.
-            fileloglvl=0
-            ret=1
-            errmsg="'$logfile' is not a writable file"
+                fileloglvl=0
+                ret=1
+                errmsg="'$logfile' is not a writable file"
+            fi
         fi
     fi
 
+    if (( $UID  != 0 )); then
+        kmsgloglvl=0
+        sysloglvl=0
+    fi
+
     if (( $sysloglvl > 0 )); then
-        if ! [ -S /dev/log -a -w /dev/log ] || ! command -v logger >/dev/null
-        then
+        if [[ -d /run/systemd/journal ]] \
+            && type -P systemd-cat &>/dev/null \
+            && systemctl --quiet is-active systemd-journald.socket &>/dev/null \
+            && { echo "dracut-$DRACUT_VERSION" | systemd-cat -t 'dracut' &>/dev/null; } ; then
+            readonly _dlogdir="$(mktemp --tmpdir="$TMPDIR/" -d -t dracut-log.XXXXXX)"
+            readonly _systemdcatfile="$_dlogdir/systemd-cat"
+            mkfifo "$_systemdcatfile"
+            readonly _dlogfd=15
+            systemd-cat -t 'dracut' --level-prefix=true <"$_systemdcatfile" &
+            exec 15>"$_systemdcatfile"
+        elif ! [ -S /dev/log -a -w /dev/log ] || ! command -v logger >/dev/null; then
             # We cannot log to syslog, so turn this facility off.
+            kmsgloglvl=$sysloglvl
             sysloglvl=0
             ret=1
             errmsg="No '/dev/log' or 'logger' included for syslog logging"
@@ -165,34 +182,34 @@ dlog_init() {
     export maxloglvl
 
 
-    if (($stdloglvl < 6)) && (($kmsgloglvl < 6)) && (($fileloglvl < 6)); then
+    if (($stdloglvl < 6)) && (($kmsgloglvl < 6)) && (($fileloglvl < 6)) && (($sysloglvl < 6)); then
         unset dtrace
         dtrace() { :; };
     fi
 
-    if (($stdloglvl < 5)) && (($kmsgloglvl < 5)) && (($fileloglvl < 5)); then
+    if (($stdloglvl < 5)) && (($kmsgloglvl < 5)) && (($fileloglvl < 5)) && (($sysloglvl < 5)); then
         unset ddebug
         ddebug() { :; };
     fi
 
-    if (($stdloglvl < 4)) && (($kmsgloglvl < 4)) && (($fileloglvl < 4)); then
+    if (($stdloglvl < 4)) && (($kmsgloglvl < 4)) && (($fileloglvl < 4)) && (($sysloglvl < 4)); then
         unset dinfo
         dinfo() { :; };
     fi
 
-    if (($stdloglvl < 3)) && (($kmsgloglvl < 3)) && (($fileloglvl < 3)); then
+    if (($stdloglvl < 3)) && (($kmsgloglvl < 3)) && (($fileloglvl < 3)) && (($sysloglvl < 3)); then
         unset dwarn
         dwarn() { :; };
         unset dwarning
         dwarning() { :; };
     fi
 
-    if (($stdloglvl < 2)) && (($kmsgloglvl < 2)) && (($fileloglvl < 2)); then
+    if (($stdloglvl < 2)) && (($kmsgloglvl < 2)) && (($fileloglvl < 2)) && (($sysloglvl < 2)); then
         unset derror
         derror() { :; };
     fi
 
-    if (($stdloglvl < 1)) && (($kmsgloglvl < 1)) && (($fileloglvl < 1)); then
+    if (($stdloglvl < 1)) && (($kmsgloglvl < 1)) && (($fileloglvl < 1)) && (($sysloglvl < 1)); then
         unset dfatal
         dfatal() { :; };
     fi
@@ -306,15 +323,23 @@ _dlvl2syslvl() {
 _do_dlog() {
     local lvl="$1"; shift
     local lvlc=$(_lvl2char "$lvl") || return 0
-    local msg="$lvlc: $*"
+    local msg="$*"
+    local lmsg="$lvlc: $*"
 
     (( $lvl <= $stdloglvl )) && echo "$msg" >&2
+
     if (( $lvl <= $sysloglvl )); then
-        logger -t "dracut[$$]" -p $(_lvl2syspri $lvl) "$msg"
+        if [[ "$_dlogfd" ]]; then
+            printf -- "<%s>%s\n" "$(($(_dlvl2syslvl $lvl) & 7))" "$msg" >&$_dlogfd
+        else
+            logger -t "dracut[$$]" -p $(_lvl2syspri $lvl) -- "$msg"
+        fi
     fi
+
     if (( $lvl <= $fileloglvl )) && [[ -w "$logfile" ]] && [[ -f "$logfile" ]]; then
-        echo "$msg" >>"$logfile"
+        echo "$lmsg" >>"$logfile"
     fi
+
     (( $lvl <= $kmsgloglvl )) && \
         echo "<$(_dlvl2syslvl $lvl)>dracut[$$] $msg" >/dev/kmsg
 }
@@ -342,7 +367,7 @@ dlog() {
     if (( $# > 1 )); then
         _do_dlog "$@"
     else
-        while read line; do
+        while read line || [ -n "$line" ]; do
             _do_dlog "$1" "$line"
         done
     fi

dracut.8.asc

@@ -10,7 +10,7 @@ dracut - low-level tool for generating an initramfs image
 
 SYNOPSIS
 --------
-*dracut* ['OPTION...'] [<image> [_<kernel version>_]]
+*dracut* [__OPTION...__] [__<image>__ [__<kernel version>__]]
 
 DESCRIPTION
 -----------
@@ -31,59 +31,16 @@ early userspace.
 For a complete list of kernel command line options see *dracut.cmdline*(7).
 
 If you are dropped to an emergency shell, while booting your initramfs,
-the file _/run/initramfs/sosreport.txt_ is created, which can be safed to a
+the file _/run/initramfs/rdsosreport.txt_ is created, which can be safed to a
 (to be mounted by hand) partition (usually /boot) or a USB stick.
-Additional debugging info can be produced by adding **rd.debug** to the kernel command line.
-_/run/initramfs/sosreport.txt_ contains all logs and the output of some tools.
-It should be attached to any report about dracut problems.
+Additional debugging info can be produced by adding **rd.debug** to the kernel
+command line. _/run/initramfs/rdsosreport.txt_ contains all logs and the output
+of some tools. It should be attached to any report about dracut problems.
 
-EXAMPLE
--------
-
-To create a initramfs image, the most simple command is:
-----
-# dracut
-----
-
-This will generate a general purpose initramfs image, with all possible
-functionality resulting of the combination of the installed dracut modules and
-system tools. The image is /boot/initramfs-_++<kernel version>++_.img and
-contains the kernel modules of the currently active kernel with version
-_++<kernel version>++_.
-
-If the initramfs image already exists, dracut will display an error message, and
-to overwrite the existing image, you have to use the --force option.
-----
-# dracut --force
-----
-
-If you want to specify another filename for the resulting image you would issue
-a command like:
-----
-# dracut foobar.img
-----
-
-To generate an image for a specific kernel version, the command would be:
-----
-# dracut foobar.img 2.6.40-1.rc5.f20
-----
-
-A shortcut to generate the image at the default location for a specific kernel
-version is:
-----
-# dracut --kver 2.6.40-1.rc5.f20
-----
-
-If you want to create lighter, smaller initramfs images, you may want to specify
-the --host-only or -H option. Using this option, the resulting image will
-contain only those dracut modules, kernel modules and filesystems, which are
-needed to boot this specific machine. This has the drawback, that you can't put
-the disk on another controller or machine, and that you can't switch to another
-root filesystem, without recreating the initramfs image. The usage of the
---host-only option is only for experts and you will have to keep the broken
-pieces. At least keep a copy of a general purpose image (and corresponding
-kernel) as a fallback to rescue your system.
+USAGE
+-----
 
+include::dracut.usage.asc[]
 
 OPTIONS
 -------
@@ -225,6 +182,15 @@ example:
 **--no-kernel**::
     do not install kernel drivers and firmware files
 
+**--early-microcode**::
+    Combine early microcode with ramdisk
+
+**--no-early-microcode**::
+    Do not combine early microcode with ramdisk
+
+**--print-cmdline**::
+    print the kernel command line for the current disk layout
+
 **--mdadmconf**::
     include local _/etc/mdadm.conf_
 
@@ -260,6 +226,12 @@ example:
 **--nostrip**::
     do not strip binaries in the initramfs
 
+**--prelink**::
+    prelink binaries in the initramfs (default)
+
+**--noprelink**::
+    do not prelink binaries in the initramfs
+
 **--hardlink**::
     hardlink files in the initramfs (default)
 
@@ -303,6 +275,12 @@ Default:
 
 **--sshkey** _<sshkey file>_:: ssh key file used with ssh-client module.
 
+**--logfile** _<logfile>_:: logfile to use; overrides any setting from
+    the configuration files.
++
+Default:
+    _/var/log/dracut.log_
+
 **-l, --local**::
     activates the local mode. dracut will use modules from the current working
     directory instead of the system-wide installed modules in
@@ -322,15 +300,30 @@ provide a valid _/etc/fstab_.
 **-N, --no-hostonly**::
     Disable Host-Only mode
 
+**--hostonly-cmdline**:
+    Store kernel command line arguments needed in the initramfs
+
+**--no-hostonly-cmdline**:
+    Do not store kernel command line arguments needed in the initramfs
+
+**--persistent-policy** _<policy>_::
+    Use _<policy>_ to address disks and partitions.
+    _<policy>_ can be any directory name found in /dev/disk.
+    E.g. "by-uuid", "by-label"
+
 **--fstab**::
     Use _/etc/fstab_ instead of _/proc/self/mountinfo_.
 
-**--add-fstab** _<filename>_ ::
+**--add-fstab** _<filename>_::
     Add entries of _<filename>_ to the initramfs /etc/fstab.
 
-**--mount** "_<device>_ _<mountpoint>_ _<filesystem type>_ _<filesystem options>_"::
-    Mount _<device>_ on _<mountpoint>_ with _<filesystem type>_ and _<filesystem
-    options>_ in the initramfs
+**--mount** "_<device>_ _<mountpoint>_ _<filesystem type>_ [_<filesystem options>_ [_<dump frequency>_ [_<fsck order>_]]]"::
+    Mount _<device>_ on _<mountpoint>_ with _<filesystem type>_ in the
+    initramfs. _<filesystem options>_, _<dump options>_ and _<fsck order>_ can
+    be specified, see fstab manpage for the details.
+    The default _<filesystem options>_ is "defaults".
+    The default _<dump frequency>_ is "0".
+    the default _<fsck order>_ is "2".
 
 **--add-device** _<device>_ ::
     Bring up _<device>_ in initramfs, _<device>_ should be the device name.
@@ -338,13 +331,13 @@ provide a valid _/etc/fstab_.
     LVM or an encrypted partition.
     [NB --device can be used for compatibility with earlier releases]
 
-**-i, --include** _<SOURCE>_ _<TARGET>_::
+**-i, --include** _<SOURCE>_ _<TARGET>_::
     include the files in the SOURCE directory into the
     TARGET directory in the final initramfs. If SOURCE is a file, it will be
     installed to TARGET in the final initramfs. This parameter can be specified
     multiple times.
 
-**-I, --install** _<file list>_::
+**-I, --install** _<file list>_::
     install the space separated list of files into the initramfs.
 +
 [NOTE]
@@ -376,7 +369,7 @@ will not be able to boot. Equivalent to "--compress=bzip2"
 [WARNING]
 ====
 Make sure your kernel has lzma decompression support compiled in, otherwise you
-will not be able to boot. Equivalent to "--compress=lzma -9"
+will not be able to boot. Equivalent to "lzma --compress=lzma -9"
 ====
 
 **--xz**::
@@ -385,8 +378,24 @@ will not be able to boot. Equivalent to "--compress=lzma -9"
 [WARNING]
 ====
 Make sure your kernel has xz decompression support compiled in, otherwise you
-will not be able to boot. Equivalent to "--compress=xz --check=crc32
---lzma2=dict=1MiB"
+will not be able to boot. Equivalent to
+"lzma --compress=xz --check=crc32 --lzma2=dict=1MiB"
+====
+
+**--lzo**::
+    Compress the generated initramfs using lzop.
+[WARNING]
+====
+Make sure your kernel has lzo decompression support compiled in, otherwise you
+will not be able to boot.
+====
+
+**--lz4**::
+    Compress the generated initramfs using lz4.
+[WARNING]
+====
+Make sure your kernel has lz4 decompression support compiled in, otherwise you
+will not be able to boot.
 ====
 
 **--compress** _<compressor>_::
@@ -409,6 +418,31 @@ will not be able to boot. Equivalent to "--compress=xz --check=crc32
 **--keep**::
     Keep the initramfs temporary directory for debugging purposes.
 
+**--printsize**::
+    Print out the module install size
+
+**--profile**:
+    Output profile information of the build process
+
+**--ro-mnt**:
+    Mount / and /usr read-only by default.
+
+**-L, --stdlog** _<level>_::
+    [0-6] Specify logging level (to standard error)
+----
+          0 - suppress any messages
+          1 - only fatal errors
+          2 - all errors
+          3 - warnings
+          4 - info
+          5 - debug info (here starts lots of output)
+          6 - trace info (and even more)
+----
+
+**--regenerate-all**::
+    Regenerate all initramfs images at the default location with the kernel
+    versions found on the system. Additional parameters are passed through.
+
 FILES
 -----
 _/var/log/dracut.log_::
@@ -435,9 +469,10 @@ _/etc/conf.d/_::
     set in the configuration files.
 
 _/etc/cmdline_::
-    Can contain additional command line options. Deprecated, better use /etc/cmdline.d/*.conf.
+    Can contain additional command line options. Deprecated, better use
+    /etc/cmdline.d/*.conf.
 
-_/etc/cmdline.d/*.conf::
+_/etc/cmdline.d/*.conf_::
     Can contain additional command line options.
 
 AVAILABILITY

dracut.asc

@@ -1,7 +1,7 @@
 dracut
 ======
 Harald Hoyer <harald@redhat.com>
-v2.0, March 2011
+v3.0, October 2013
 
 :language: bash
 
@@ -120,14 +120,19 @@ final cleanup tasks. On an initramfs, the initial root file system cannot be
 rotated away. Instead, it is simply emptied and the final root file system
 mounted over the top.
 
+If the systemd module is used in the initramfs, the ordering of the services
+started looks like <<dracutbootup7>>.
+
 == Dracut on shutdown
 
-On a systemd driven system, the dracut initramfs is also used for the shutdown procedure.
+On a systemd driven system, the dracut initramfs is also used for the shutdown
+procedure.
 
 The following steps are executed during a shutdown:
 
 * systemd switches to the shutdown.target
-* systemd starts /lib/systemd/system/shutdown.target.wants/dracut-shutdown.service
+* systemd starts
+  /lib/systemd/system/shutdown.target.wants/dracut-shutdown.service
 * dracut-shutdown.service executes /usr/lib/dracut/dracut-initramfs-restore
   which unpacks the initramfs to /run/initramfs
 * systemd finishes shutdown.target
@@ -135,918 +140,19 @@ The following steps are executed during a shutdown:
 * systemd tries to unmount everything and mounts the remaining read-only
 * systemd checks, if there is a /run/initramfs/shutdown executable
 * if yes, it does a pivot_root to /run/initramfs and executes ./shutdown.
-  The old root is then mounted on /oldroot. /usr/lib/dracut/modules.d/99shutdown/shutdown.sh is the shutdown executable.
-* shutdown will try to umount every /oldroot mount and calls the various shutdown hooks from the dracut modules
+  The old root is then mounted on /oldroot.
+  /usr/lib/dracut/modules.d/99shutdown/shutdown.sh is the shutdown executable.
+* shutdown will try to umount every /oldroot mount and calls the various
+  shutdown hooks from the dracut modules
 
 This ensures, that all devices are disassembled and unmounted cleanly.
 
 = User Manual
 
-== Creating an initramfs Image
-To create a initramfs image, the most simple command is:
-----
-# dracut
-----
-
-This will generate a general purpose initramfs image, with all possible
-functionality resulting of the combination of the installed dracut modules and
-system tools. The image is /boot/initramfs-_++<kernel version>++_.img and
-contains the kernel modules of the currently active kernel with version
-_++<kernel version>++_.
-
-If the initramfs image already exists, dracut will display an error message, and
-to overwrite the existing image, you have to use the --force option.
-----
-# dracut --force
-----
-
-If you want to specify another filename for the resulting image you would issue
-a command like:
-----
-# dracut foobar.img
-----
-
-To generate an image for a specific kernel version, the command would be:
-----
-# dracut foobar.img 2.6.40-1.rc5.f20
-----
-
-A shortcut to generate the image at the default location for a specific kernel
-version is:
-----
-# dracut --kver 2.6.40-1.rc5.f20
-----
-
-If you want to create lighter, smaller initramfs images, you may want to specify
-the --host-only or -H option. Using this option, the resulting image will
-contain only those dracut modules, kernel modules and filesystems, which are
-needed to boot this specific machine. This has the drawback, that you can't put
-the disk on another controller or machine, and that you can't switch to another
-root filesystem, without recreating the initramfs image. The usage of the
---host-only option is only for experts and you will have to keep the broken
-pieces. At least keep a copy of a general purpose image (and corresponding
-kernel) as a fallback to rescue your system.
-
-=== Inspecting the Contents
-To see the contents of the image created by dracut, you can use the lsinitrd tool.
-----
-# lsinitrd /boot/initramfs-$(uname -r).img | less
-----
-
-To display the contents of a file in the initramfs also use the lsinitrd tool:
-----
-# lsinitrd /boot/initramfs-$(uname -r).img  /etc/ld.so.conf
-include ld.so.conf.d/*.conf
-----
-
-=== Adding dracut Modules
-Some dracut modules are turned off by default and have to be activated manually.
-You can do this by adding the dracut modules to the configuration file
-_/etc/dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_. See <<dracutconf5>>.
-You can also add dracut modules on the command line
-by using the -a or --add option:
-----
-# dracut --add bootchart initramfs-bootchart.img
-----
-
-To see a list of available dracut modules, use the --list-modules option:
-----
-# dracut --list-modules
-----
-
-or, if you have a dracut version earlier than +008+, issue the command:
-----
-# for mod in /usr/lib/dracut/modules.d/*; do echo ${mod##*/??}; done
-----
-
-=== Omitting dracut Modules
-Sometimes you don't want a dracut module to be included for reasons of speed,
-size or functionality. To do this, either specify the omit_dracutmodules
-variable in the _dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_ configuration
-file (see <<dracutconf5>>), or use the -o or --omit option
-on the command line:
-----
-# dracut -o "multipath lvm" no-multipath-lvm.img
-----
-
-=== Adding Kernel Modules
-If you need a special kernel module in the initramfs, which is not
-automatically picked up by dracut, you have the use the --add-drivers option
-on the command line or  the drivers vaiable in  the _/etc/dracut.conf_
-or _/etc/dracut.conf.d/myconf.conf_ configuration file (see <<dracutconf5>>):
-----
-# dracut --add-drivers mymod initramfs-with-mymod.img
-----
-
-== Boot parameters
-The generated initramfs.img file normally does not contain any system
-configuration files (except for some special exceptions), so the configuration
-has to be done on the kernel command line. With this flexibility, you can easily
-boot from a changed root partition, without the need to recompile the initramfs
-image. So, you could completly change your root partition (move it inside a md
-raid with encryption and LVM on top), as long as you specify the correct
-filesystem LABEL or UUID on the kernel command line for your root device, dracut
-will find it and boot from it.
-
-The kernel command line usually can be configured in _/boot/grub/grub.conf_, if
-grub is your bootloader and it also can be edited in the real boot process in
-the grub menu.
-
-The kernel command line can also be provided by the dhcp server with the
-root-path option. See <<NetworkBoot>>.
-
-For a full reference of all kernel command line parameters, see <<dracut8>>.
-
-=== Specifying the root Device
-This is the only option dracut really needs to boot from your root partition.
-Because your root partition can live in various environments, there are a lot of
-formats for the root= option. The most basic one is root=_++<path to device
-node>++_:
-----
-root=/dev/sda2
-----
-
-Because device node names can change, dependent on the drive ordering, you are
-encouraged to use the filesystem identifier (UUID) or filesystem label (LABEL)
-to specify your root partition:
-----
-root=UUID=19e9dda3-5a38-484d-a9b0-fa6b067d0331
-----
-
-or
-
-----
-root=LABEL=myrootpartitionlabel
-----
-
-To see all UUIDs or LABELs on your system, do:
-----
-# ls -l /dev/disk/by-uuid
-----
-
-or
-
-----
-# ls -l /dev/disk/by-label
-----
-
-If your root partition is on the network see <<NetworkBoot>>.
-
-=== Keyboard Settings
-If you have to input passwords for encrypted disk volumes, you might want to set
-the keyboard layout and specify a display font.
-
-A typical german kernel command would contain:
-----
-vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys locale.LANG=de_DE.UTF-8
-----
-
-Setting these options can override the setting stored on your system, if you use
-a modern init system, like systemd.
-
-For dracut versions prior to version +008+ the line would look like:
-----
-LANG=de_DE.UTF-8 SYSFONT=latarcyrheb-sun16 KEYBOARDTYPE=pc KEYTABLE=de-latin1-nodeadkeys
-----
-
-=== Blacklisting Kernel Modules
-Sometimes it is required to prevent the automatic kernel module loading of a
-specific kernel module. To do this, just add rd.blacklist=_++<kernel module
-name>++_, with _++<kernel module name>++_ not containing the _.ko_
-suffix, to the kernel command line. For example:
-----
-rd.driver.blacklist=mptsas rd.driver.blacklist=nouveau
-----
-
-The option can be specified multiple times on the kernel command line.
-
-=== Speeding up the Boot Process
-If you want to speed up the boot process, you can specify as much information
-for dracut on the kernel command as possible. For example, you can tell dracut,
-that you root partition is not on a LVM volume or not on a raid partition, or
-that it lives inside a specific crypto LUKS encrypted volume. By default, dracut
-searches everywhere. A typical dracut kernel command line for a plain primary or
-logical partition would contain:
-----
-rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
-----
-
-On systems with dracut version prior to +008+ the line would look like:
-----
-rd_NO_LUKS rd_NO_LVM rd_NO_MD rd_NO_DM
-----
-
-This turns off every automatic assembly of LVM, MD raids, DM raids and crypto LUKS.
-
-Of course, you could also omit the dracut modules in the initramfs creation
-process, but then you would lose the posibility to turn it on on demand.
-
-
-[[Injecting]]
-=== Injecting custom Files
-To add your own files to the initramfs image, you have several possibilities.
-
-The --include option let you specify a source path and a target path. For example
-----
-# dracut --include cmdline-preset /etc/cmdline.d/mycmdline.conf initramfs-cmdline-pre.img
-----
-will create an initramfs image, where the file cmdline-preset will be copied
-inside the initramfs to _/etc/cmdline.d/mycmdline.conf_. --include can only be specified once.
-
-
-----
-# mkdir rd.live.overlay
-# mkdir rd.live.overlay/etc
-# mkdir rd.live.overlay/etc/conf.d
-# mkdir rd.live.overlay/etc/cmdline.d
-# echo "ip=auto" >> rd.live.overlay/etc/cmdline.d/mycmdline.conf
-# echo export FOO=testtest >> rd.live.overlay/etc/conf.d/testvar.conf
-# echo export BAR=testtest >> rd.live.overlay/etc/conf.d/testvar.conf
-# tree rd.live.overlay/
-rd.live.overlay/
-└── etc
-    ├── cmdline.d
-        │   └── mycmdline.conf
-	    └── conf.d
-	            └── testvar.conf
-
-# dracut --include rd.live.overlay / initramfs-rd.live.overlay.img
-----
-
-This will put the contents of the rd.live.overlay directory into the root of the
-initramfs image.
-
-The --install option let you specify several files, which will get installed in
-the initramfs image at the same location, as they are present on initramfs
-creation time.
-
-
-----
-# dracut --install 'strace fsck.ext3 ssh' initramfs-dbg.img
-----
-
-This will create an initramfs with the strace, fsck.ext3 and ssh executables,
-together with the libraries needed to start those. The --install option can be
-specified multiple times.
-
-
-[[NetworkBoot]]
-== Network Boot
-
-If your root partition is on a network drive, you have to have the network
-dracut modules installed to create a network aware initramfs image.
-
-On a Red Hat Enterprise Linux or Fedora system, this means, you have to install
-the _dracut-network_ rpm package:
-
-
-----
-# yum install dracut-network
-----
-
-The resulting initramfs image can be served by a boot manager residing on your
-local hard drive or it can be served by a PXE/TFTP server.
-
-How to setup your PXE/TFTP server can be found in the
-http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/[Red
-Hat Enterprise Linux Storage Administration Guide].
-
-If you specify ip=auto on the kernel command line, then dracut asks a dhcp
-server about the ip adress for the machine. The dhcp server can also serve an
-additional root-path, which will set the root device for dracut. With this
-mechanism, you have static configuration on your client machine and a
-centralized boot configuration on your TFTP/DHCP server. If you can't pass a
-kernel command line, then you can inject _/etc/cmdline.d/mycmdline.conf_, with a method described
-in <<Injecting>>.
-
-
-
-
-=== Reducing the Image Size
-
-To reduce the size of the initramfs, you should create it with by ommitting all
-dracut modules, which you know, you don't need to boot the machine.
-
-You can also specify the exact dracut and kernel modules to produce a very tiny
-initramfs image.
-
-For example for a NFS image, you would do:
-
-
-----
-# dracut -m "nfs network  base" initramfs-nfs-only.img
-----
-
-Then you would boot from this image with your target machine and reduce the size
-once more by creating it on the target machine with the --host-only option:
-
-
-----
-# dracut -m "nfs network base" --host-only initramfs-nfs-host-only.img
-----
-
-This will reduce the size of the initramfs image significantly.
-
-
-
-=== NFS Root Device
-
-FIXME
-
-=== iSCSI Root Device
-
-FIXME 
-
-=== FCoE Root Device
-
-FIXME
-
-== Troubleshooting
-
-If the boot process does not succeed, you have several options to debug the
-situation. Some of the basic operations are covered here. For more information
-you should also visit:
-http://fedoraproject.org/wiki/How_to_debug_Dracut_problems
-
-
-[[identifying-your-problem-area]]
-=== Identifying your problem area
-. Remove ''rhgb'' and ''quiet'' from the kernel command line
-. Add ''rd.shell'' to the kernel command line. This will present a shell should
-dracut be unable to locate your root device
-. Add ''rd.shell rd.debug log_buf_len=1M'' to the kernel command line so that
-dracut shell commands are printed as they are executed
-. With dracut >= 002-11, you can inspect the rd.debug output with:
-+
-----
-# less /run/initramfs/init.log
-# dmesg | less
-----
-. With dracut >= 022 and systemd, you can inspect the rd.debug output with:
-----
-# journalctl -ab
-----
-. With dracut >= 025 the file /run/initramfs/sosreport.txt is generated, which contains all the logs and the output of all significant tools, which are mentioned later.
-
-If you want to save that output, simply mount /boot by hand or insert an USB stick and mount that.
-Then you can store the output for later inspection.
-
-[[information-to-include-in-your-report]]
-=== Information to include in your report
-
-[[all-bug-reports]]
-==== All bug reports
-In all cases, the following should be mentioned and attached to your bug report:
-
-* The exact kernel command-line used. Typically from the bootloader
-configuration file (e.g. _/etc/grub.conf_) or from _/proc/cmdline_.
-* A copy of your disk partition information from _/etc/fstab_, which might be
-obtained booting an old working initramfs or a rescue medium.
-* A device listing from device-mapper. This can be obtained by running the
-command
-+
-----
-# dmsetup ls --tree
-----
-+
-* A list of block device attributes. This can be obtained by running the commands: 
-+
-----
-# blkid -p
-# blkid -p -o udev
-----
-* Turn on dracut debugging (see _the 'debugging dracut' section_), and attach
-all relevant information from the boot log. This can be obtained by running the
-command 
-+
-----
-# dmesg|grep dracut
-----
-+
-* If you use a dracut configuration file, please include _/etc/dracut.conf_ and
-all files in _/etc/dracut.conf.d/*.conf_
-
-[[logical-volume-management-related-problems]]
-==== Logical Volume Management related problems
-As well as the information from <<all-bug-reports>> include the following
-information:
-
-* Include physical volume information by running the command: 
-+
-----
-# lvm pvdisplay
-----
-+
-* Include volume group information by running the command: 
-+
-----
-# lvm vgdisplay
-----
-+
-* Include logical volume information by running the command: 
-+
-----
-# lvm lvdisplay
-----
-
-[[software-raid-related-problems]]
-==== Software RAID related problems
-As well as the information from <<all-bug-reports>>, include the following
-information:
-
-* If using software RAID disk partitions, please include the output of 
-+
-----
-# cat /proc/mdstat
-----
-
-[[network-root-device-related-problems]]
-==== Network root device related problems
-This section details information to include when experiencing problems on a
-system whose root device is located on a network attached volume (e.g. iSCSI,
-NFS or NBD). As well as the information from <<all-bug-reports>>, include the
-following information:
-
-
-* Please include the output of
-+
-----
-# /sbin/ifup <interfacename>
-# ip addr show
-----
-
-[[debugging-dracut]]
-=== Debugging dracut
-
-
-[[configure-a-serial-console]]
-==== Configure a serial console
-
-Successfully debugging dracut will require some form of console
-logging during the system boot.  This section documents configuring a
-serial console connection to record boot messages.
-
-. First, enable serial console output for both the kernel and the bootloader.
-. Open the file _/etc/grub.conf_ for editing. Below the line ''timeout=5'', add
-the following:
-+
-----
-serial --unit=0 --speed=9600
-terminal --timeout=5 serial console
-----
-+
-. Also in _/etc/grub.conf_, add the following boot arguemnts to the ''kernel''
-line:
-+
-----
-console=tty0 console=ttyS0,9600
-----
-+
-. When finished, the _/etc/grub.conf_ file should look similar to the example
-below.
-+
-----
-default=0
-timeout=5
-serial --unit=0 --speed=9600
-terminal --timeout=5 serial console
-title Fedora (2.6.29.5-191.fc11.x86_64)
-  root (hd0,0)
-  kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 console=ttyS0,9600
-  initrd /dracut-2.6.29.5-191.fc11.x86_64.img
-----
-+
-. More detailed information on how to configure the kernel for console output
-can be found at
-http://www.faqs.org/docs/Linux-HOWTO/Remote-Serial-Console-HOWTO.html#CONFIGURE-KERNEL.
-. Redirecting non-interactive output
-+
---
-NOTE: You can redirect all non-interactive output to _/dev/kmsg_ and the kernel
-will put it out on the console when it reaches the kernel buffer by doing
-
-----
-# exec >/dev/kmsg 2>&1 </dev/console
-----
---
-
-[[using-the-dracut-shell]]
-==== Using the dracut shell
-
-dracut offers a shell for interactive debugging in the event dracut fails to
-locate your root filesystem. To enable the shell:
-
-. Add the boot parameter ''rd.shell'' to your bootloader configuration file
-(e.g. _/etc/grub.conf_)
-. Remove the boot arguments ''rhgb'' and ''quiet''
-+
-A sample _/etc/grub.conf_ bootloader configuration file is listed below.
-+
-----
-default=0
-timeout=5
-serial --unit=0 --speed=9600
-terminal --timeout=5 serial console
-title Fedora (2.6.29.5-191.fc11.x86_64)
-  root (hd0,0)
-  kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 rd.shell
-  initrd /dracut-2.6.29.5-191.fc11.x86_64.img
-----
-+
-. If system boot fails, you will be dropped into a shell as seen in the example below.
-+
-----
-No root device found
-Dropping to debug shell.
-
-# 
-----
-+
-. Use this shell prompt to gather the information requested above (see <<all-bug-reports>>).
-
-[[accessing-the-root-volume-from-the-dracut-shell]]
-==== Accessing the root volume from the dracut shell
-From the dracut debug shell, you can manually perform the task of locating and
-preparing your root volume for boot. The required steps will depend on how your
-root volume is configured. Common scenarios include:
-
-* A block device (e.g. _/dev/sda7_)
-* A LVM logical volume (e.g. _/dev/VolGroup00/LogVol00_)
-* An encrypted device (e.g. _/dev/mapper/luks-4d5972ea-901c-4584-bd75-1da802417d83_)
-* A network attached device (e.g. netroot=iscsi:@192.168.0.4::3260::iqn.2009-02.org.fedoraproject:for.all)
-
-The exact method for locating and preparing will vary. However, to continue with
-a successful boot, the objective is to locate your root volume and create a
-symlink _/dev/root_ which points to the file system. For example, the following
-example demonstrates accessing and booting a root volume that is an encrypted
-LVM Logical volume. 
-
-. Inspect your partitions using parted
-+
-----
-# parted /dev/sda -s p
-Model: ATA HTS541060G9AT00 (scsi)
-Disk /dev/sda: 60.0GB
-Sector size (logical/physical): 512B/512B
-Partition Table: msdos
-Number  Start   End     Size    Type      File system  Flags
-1      32.3kB  10.8GB  107MB   primary   ext4         boot
-2      10.8GB  55.6GB  44.7GB  logical                lvm
-----
-+
-. You recall that your root volume was a LVM logical volume. Scan and activate
-any logical volumes. 
-+
-----
-# lvm vgscan
-# lvm vgchange -ay
-----
-+
-. You should see any logical volumes now using the command blkid:
-+
-----
-# blkid
-/dev/sda1: UUID="3de247f3-5de4-4a44-afc5-1fe179750cf7" TYPE="ext4"
-/dev/sda2: UUID="Ek4dQw-cOtq-5MJu-OGRF-xz5k-O2l8-wdDj0I" TYPE="LVM2_member"
-/dev/mapper/linux-root: UUID="def0269e-424b-4752-acf3-1077bf96ad2c" TYPE="crypto_LUKS"
-/dev/mapper/linux-home: UUID="c69127c1-f153-4ea2-b58e-4cbfa9257c5e" TYPE="ext3"
-/dev/mapper/linux-swap: UUID="47b4d329-975c-4c08-b218-f9c9bf3635f1" TYPE="swap"
-----
-+
-. From the output above, you recall that your root volume exists on an encrypted
-block device. Following the guidance disk encryption guidance from the
-Installation Guide, you unlock your encrypted root volume.
-+
-----
-# UUID=$(cryptsetup luksUUID /dev/mapper/linux-root)
-# cryptsetup luksOpen /dev/mapper/linux-root luks-$UUID
-Enter passphrase for /dev/mapper/linux-root:
-Key slot 0 unlocked. 
-----
-+
-. Next, make a symbolic link to the unlocked root volume
-+
-----
-# ln -s /dev/mapper/luks-$UUID /dev/root
-----
-+
-. With the root volume available, you may continue booting the system by exiting
-the dracut shell
-+
-----
-# exit
-----
-
-[[additional-dracut-boot-parameters]]
-==== Additional dracut boot parameters
-For more debugging options, see <<dracutkerneldebug>> in <<dracutcmdline7>>.
-
-= Developer Manual
-
-== dracut Components
-
-dracut uses a modular system to build and extend the initramfs image. All
-modules are located in _/usr/lib/dracut/modules.d_ or in _<git-src>/modules.d_.
-The most basic dracut module is _99base_. In _99base_ the initial shell script
-init is defined, which gets run by the kernel after initramfs loading. Although
-you can replace init with your own version of _99base_, this is not encouraged.
-Instead you should use, if possible, the hooks of dracut. All hooks, and the
-point of time in which they are executed, are described in <<stages>>.
-
-The main script, which creates the initramfs is dracut itsself. It parses all
-arguments and sets up the directory, in which everything is installed. It then
-executes all check, install, installkernel scripts found in the modules, which
-are to be processed. After everything is installed, the install directory is
-archived and compressed to the final initramfs image. All helper functions used
-by check, install and installkernel are found in in the file _dracut-functions_.
-These shell functions are available to all module installer (install,
-installkernel) scripts, without the need to source _dracut-functions_.
-
-A module can check the preconditions for install and installkernel with the
-check script. Also dependencies can be expressed with check. If a module passed
-check, install and installkernel will be called to install all of the necessary
-files for the module. To split between kernel and non-kernel parts of the
-installation, all kernel module related parts have to be in installkernel. All
-other files found in a module directory are module specific and mostly are hook
-scripts and udev rules.
-
-
-[[stages]]
-== Boot Process Stages
-
-The init script in _99base_ is the main script, which prepares the root file
-system for usage, runs udev, mounts the real root device, kills the remaining
-processes, and switches to the real root device for further booting. dracut
-modules can insert custom script at various points, to control the boot process.
-These hooks are plain directories containing shell scripts ending with ".sh",
-which are sourced by init.
-Common used functions are in _dracut-lib.sh_, which can be sourced by any script.      
-
-
-
-=== Basic Setup
-
-The first thing init does, is to mount _/proc_ and _/sys_ and manually create
-the basic device nodes and symbolic links in _/dev_ needed to execute basic
-commands. Then logging is setup according to kernel command line arguments.
-_/dev/pts_ and _/dev/shm_ are mounted and the first hook is sourced.
-
-
-
-=== Hook: cmdline
-
-The _cmdline_ hook is a place to insert scripts to parse the kernel command line
-and prepare the later actions, like setting up udev rules and configuration
-files.
-
-In this hook the most important environment variable is defined: root. The
-second one is rootok, which indicates, that a module claimed to be able to parse
-the root defined. So for example, **root=**__iscsi:....__ will be claimed by the
-iscsi dracut module, which then sets rootok.
-
-=== Hook: pre-udev
-
-This hook is executed right after the cmdline hook and a check if root and
-rootok were set. Here modules can take action with the final root, and before
-udev has been run.
-
-
-
-=== Start Udev
-
-Now udev is started and the logging for udev is setup.
-
-
-
-=== Hook: pre-trigger
-
-In this hook, you can set udev environment variables with **udevadm control
---property=KEY=_value_** or control the further execution of udev with
-udevadm.
-
-
-
-=== Trigger Udev
-
-udev is triggered by calling udevadm trigger, which sends add events for all
-devices and subsystems. 
-
-
-
-=== Main Loop
-
-Now the main loop of 99base/init begins. Here we loop until udev has settled and
-all scripts in _initqueue/finished_ returned true. In this loop there are three
-hooks, where scripts can be inserted by calling /sbin/initqueue. 
-
-
-
-==== Initqueue
-
-This hook gets executed every time a script is inserted here, regardless of the
-udev state.
-
-
-
-==== Initqueue settled
-
-This hooks gets executed every time udev has settled.
-
-
-
-==== Initqueue timeout
-
-This hooks gets executed, when the main loop counter becomes half of the
-rd.retry counter.
-
-
-
-==== Initqueue finished
-
-This hook is called after udev has settled and if all scripts herein return 0
-the main loop will be ended.
-
-
-
-=== Hook: pre-mount
-
-Before the root device is mounted all scripts in the hook pre-mount are
-executed. In some cases (e.g. NFS) the real root device is already mounted,
-though.
-
-
-
-=== Hook: mount
-
-This hook is mainly to mount the real root device.
-
-
-
-=== Hook: pre-pivot
-
-This hook is called before cleanup hook, This is a good place for
-actions other than cleanups which need to be called before pivot.
-
-
-=== Hook: cleanup
-
-This hook is the last hook and is called before init finally switches root to
-the real root device. This is a good place to clean up and kill processes not
-needed anymore.
-
-
-=== Cleanup and switch_root
-
-Init kills all udev processes, cleans up the environment, sets up the arguments
-for the real init process and finally calls switch_root. switch_root removes the
-whole filesystem hierarchy of the initramfs, chroot()s to the real root device
-and calls /sbin/init with the specified arguments.
-
-To ensure all files in the initramfs hierarchy can be removed, all processes
-still running from the initramfs should not have any open file descriptors left.
-
-
-
-== Network Infrastructure
-
- 
-FIXME
-
-
-== Writing a Module
-
-A simple example module is _96insmodpost_, which modprobes a kernel module after
-udev has settled and the basic device drivers have been loaded.
-
-All module installation information is in the file module-setup.sh.
-
-First we create a check() function, which just exits with 0 indicating that this
-module should be included by default.
-
-check():
-
-
-----
-return 0
-----
-
-The we create the install() function, which installs a cmdline hook with
-priority number 20 called _parse-insmodpost.sh_. It also installs the
-_insmodpost.sh_ script in _/sbin_.
-
-install():
-
-
-----
-inst_hook cmdline 20 "$moddir/parse-insmodpost.sh"
-inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
-----
-
-The _pase-instmodpost.sh_ parses the kernel command line for a argument
-rd.driver.post, blacklists the module from being autoloaded and installs the
-hook _insmodpost.sh_ in the _initqueue/settled_.
-
-_parse-insmodpost.sh_:
-
-
-----
-for p in $(getargs rd.driver.post=); do
-    echo "blacklist $p" >> /etc/modprobe.d/initramfsblacklist.conf
-    _do_insmodpost=1
-done
-
-[ -n "$_do_insmodpost" ] && /sbin/initqueue --settled --unique --onetime /sbin/insmodpost.sh
-unset _do_insmodpost
-
-----
-
-_insmodpost.sh_, which is called in the _initqueue/settled_ hook will just
-modprobe the kernel modules specified in all rd.driver.post kernel command line
-parameters. It runs after udev has settled and is only called once (--onetime).
-
-_insmodpost.sh_:
-
-
-----
-. /lib/dracut-lib.sh
-
-for p in $(getargs rd.driver.post=); do
-    modprobe $p
-done
-
-----
-
-
-
-=== check()
-
-_check()_ is called by dracut to evaluate the inclusion of a dracut module in
-the initramfs.
-
-$hostonly:: If the $hostonly variable is set, then the module check() function
-should be in "hostonly" mode, which means, that the check() should only return
-0, if the module is really needed to boot this specific host.
-
-check() should return with:
-
-0:: Include the dracut module in the initramfs.
-
-1:: Do not include the dracut module. The requirements are not fullfilled
-(missing tools, etc.)
-
-255:: Only include the dracut module, if another module requires it or if
-explicitly specified in the config file or on the argument list.
-
-
-
-=== depends()
-
-The function depends() should echo all other dracut module names the module
-depends on.
-
-
-
-=== install()
-
-dracut_install
-
-inst
-
-inst_hook
-
-inst_rules
-
-
-
-
-
-=== installkernel()
-
-instmods
-
-
-
-=== Creation Functions
-
- 
-FIXME
-
-
-=== Initramfs Functions
-
- 
-FIXME
-
-
-=== Network Modules
-
-FIXME
-
-
 :leveloffset: 1
-[[dracut8]]
 include::dracut.8.asc[]
 
+:leveloffset: 1
 [[dracutconf5]]
 include::dracut.conf.5.asc[]
 
@@ -1059,6 +165,15 @@ include::lsinitrd.1.asc[]
 [[mkinitrd8]]
 include::mkinitrd.8.asc[]
 
+= Developer Manual
+
+:leveloffset: 1
+[[dracutmodules7]]
+include::dracut.modules.7.asc[]
+
+[[dracutbootup7]]
+include::dracut.bootup.7.asc[]
+
 :leveloffset: 0
 [appendix]
 License

dracut.bootup.7.asc

@@ -0,0 +1,123 @@
+DRACUT.BOOTUP(7)
+================
+:doctype: manpage
+:man source:   dracut
+:man manual:   dracut
+
+NAME
+----
+dracut.bootup - boot ordering in the initramfs
+
+DESCRIPTION
+-----------
+
+This flow chart illustrates the ordering of the services, if systemd is used in
+the dracut initramfs.
+----
+
+                                    systemd-journal.socket
+                                               |
+                                               v
+                                    dracut-cmdline.service
+                                               |
+                                               v
+                                    dracut-pre-udev.service
+                                               |
+                                               v
+                                     systemd-udevd.service
+                                               |
+                                               v
+local-fs-pre.target                dracut-pre-trigger.service
+         |                                     |
+         v                                     v
+ (various mounts)  (various swap  systemd-udev-trigger.service
+         |           devices...)               |             (various low-level   (various low-level
+         |               |                     |             services: seed,       API VFS mounts:
+         v               v                     v             tmpfiles, random     mqueue, configfs,
+  local-fs.target   swap.target     dracut-initqueue.service    sysctl, ...)        debugfs, ...)
+         |               |                     |                    |                    |
+         \_______________|____________________ | ___________________|____________________/
+                                              \|/
+                                               v
+                                        sysinit.target
+                                               |
+                             _________________/|\___________________
+                            /                  |                    \
+                            |                  |                    |
+                            v                  |                    v
+                        (various               |              rescue.service
+                       sockets...)             |                    |
+                            |                  |                    v
+                            v                  |              rescue.target
+                     sockets.target            |
+                            |                  |
+                            \_________________ |                                 emergency.service
+                                              \|                                         |
+                                               v                                         v
+                                         basic.target                             emergency.target
+                                               |
+                        ______________________/|
+                       /                       |
+                       |                       v
+                       |            dracut-pre-mount.service
+                       |                       |
+                       |                       v
+                       |                  sysroot.mount
+                       |                       |
+                       |                       v
+                       |             initrd-root-fs.target
+           (custom initrd services)            |
+                       |                       v
+                       |             dracut-mount.service
+                       |                       |
+                       |                       v
+                       |            initrd-parse-etc.service
+                       |                       |
+                       |                       v
+                       |            (sysroot-usr.mount and
+                       |             various mounts marked
+                       |               with fstab option
+                       |                x-initrd.mount)
+                       |                       |
+                       |                       v
+                       |                initrd-fs.target
+                       \______________________ |
+                                              \|
+                                               v
+                                          initrd.target
+                                               |
+                                               v
+                                    dracut-pre-pivot.service
+                                               |
+                                               v
+                                     initrd-cleanup.service
+                                          isolates to
+                                    initrd-switch-root.target
+                                               |
+                                               v
+                        ______________________/|
+                       /                       |
+                       |        initrd-udevadm-cleanup-db.service
+                       |                       |
+           (custom initrd services)            |
+                       |                       |
+                       \______________________ |
+                                              \|
+                                               v
+                                   initrd-switch-root.target
+                                               |
+                                               v
+                                   initrd-switch-root.service
+                                               |
+                                               v
+                                          switch-root
+----
+
+
+AUTHOR
+------
+Harald Hoyer
+
+SEE ALSO
+--------
+*dracut*(8) *bootup*(7)

dracut.conf.5.asc

@@ -10,17 +10,19 @@ dracut.conf - configuration file(s) for dracut
 
 SYNOPSIS
 --------
-_/etc/dracut.conf_ _/etc/dracut.conf.d/*.conf_  _/usr/lib/dracut/dracut.conf.d/*.conf_
+_/etc/dracut.conf_ _/etc/dracut.conf.d/*.conf_
+_/usr/lib/dracut/dracut.conf.d/*.conf_
 
 Description
 -----------
 _dracut.conf_ is loaded during the initialisation phase of dracut. Command line
 parameter will overwrite any values set here.
 
-_*.conf_ files are read from /usr/lib/dracut/dracut.conf.d and /etc/dracut.conf.d.
-Files with the same name in /etc/dracut.conf.d will replace files in /usr/lib/dracut/dracut.conf.d.
-The files are then read in alphanumerical order and will overwrite parameters set in
-_/etc/dracut.conf_. Each line specifies an attribute and a value. A '#'
+_*.conf_ files are read from /usr/lib/dracut/dracut.conf.d and
+/etc/dracut.conf.d. Files with the same name in /etc/dracut.conf.d will replace
+files in /usr/lib/dracut/dracut.conf.d.
+The files are then read in alphanumerical order and will overwrite parameters
+set in _/etc/dracut.conf_. Each line specifies an attribute and a value. A '#'
 indicates the beginning of a comment; following characters, up to the end of the
 line are not interpreted.
 
@@ -51,10 +53,6 @@ Configuration files must have the extension .conf; other extensions are ignored.
     Specify a space-separated list of kernel modules not to add to the
     initramfs. The kernel modules have to be specified without the ".ko" suffix.
 
-*install_items+=*" __<kernel modules>__ "::
-    Specify a space-separated list of files, which are added to the initramfs
-    image.
-
 *filesystems+=*" __<filesystem names>__ "::
     Specify a space-separated list of kernel filesystem modules to exclusively
     include in the generic initramfs.
@@ -71,16 +69,28 @@ Configuration files must have the extension .conf; other extensions are ignored.
 *do_strip=*"__{yes|no}__"::
     Strip binaries in the initramfs (default=yes)
 
+*do_prelink=*"__{yes|no}__"::
+    Prelink binaries in the initramfs (default=yes)
+
 *hostonly=*"__{yes|no}__"::
     Host-Only mode: Install only what is needed for booting the local host
     instead of a generic host and generate host-specific configuration.
 
+*hostonly_cmdline*"__{yes|no}__"::
+    If set, store the kernel command line arguments needed in the initramfs
+
+*persistent_policy=*"__<policy>__"::
+    Use _<policy>_ to address disks and partitions.
+    _<policy>_ can be any directory name found in /dev/disk.
+    E.g. "by-uuid", "by-label"
+
 *tmpdir=*"__<temporary directory>__"::
     Specify temporary directory to use.
 
 [WARNING]
 ====
-If chrooted to another root other than the real root device, use --fstab and provide a valid _/etc/fstab_.
+If chrooted to another root other than the real root device, use --fstab and
+provide a valid _/etc/fstab_.
 ====
 
 *use_fstab=*"__{yes|no}__"::
@@ -109,7 +119,7 @@ If chrooted to another root other than the real root device, use --fstab and pro
 *nofscks=*"__{yes|no}__"::
     If specified, inhibit installation of any fsck tools.
 
-*ro_mnt*
+*ro_mnt=*"__{yes|no}__"::
     Mount _/_ and _/usr_ read-only by default.
 
 *kernel_cmdline=*"__parameters__"::
@@ -118,9 +128,27 @@ If chrooted to another root other than the real root device, use --fstab and pro
 *kernel_only=*"__{yes|no}__"::
     Only install kernel drivers and firmware files. (default=no)
 
-*no_kernel=*"{yes|no}"::
+*no_kernel=*"__{yes|no}__"::
     Do not install kernel drivers and firmware files (default=no)
 
+*acpi_override=*"__{yes|no}__"::
+    [WARNING] ONLY USE THIS IF YOU KNOW WHAT YOU ARE DOING! +
+    Override BIOS provided ACPI tables. For further documentation read
+    Documentation/acpi/initrd_table_override.txt in the kernel sources.
+    Search for ACPI table files (must have .aml suffix) in acpi_table_dir=
+    directory (see below) and add them to a separate uncompressed cpio
+    archive. This cpio archive gets glued (concatenated, uncompressed one
+    must be the first one) to the compressed cpio archive. The first,
+    uncompressed cpio archive is for data which the kernel must be able
+    to access very early (and cannot make use of uncompress alogrithms yet)
+    like microcode or ACPI tables (default=no).
+
+*acpi_table_dir=*"__<dir>__"::
+    Directory to search for ACPI tables if acpi_override= is set to yes.
+
+*early_microcode=*"{yes|no}"::
+    Combine early microcode with ramdisk (default=no)
+
 *stdloglvl*="__\{0-6\}__"::
     Set logging to standard error level.
 
@@ -136,11 +164,22 @@ If chrooted to another root other than the real root device, use --fstab and pro
 *show_modules=*"__{yes|no}__"::
     Print the name of the included modules to standard output during build.
 
+*i18n_vars="__<variable mapping>__"::
+    Distribution specific variable mapping.
+    See dracut/modules.d/10i18n/README for a detailed description.
+
+*i18n_default_font=*"__<fontname>__"::
+    The font <fontname> to install, if not specified otherwise.
+    Default is "LatArCyrHeb-16".
+
+*i18n_install_all=*"__{yes|no}__"::
+    Install everything regardless of generic or hostonly mode.
+
 Files
 -----
 _/etc/dracut.conf_::
     Old configuration file. You better use your own file in
-    _/etc/dracut/conf.d/_.
+    _/etc/dracut.conf.d/_.
 
 _/etc/dracut.conf.d/_::
     Any _/etc/dracut.conf.d/*.conf_ file can overwrite the values in

dracut.conf.d/fedora.conf.example

@@ -2,13 +2,16 @@
 
 # i18n
 i18n_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP /etc/sysconfig/i18n:SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
-omit_drivers+=' .*/fs/ocfs/.*  i2o_scsi'
+i18n_default_font="latarcyrheb-sun16"
+i18n_install_all="yes"
 stdloglvl=3
-logfile=/var/log/dracut.log
-fileloglvl=6
+sysloglvl=5
 install_items+=" vi /etc/virc ps grep cat rm "
 prefix="/"
 systemdutildir=/usr/lib/systemd
 systemdsystemunitdir=/usr/lib/systemd/system
+systemdsystemconfdir=/etc/systemd/system
 udevdir=/usr/lib/udev
-add_dracutmodules+=" systemd "
+hostonly="yes"
+hostonly_cmdline="no"
+early_microcode="yes"

dracut.conf.d/gentoo.conf.example

@@ -10,5 +10,6 @@ ro_mnt=yes
 
 # i18n
 i18n_vars="/etc/conf.d/keymaps:keymap-KEYMAP,extended_keymaps-EXT_KEYMAPS /etc/conf.d/consolefont:consolefont-FONT,consoletranslation-FONT_MAP /etc/rc.conf:unicode-UNICODE"
+i18n_default_font="LatArCyrHeb-16"
 
 omit_drivers+=" i2o_scsi"

dracut.modules.7.asc

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

dracut.spec

@@ -21,8 +21,8 @@ Group: System/Base
 %endif
 
 # The entire source code is GPLv2+
-# except install/* which is LGPLv2.1+
-License: GPLv2+ and LGPLv2.1+
+# except install/* which is LGPLv2+
+License: GPLv2+ and LGPLv2+
 
 URL: https://dracut.wiki.kernel.org/
 
@@ -30,11 +30,17 @@ URL: https://dracut.wiki.kernel.org/
 # 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
 
-BuildRequires: dash bash git
+BuildRequires: bash git
 
 %if 0%{?fedora} || 0%{?rhel}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: pkgconfig
 %endif
+%if 0%{?fedora}
+BuildRequires: bash-completion
+BuildRequires: pkgconfig
+%endif
+
 %if 0%{?suse_version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 %endif
@@ -70,7 +76,11 @@ Provides: mkinitrd = 2.6.1
 Obsoletes: dracut-kernel < 005
 Provides:  dracut-kernel = %{version}-%{release}
 
-Requires: bash
+Obsoletes: dracut <= 029
+Obsoletes: dracut-norescue
+Provides:  dracut-norescue
+
+Requires: bash >= 4
 Requires: coreutils
 Requires: cpio
 Requires: filesystem >= 2.1.0
@@ -78,16 +88,17 @@ Requires: findutils
 Requires: grep
 Requires: hardlink
 Requires: gzip xz
-Requires: module-init-tools >= 3.7-9
+Requires: kmod
 Requires: sed
-Requires: file
 Requires: kpartx
-Requires: udev > 166
-Requires: kbd kbd-misc
+
 %if 0%{?fedora} || 0%{?rhel} > 6
 Requires: util-linux >= 2.21
-Conflicts: systemd < 198
+Requires: systemd >= 219
+Requires: procps-ng
+Conflicts: grubby < 8.23
 %else
+Requires: udev > 166
 Requires: util-linux-ng >= 2.21
 %endif
 
@@ -110,6 +121,7 @@ Summary: dracut modules to build a dracut initramfs with network support
 Requires: %{name} = %{version}-%{release}
 Requires: iputils
 Requires: iproute
+Requires: dhclient
 Obsoletes: dracut-generic < 008
 Provides:  dracut-generic = %{version}-%{release}
 
@@ -132,7 +144,7 @@ Requires: nss-softokn-freebl
 
 %description fips
 This package requires everything which is needed to build an
-all purpose initramfs with dracut, which does an integrity check.
+initramfs with dracut, which does an integrity check.
 %endif
 
 %package fips-aesni
@@ -141,8 +153,7 @@ Requires: %{name}-fips = %{version}-%{release}
 
 %description fips-aesni
 This package requires everything which is needed to build an
-all purpose initramfs with dracut, which does an integrity check
-and adds the aesni-intel kernel module.
+initramfs with dracut, which does an integrity check and adds the aesni-intel kernel module.
 
 %package caps
 Summary: dracut modules to build a dracut initramfs which drops capabilities
@@ -151,7 +162,26 @@ Requires: libcap
 
 %description caps
 This package requires everything which is needed to build an
-all purpose initramfs with dracut, which drops capabilities.
+initramfs with dracut, which drops capabilities.
+
+%package config-generic
+Summary: dracut configuration to turn off hostonly image generation
+Requires: %{name} = %{version}-%{release}
+Obsoletes: dracut-nohostonly
+Provides:  dracut-nohostonly
+
+%description config-generic
+This package provides the configuration to turn off the host specific initramfs
+generation with dracut and generates a generic image by default.
+
+%package config-rescue
+Summary: dracut configuration to turn on rescue image generation
+Requires: %{name} = %{version}-%{release}
+Obsoletes: dracut <= 029
+
+%description config-rescue
+This package provides the configuration to turn on the rescue initramfs
+generation with dracut.
 
 %package tools
 Summary: dracut tools to build the local initramfs
@@ -175,44 +205,41 @@ git am -p1 %{patches}
 %endif
 
 %build
-make all
+%configure --systemdsystemunitdir=%{_unitdir} --bashcompletiondir=$(pkg-config --variable=completionsdir bash-completion) --libdir=%{_prefix}/lib
+
+make %{?_smp_mflags}
 
 %install
 %if 0%{?fedora} || 0%{?rhel}
-rm -rf $RPM_BUILD_ROOT
+rm -rf -- $RPM_BUILD_ROOT
 %endif
-make install DESTDIR=$RPM_BUILD_ROOT \
-     libdir=%{_prefix}/lib \
-     bindir=%{_bindir} \
-%if %{defined _unitdir}
-     systemdsystemunitdir=%{_unitdir} \
-%endif
-     sysconfdir=/etc mandir=%{_mandir}
+make %{?_smp_mflags} install \
+     DESTDIR=$RPM_BUILD_ROOT \
+     libdir=%{_prefix}/lib
 
 echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh
 
 %if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} == 0
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
 %endif
 
 %if %{defined _unitdir}
 # for systemd, better use systemd-bootchart
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00bootchart
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00bootchart
 %endif
 
 # we do not support dash in the initramfs
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
 
 # remove gentoo specific modules
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
 
 %if %{defined _unitdir}
 # with systemd IMA and selinux modules do not make sense
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/96securityfs
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/97masterkey
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98selinux
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/96securityfs
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/97masterkey
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity
 %endif
 
 mkdir -p $RPM_BUILD_ROOT/boot/dracut
@@ -231,43 +258,57 @@ install -m 0644 dracut.conf.d/suse.conf.example   $RPM_BUILD_ROOT%{dracutlibdir}
 %endif
 
 %if 0%{?fedora} <= 12 && 0%{?rhel} < 6 && 0%{?suse_version} <= 9999
-rm $RPM_BUILD_ROOT%{_bindir}/mkinitrd
-rm $RPM_BUILD_ROOT%{_bindir}/lsinitrd
+rm -f -- $RPM_BUILD_ROOT%{_bindir}/mkinitrd
+rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd
 %endif
 
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
+%if 0%{?fedora} || 0%{?rhel} > 6
+# FIXME: remove after F19
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d
+install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
+
+echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
+echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf
+%endif
+
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
+> $RPM_BUILD_ROOT/etc/system-fips
+%endif
 
 # create compat symlink
-mkdir -p $RPM_BUILD_ROOT/sbin
-ln -s /usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+ln -sr $RPM_BUILD_ROOT%{_bindir}/dracut $RPM_BUILD_ROOT%{_sbindir}/dracut
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf -- $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,0755)
 %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
 %{_bindir}/dracut
 # compat symlink
-/sbin/dracut
+%{_sbindir}/dracut
+%{_datadir}/bash-completion/completions/dracut
+%{_datadir}/bash-completion/completions/lsinitrd
 %if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
 %{_bindir}/mkinitrd
 %{_bindir}/lsinitrd
 %endif
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/modules.d
+%{dracutlibdir}/dracut-init.sh
 %{dracutlibdir}/dracut-functions.sh
 %{dracutlibdir}/dracut-functions
 %{dracutlibdir}/dracut-version.sh
 %{dracutlibdir}/dracut-logger.sh
 %{dracutlibdir}/dracut-initramfs-restore
 %{dracutlibdir}/dracut-install
-%config(noreplace) /etc/dracut.conf
+%{dracutlibdir}/skipcpio
+%config(noreplace) %{_sysconfdir}/dracut.conf
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %{dracutlibdir}/dracut.conf.d/01-dist.conf
 %endif
-%dir /etc/dracut.conf.d
+%dir %{_sysconfdir}/dracut.conf.d
 %dir %{dracutlibdir}/dracut.conf.d
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man8/*service.8*
@@ -277,12 +318,17 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.cmdline.7*
+%{_mandir}/man7/dracut.modules.7*
+%{_mandir}/man7/dracut.bootup.7*
 %{_mandir}/man5/dracut.conf.5*
 %if %{defined _unitdir}
 %{dracutlibdir}/modules.d/00systemd-bootchart
 %else
 %{dracutlibdir}/modules.d/00bootchart
 %endif
+%{dracutlibdir}/modules.d/00bash
+%{dracutlibdir}/modules.d/03modsign
+%{dracutlibdir}/modules.d/03rescue
 %{dracutlibdir}/modules.d/04watchdog
 %{dracutlibdir}/modules.d/05busybox
 %{dracutlibdir}/modules.d/10i18n
@@ -291,6 +337,7 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/50drm
 %{dracutlibdir}/modules.d/50plymouth
 %{dracutlibdir}/modules.d/80cms
+%{dracutlibdir}/modules.d/90bcache
 %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90crypt
 %{dracutlibdir}/modules.d/90dm
@@ -316,12 +363,12 @@ rm -rf $RPM_BUILD_ROOT
 %if %{undefined _unitdir}
 %{dracutlibdir}/modules.d/96securityfs
 %{dracutlibdir}/modules.d/97masterkey
-%{dracutlibdir}/modules.d/98selinux
 %{dracutlibdir}/modules.d/98integrity
 %endif
 %{dracutlibdir}/modules.d/97biosdevname
 %{dracutlibdir}/modules.d/98ecryptfs
 %{dracutlibdir}/modules.d/98pollcdrom
+%{dracutlibdir}/modules.d/98selinux
 %{dracutlibdir}/modules.d/98syslog
 %{dracutlibdir}/modules.d/98systemd
 %{dracutlibdir}/modules.d/98usrmount
@@ -329,12 +376,26 @@ rm -rf $RPM_BUILD_ROOT
 %{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}/dracut-shutdown.service
 %{_unitdir}/shutdown.target.wants/dracut-shutdown.service
+%{_unitdir}/dracut-cmdline.service
+%{_unitdir}/dracut-initqueue.service
+%{_unitdir}/dracut-mount.service
+%{_unitdir}/dracut-pre-mount.service
+%{_unitdir}/dracut-pre-pivot.service
+%{_unitdir}/dracut-pre-trigger.service
+%{_unitdir}/dracut-pre-udev.service
+%{_unitdir}/initrd.target.wants/dracut-cmdline.service
+%{_unitdir}/initrd.target.wants/dracut-initqueue.service
+%{_unitdir}/initrd.target.wants/dracut-mount.service
+%{_unitdir}/initrd.target.wants/dracut-pre-mount.service
+%{_unitdir}/initrd.target.wants/dracut-pre-pivot.service
+%{_unitdir}/initrd.target.wants/dracut-pre-trigger.service
+%{_unitdir}/initrd.target.wants/dracut-pre-udev.service
+
 %endif
 %if 0%{?fedora} || 0%{?rhel} > 6
 %{_prefix}/lib/kernel/install.d/50-dracut.install
@@ -353,12 +414,15 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/95ssh-client
 %{dracutlibdir}/modules.d/45ifcfg
 %{dracutlibdir}/modules.d/95znet
+%{dracutlibdir}/modules.d/95fcoe-uefi
+%{dracutlibdir}/modules.d/99uefi-lib
 
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
 %files fips
 %defattr(-,root,root,0755)
 %{dracutlibdir}/modules.d/01fips
 %{dracutlibdir}/dracut.conf.d/40-fips.conf
+%config(missingok) /etc/system-fips
 %endif
 
 %files fips-aesni
@@ -378,4 +442,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut
 %dir /var/lib/dracut/overlay
 
+%files config-generic
+%defattr(-,root,root,0755)
+%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
+
+%files config-rescue
+%defattr(-,root,root,0755)
+%{dracutlibdir}/dracut.conf.d/02-rescue.conf
+%if 0%{?fedora} || 0%{?rhel} > 6
+%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
+%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
+%endif
+
 %changelog

dracut.usage.asc

@@ -0,0 +1,509 @@
+To create a initramfs image, the most simple command is:
+----
+# dracut
+----
+
+This will generate a general purpose initramfs image, with all possible
+functionality resulting of the combination of the installed dracut modules and
+system tools. The image is /boot/initramfs-_++<kernel version>++_.img and
+contains the kernel modules of the currently active kernel with version
+_++<kernel version>++_.
+
+If the initramfs image already exists, dracut will display an error message, and
+to overwrite the existing image, you have to use the --force option.
+----
+# dracut --force
+----
+
+If you want to specify another filename for the resulting image you would issue
+a command like:
+----
+# dracut foobar.img
+----
+
+To generate an image for a specific kernel version, the command would be:
+----
+# dracut foobar.img 2.6.40-1.rc5.f20
+----
+
+A shortcut to generate the image at the default location for a specific kernel
+version is:
+----
+# dracut --kver 2.6.40-1.rc5.f20
+----
+
+If you want to create lighter, smaller initramfs images, you may want to specify
+the --hostonly or -H option. Using this option, the resulting image will
+contain only those dracut modules, kernel modules and filesystems, which are
+needed to boot this specific machine. This has the drawback, that you can't put
+the disk on another controller or machine, and that you can't switch to another
+root filesystem, without recreating the initramfs image.
+
+[NOTE]
+===============================
+On RHEL-7 the hostonly mode is the default mode. Generic "non-hostonly" images
+are created, if the dracut-config-generic rpm is installed. The rescue kernel
+entry in the bootloader menu is also a generic image.
+===============================
+
+=== Inspecting the Contents
+To see the contents of the image created by dracut, you can use the lsinitrd
+tool.
+----
+# lsinitrd | less
+----
+
+To display the contents of a file in the initramfs also use the lsinitrd tool:
+----
+# lsinitrd -f /etc/ld.so.conf
+include ld.so.conf.d/*.conf
+----
+
+=== Adding dracut Modules
+Some dracut modules are turned off by default and have to be activated manually.
+You can do this by adding the dracut modules to the configuration file
+_/etc/dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_. See *dracut.conf*(5).
+You can also add dracut modules on the command line
+by using the -a or --add option:
+----
+# dracut --add bootchart initramfs-bootchart.img
+----
+
+To see a list of available dracut modules, use the --list-modules option:
+----
+# dracut --list-modules
+----
+
+=== Omitting dracut Modules
+Sometimes you don't want a dracut module to be included for reasons of speed,
+size or functionality. To do this, either specify the omit_dracutmodules
+variable in the _dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_ configuration
+file (see *dracut.conf*(5)), or use the -o or --omit option
+on the command line:
+----
+# dracut -o "multipath lvm" no-multipath-lvm.img
+----
+
+=== Adding Kernel Modules
+If you need a special kernel module in the initramfs, which is not
+automatically picked up by dracut, you have the use the --add-drivers option
+on the command line or  the drivers vaiable in  the _/etc/dracut.conf_
+or _/etc/dracut.conf.d/myconf.conf_ configuration file (see *dracut.conf*(5)):
+----
+# dracut --add-drivers mymod initramfs-with-mymod.img
+----
+
+=== Boot parameters
+An initramfs generated without the "hostonly" mode, does not contain any system
+configuration files (except for some special exceptions), so the configuration
+has to be done on the kernel command line. With this flexibility, you can easily
+boot from a changed root partition, without the need to recompile the initramfs
+image. So, you could completly change your root partition (move it inside a md
+raid with encryption and LVM on top), as long as you specify the correct
+filesystem LABEL or UUID on the kernel command line for your root device, dracut
+will find it and boot from it.
+
+The kernel command line usually can be configured in _/boot/grub2/grub.cfg_
+(or _/boot/efi/EFI/redhat/grub.cfg_ for EFI systems), if
+grub2 is your bootloader and it also can be edited in the real boot process in
+the grub menu.
+
+The kernel command line can also be provided by the dhcp server with the
+root-path option. See <<NetworkBoot>>.
+
+For a full reference of all kernel command line parameters,
+see *dracut.cmdline*(5).
+
+To get a quick start for the suitable kernel command line on your system,
+use the __--print-cmdline__ option:
+----
+# dracut --print-cmdline
+ root=UUID=8b8b6f91-95c7-4da2-831b-171e12179081 rootflags=rw,relatime,discard,data=ordered rootfstype=ext4
+----
+
+==== Specifying the root Device
+This is the only option dracut really needs to boot from your root partition.
+Because your root partition can live in various environments, there are a lot of
+formats for the root= option. The most basic one is root=_++<path to device
+node>++_:
+----
+root=/dev/sda2
+----
+
+Because device node names can change, dependent on the drive ordering, you are
+encouraged to use the filesystem identifier (UUID) or filesystem label (LABEL)
+to specify your root partition:
+----
+root=UUID=19e9dda3-5a38-484d-a9b0-fa6b067d0331
+----
+
+or
+
+----
+root=LABEL=myrootpartitionlabel
+----
+
+To see all UUIDs or LABELs on your system, do:
+----
+# ls -l /dev/disk/by-uuid
+----
+
+or
+
+----
+# ls -l /dev/disk/by-label
+----
+
+If your root partition is on the network see <<NetworkBoot>>.
+
+==== Keyboard Settings
+If you have to input passwords for encrypted disk volumes, you might want to set
+the keyboard layout and specify a display font.
+
+A typical german kernel command would contain:
+----
+rd.vconsole.font=latarcyrheb-sun16 rd.vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8
+----
+
+Setting these options can override the setting stored on your system, if you use
+a modern init system, like systemd.
+
+==== Blacklisting Kernel Modules
+Sometimes it is required to prevent the automatic kernel module loading of a
+specific kernel module. To do this, just add rd.blacklist=_++<kernel module
+name>++_, with _++<kernel module name>++_ not containing the _.ko_
+suffix, to the kernel command line. For example:
+----
+rd.driver.blacklist=mptsas rd.driver.blacklist=nouveau
+----
+
+The option can be specified multiple times on the kernel command line.
+
+==== Speeding up the Boot Process
+If you want to speed up the boot process, you can specify as much information
+for dracut on the kernel command as possible. For example, you can tell dracut,
+that you root partition is not on a LVM volume or not on a raid partition, or
+that it lives inside a specific crypto LUKS encrypted volume. By default, dracut
+searches everywhere. A typical dracut kernel command line for a plain primary or
+logical partition would contain:
+----
+rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+----
+
+This turns off every automatic assembly of LVM, MD raids, DM raids and
+crypto LUKS.
+
+Of course, you could also omit the dracut modules in the initramfs creation
+process, but then you would lose the posibility to turn it on on demand.
+
+
+[[Injecting]]
+=== Injecting custom Files
+To add your own files to the initramfs image, you have several possibilities.
+
+The --include option let you specify a source path and a target path.
+For example
+----
+# dracut --include cmdline-preset /etc/cmdline.d/mycmdline.conf initramfs-cmdline-pre.img
+----
+will create an initramfs image, where the file cmdline-preset will be copied
+inside the initramfs to _/etc/cmdline.d/mycmdline.conf_. --include can only
+be specified once.
+
+
+----
+# mkdir -p rd.live.overlay/etc/cmdline.d
+# mkdir -p rd.live.overlay/etc/conf.d
+# echo "ip=dhcp" >> rd.live.overlay/etc/cmdline.d/mycmdline.conf
+# echo export FOO=testtest >> rd.live.overlay/etc/conf.d/testvar.conf
+# echo export BAR=testtest >> rd.live.overlay/etc/conf.d/testvar.conf
+# tree rd.live.overlay/
+rd.live.overlay/
+`-- etc
+    |-- cmdline.d
+    |   `-- mycmdline.conf
+    `-- conf.d
+        `-- testvar.conf
+
+# dracut --include rd.live.overlay / initramfs-rd.live.overlay.img
+----
+
+This will put the contents of the rd.live.overlay directory into the root of the
+initramfs image.
+
+The --install option let you specify several files, which will get installed in
+the initramfs image at the same location, as they are present on initramfs
+creation time.
+
+
+----
+# dracut --install 'strace fsck.ext3 ssh' initramfs-dbg.img
+----
+
+This will create an initramfs with the strace, fsck.ext3 and ssh executables,
+together with the libraries needed to start those. The --install option can be
+specified multiple times.
+
+
+[[NetworkBoot]]
+=== Network Boot
+
+If your root partition is on a network drive, you have to have the network
+dracut modules installed to create a network aware initramfs image.
+
+On a Red Hat Enterprise Linux or Fedora system, this means, you have to install
+the _dracut-network_ rpm package:
+
+
+----
+# yum install dracut-network
+----
+
+The resulting initramfs image can be served by a boot manager residing on your
+local hard drive or it can be served by a PXE/TFTP server.
+
+How to setup your PXE/TFTP server can be found in the
+http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/[Red
+Hat Enterprise Linux Storage Administration Guide].
+
+If you specify ip=dhcp on the kernel command line, then dracut asks a dhcp
+server about the ip adress for the machine. The dhcp server can also serve an
+additional root-path, which will set the root device for dracut. With this
+mechanism, you have static configuration on your client machine and a
+centralized boot configuration on your TFTP/DHCP server. If you can't pass a
+kernel command line, then you can inject _/etc/cmdline.d/mycmdline.conf_, with a
+method described in <<Injecting>>.
+
+==== Reducing the Image Size
+
+To reduce the size of the initramfs, you should create it with by ommitting all
+dracut modules, which you know, you don't need to boot the machine.
+
+You can also specify the exact dracut and kernel modules to produce a very tiny
+initramfs image.
+
+For example for a NFS image, you would do:
+
+
+----
+# dracut -m "nfs network  base" initramfs-nfs-only.img
+----
+
+Then you would boot from this image with your target machine and reduce the size
+once more by creating it on the target machine with the --host-only option:
+
+
+----
+# dracut -m "nfs network base" --host-only initramfs-nfs-host-only.img
+----
+
+This will reduce the size of the initramfs image significantly.
+
+
+== Troubleshooting
+
+If the boot process does not succeed, you have several options to debug the
+situation. Some of the basic operations are covered here. For more information
+you should also visit:
+http://fedoraproject.org/wiki/How_to_debug_Dracut_problems
+
+
+[[identifying-your-problem-area]]
+=== Identifying your problem area
+. Remove ''rhgb'' and ''quiet'' from the kernel command line
+. Add ''rd.shell'' to the kernel command line. This will present a shell should
+dracut be unable to locate your root device
+. Add ''rd.shell rd.debug log_buf_len=1M'' to the kernel command line so that
+dracut shell commands are printed as they are executed
+. The file /run/initramfs/rdsosreport.txt is generated,
+which contains all the logs and the output of all significant tools, which are
+mentioned later.
+
+If you want to save that output, simply mount /boot by hand or insert an USB
+stick and mount that. Then you can store the output for later inspection.
+
+[[information-to-include-in-your-report]]
+=== Information to include in your report
+
+[[all-bug-reports]]
+==== All bug reports
+In all cases, the following should be mentioned and attached to your bug report:
+
+* The exact kernel command-line used. Typically from the bootloader
+configuration file (e.g. _/boot/grub2/grub.cfg_ (or _/boot/efi/EFI/redhat/grub.cfg_ for EFI systems))
+or from _/proc/cmdline_.
+* A copy of your disk partition information from _/etc/fstab_, which might be
+obtained booting an old working initramfs or a rescue medium.
+* Turn on dracut debugging (see _the 'debugging dracut' section_), and attach
+the file /run/initramfs/rdsosreport.txt.
+* If you use a dracut configuration file, please include _/etc/dracut.conf_ and
+all files in _/etc/dracut.conf.d/*.conf_
+
+[[network-root-device-related-problems]]
+==== Network root device related problems
+This section details information to include when experiencing problems on a
+system whose root device is located on a network attached volume (e.g. iSCSI,
+NFS or NBD). As well as the information from <<all-bug-reports>>, include the
+following information:
+
+
+* Please include the output of
++
+----
+# /sbin/ifup <interfacename>
+# ip addr show
+----
+
+[[debugging-dracut]]
+=== Debugging dracut
+
+
+[[configure-a-serial-console]]
+==== Configure a serial console
+
+Successfully debugging dracut will require some form of console
+logging during the system boot.  This section documents configuring a
+serial console connection to record boot messages.
+
+. In _/boot/grub2/grub.cfg_ (or _/boot/efi/EFI/redhat/grub.cfg_ for EFI systems),
+add the following boot arguments to the ''linux16''
+line:
++
+----
+console=tty0 console=ttyS0,9600
+----
++
+. More detailed information on how to configure the kernel for console output
+can be found at
+http://www.faqs.org/docs/Linux-HOWTO/Remote-Serial-Console-HOWTO.html#CONFIGURE-KERNEL.
+
+[[using-the-dracut-shell]]
+==== Using the dracut shell
+
+dracut offers a shell for interactive debugging in the event dracut fails to
+locate your root filesystem. To enable the shell:
+
+. Add the boot parameter ''rd.shell'' to your bootloader configuration file
+(e.g. _/boot/grub2/grub.cfg_ (or _/boot/efi/EFI/redhat/grub.cfg_ for EFI systems))
+. Remove the boot arguments ''rhgb'' and ''quiet''
++
+A sample _grub.cfg_ bootloader configuration file snippet is listed below.
++
+----
+menuentry 'Red Hat Enterprise Linux Server (3.10.0-308.el7.x86_64) 7.0 (Maipo)' […] {
+  […]
+  linux16 /vmlinuz-3.10.0-308.el7.x86_64 ro root=/dev/mapper/vg_uc1-lv_root console=tty0 rd.shell
+  initrd16 /initramfs-3.10.0-308.el7.x86_64.img
+  […]
+}
+----
++
+. If system boot fails, you will be dropped into a shell as seen in the example
+below.
++
+----
+No root device found
+Dropping to debug shell.
+
+#
+----
++
+. Use this shell prompt to gather the information requested above
+(see <<all-bug-reports>>).
+
+[[accessing-the-root-volume-from-the-dracut-shell]]
+==== Accessing the root volume from the dracut shell
+From the dracut debug shell, you can manually perform the task of locating and
+preparing your root volume for boot. The required steps will depend on how your
+root volume is configured. Common scenarios include:
+
+* A block device (e.g. _/dev/sda7_)
+* A LVM logical volume (e.g. _/dev/VolGroup00/LogVol00_)
+* An encrypted device
+  (e.g. _/dev/mapper/luks-4d5972ea-901c-4584-bd75-1da802417d83_)
+* A network attached device
+  (e.g. _netroot=iscsi:@192.168.0.4::3260::iqn.2009-02.org.example:for.all_)
+
+The exact method for locating and preparing will vary. However, to continue with
+a successful boot, the objective is to locate your root volume and create a
+symlink _/dev/root_ which points to the file system. For example, the following
+example demonstrates accessing and booting a root volume that is an encrypted
+LVM Logical volume.
+
+. Inspect your partitions using parted
++
+----
+# parted /dev/sda -s p
+Model: ATA HTS541060G9AT00 (scsi)
+Disk /dev/sda: 60.0GB
+Sector size (logical/physical): 512B/512B
+Partition Table: msdos
+Number  Start   End     Size    Type      File system  Flags
+1      32.3kB  10.8GB  107MB   primary   ext4         boot
+2      10.8GB  55.6GB  44.7GB  logical                lvm
+----
++
+. You recall that your root volume was a LVM logical volume. Scan and activate
+any logical volumes.
++
+----
+# lvm vgscan
+# lvm vgchange -ay
+----
++
+. You should see any logical volumes now using the command blkid:
++
+----
+# blkid
+/dev/sda1: UUID="3de247f3-5de4-4a44-afc5-1fe179750cf7" TYPE="ext4"
+/dev/sda2: UUID="Ek4dQw-cOtq-5MJu-OGRF-xz5k-O2l8-wdDj0I" TYPE="LVM2_member"
+/dev/mapper/linux-root: UUID="def0269e-424b-4752-acf3-1077bf96ad2c" TYPE="crypto_LUKS"
+/dev/mapper/linux-home: UUID="c69127c1-f153-4ea2-b58e-4cbfa9257c5e" TYPE="ext3"
+/dev/mapper/linux-swap: UUID="47b4d329-975c-4c08-b218-f9c9bf3635f1" TYPE="swap"
+----
++
+. From the output above, you recall that your root volume exists on an encrypted
+block device. Following the guidance disk encryption guidance from the
+Installation Guide, you unlock your encrypted root volume.
++
+----
+# UUID=$(cryptsetup luksUUID /dev/mapper/linux-root)
+# cryptsetup luksOpen /dev/mapper/linux-root luks-$UUID
+Enter passphrase for /dev/mapper/linux-root:
+Key slot 0 unlocked.
+----
++
+. Next, make a symbolic link to the unlocked root volume
++
+----
+# ln -s /dev/mapper/luks-$UUID /dev/root
+----
++
+. With the root volume available, you may continue booting the system by exiting
+the dracut shell
++
+----
+# exit
+----
+
+[[additional-dracut-boot-parameters]]
+==== Additional dracut boot parameters
+For more debugging options, see *dracut.cmdline*(7).
+
+
+[[debugging-dracut-on-shutdown]]
+==== Debugging dracut on shutdown
+
+To debug the shutdown sequence on systemd systems, you can _rd.break_
+on _pre-shutdown_ or _shutdown_.
+
+To do this from an already booted system:
+----
+# mkdir -p /run/initramfs/etc/cmdline.d
+# echo "rd.break=pre-shutdown" > /run/initramfs/etc/cmdline.d/debug.conf
+# touch /run/initramfs/.need_shutdown
+----
+
+This will give you a dracut shell after the system pivot'ed back in the
+initramfs.
+

git2spec.pl

@@ -1,21 +1,5 @@
 #!/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;
@@ -31,12 +15,12 @@ my $datestr = strftime "%Y%m%d", gmtime;
 
 my $tag=shift;
 my $pdir=shift;
-$tag=&last_tag if not defined $tag;
+$tag=`git describe --abbrev=0 --tags` if not defined $tag;
+chomp($tag);
 my @patches=&create_patches($tag, $pdir);
 my $num=$#patches + 2;
 $tag=~s/[^0-9]+?([0-9]+)/$1/;
-my $release="$num.git$datestr";
-$release="1" if $num == 1;
+my $release="$num";
 
 while(<>) {
     if (/^Version:/) {

install/.kateconfig

@@ -0,0 +1 @@
+kate: space-indent on; tab-width 8; indent-width 8; replace-tabs on; eol unix;

install/dracut-install.c

@@ -62,6 +62,10 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
 static size_t dir_len(char const *file)
 {
         size_t length;
+
+        if(!file)
+                return 0;
+
         /* Strip the basename and any redundant slashes before it.  */
         for (length = strlen(file)-1; 0 < length; length--)
                 if (file[length] == '/' && file[length-1] != '/')
@@ -73,20 +77,23 @@ static char *convert_abs_rel(const char *from, const char *target)
 {
         /* we use the 4*MAXPATHLEN, which should not overrun */
         char relative_from[MAXPATHLEN * 4];
-        char *realtarget = NULL;
-        char *p, *q;
+        _cleanup_free_ char *realtarget = NULL;
+        _cleanup_free_ char *target_dir_p = NULL, *realpath_p = NULL;
         const char *realfrom = from;
-        int level = 0, fromlevel = 0, targetlevel = 0;
-        int l, i, rl;
-        int dirlen;
+        size_t level = 0, fromlevel = 0, targetlevel = 0;
+        int l;
+        size_t i, rl, dirlen;
+        int ret;
 
-        p = strdup(target);
-        dirlen = dir_len(p);
-        p[dirlen] = '\0';
-        q = realpath(p, NULL);
+        target_dir_p = strdup(target);
+        if (!target_dir_p)
+                return strdup(from);
 
-        if (q == NULL) {
-                free(p);
+        dirlen = dir_len(target_dir_p);
+        target_dir_p[dirlen] = '\0';
+        realpath_p = realpath(target_dir_p, NULL);
+
+        if (realpath_p == NULL) {
                 log_warning("convert_abs_rel(): target '%s' directory has no realpath.", target);
                 return strdup(from);
         }
@@ -95,11 +102,13 @@ static char *convert_abs_rel(const char *from, const char *target)
          * character - need to skip all leading /'s */
         rl = strlen(target);
         for (i = dirlen+1; i < rl; ++i)
-            if (p[i] != '/')
+            if (target_dir_p[i] != '/')
                 break;
-        asprintf(&realtarget, "%s/%s", q, &p[i]);
-        free(p);
-        free(q);
+        ret = asprintf(&realtarget, "%s/%s", realpath_p, &target_dir_p[i]);
+        if (ret < 0) {
+                log_error("Out of memory!");
+                exit(EXIT_FAILURE);
+        }
 
         /* now calculate the relative path from <from> to <target> and
            store it in <relative_from>
@@ -122,8 +131,6 @@ static char *convert_abs_rel(const char *from, const char *target)
                 if (realtarget[i] == '/')
                         level++;
 
-        free(realtarget);
-
         /* add "../" to the relative_from path, until the common pathname is
            reached */
         for (i = level; i < targetlevel; i++) {
@@ -155,18 +162,16 @@ static char *convert_abs_rel(const char *from, const char *target)
 static int ln_r(const char *src, const char *dst)
 {
         int ret;
-        const char *points_to = convert_abs_rel(src, dst);
+        _cleanup_free_ const char *points_to = convert_abs_rel(src, dst);
+
         log_info("ln -s '%s' '%s'", points_to, dst);
         ret = symlink(points_to, dst);
 
         if (ret != 0) {
                 log_error("ERROR: ln -s '%s' '%s': %m", points_to, dst);
-                free((char *)points_to);
                 return 1;
         }
 
-        free((char *)points_to);
-
         return 0;
 }
 
@@ -186,11 +191,11 @@ static bool use_clone = true;
 static int cp(const char *src, const char *dst)
 {
         int pid;
-        int ret;
+        int ret = 0;
 
         if (use_clone) {
                 struct stat sb;
-                int dest_desc, source_desc;
+                _cleanup_close_ int dest_desc = -1, source_desc = -1;
 
                 if (lstat(src, &sb) != 0)
                         goto normal_copy;
@@ -207,20 +212,24 @@ static int cp(const char *src, const char *dst)
                          (sb.st_mode) & (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO));
 
                 if (dest_desc < 0) {
-                        close(source_desc);
                         goto normal_copy;
                 }
 
                 ret = clone_file(dest_desc, source_desc);
-                close(source_desc);
+
                 if (ret == 0) {
+                        struct timeval tv[2];
                         if (fchown(dest_desc, sb.st_uid, sb.st_gid) != 0)
-                                fchown(dest_desc, -1, sb.st_gid);
-                        close(dest_desc);
+                                fchown(dest_desc, (__uid_t)-1, sb.st_gid);
+                        tv[0].tv_sec = sb.st_atime;
+                        tv[0].tv_usec = 0;
+                        tv[1].tv_sec = sb.st_mtime;
+                        tv[1].tv_usec = 0;
+                        futimes(dest_desc, tv);
                         return ret;
                 }
                 close(dest_desc);
-
+                dest_desc = -1;
                 /* clone did not work, remove the file */
                 unlink(dst);
                 /* do not try clone again */
@@ -230,16 +239,83 @@ static int cp(const char *src, const char *dst)
  normal_copy:
         pid = fork();
         if (pid == 0) {
-                execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode", "-fL", src, dst, NULL);
+                execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst, NULL);
                 _exit(EXIT_FAILURE);
         }
 
         while (waitpid(pid, &ret, 0) < 0) {
                 if (errno != EINTR) {
                         ret = -1;
+                        log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src, dst);
                         break;
                 }
         }
+        log_debug("cp ret = %d", ret);
+        return ret;
+}
+
+static int library_install(const char *src, const char *lib)
+{
+        _cleanup_free_ char *p = NULL;
+        _cleanup_free_ char *pdir = NULL, *ppdir = NULL, *clib = NULL;
+        char *q;
+        int r, ret = 0;
+
+        p = strdup(lib);
+
+        r = dracut_install(p, p, false, false, true);
+        if (r != 0)
+                log_error("ERROR: failed to install '%s' for '%s'", p, src);
+        else
+                log_debug("Lib install: '%s'", p);
+        ret += r;
+
+        /* also install lib.so for lib.so.* files */
+        q = strstr(p, ".so.");
+        if (q) {
+                q[3] = '\0';
+
+                /* ignore errors for base lib symlink */
+                if (dracut_install(p, p, false, false, true) == 0)
+                        log_debug("Lib install: '%s'", p);
+        }
+
+        /* Also try to install the same library from one directory above.
+           This fixes the case, where only the HWCAP lib would be installed
+           # ldconfig -p|fgrep libc.so
+           libc.so.6 (libc6,64bit, hwcap: 0x0000001000000000, OS ABI: Linux 2.6.32) => /lib64/power6/libc.so.6
+           libc.so.6 (libc6,64bit, hwcap: 0x0000000000000200, OS ABI: Linux 2.6.32) => /lib64/power6x/libc.so.6
+           libc.so.6 (libc6,64bit, OS ABI: Linux 2.6.32) => /lib64/libc.so.6
+        */
+
+        free(p);
+        p = strdup(lib);
+
+        pdir = dirname(p);
+        if (!pdir)
+                return ret;
+
+        pdir = strdup(pdir);
+        ppdir = dirname(pdir);
+        if (!ppdir)
+                return ret;
+
+        ppdir = strdup(ppdir);
+
+        strcpy(p, lib);
+
+        clib = strjoin(ppdir, "/", basename(p), NULL);
+        if (dracut_install(clib, clib, false, false, true) == 0)
+                log_debug("Lib install: '%s'", clib);
+        /* also install lib.so for lib.so.* files */
+        q = strstr(clib, ".so.");
+        if (q) {
+                q[3] = '\0';
+
+                /* ignore errors for base lib symlink */
+                if (dracut_install(clib, clib, false, false, true) == 0)
+                        log_debug("Lib install: '%s'", p);
+        }
 
         return ret;
 }
@@ -248,17 +324,19 @@ static int resolve_deps(const char *src)
 {
         int ret = 0;
 
-        char *buf = malloc(LINE_MAX);
+        _cleanup_free_ char *buf = malloc(LINE_MAX);
         size_t linesize = LINE_MAX;
-        FILE *fptr;
-        char *cmd;
+        _cleanup_pclose_ FILE *fptr = NULL;
+        _cleanup_free_ char *cmd = NULL;
 
         if (strstr(src, ".so") == 0) {
-                int fd;
+                _cleanup_close_ int fd = -1;
                 fd = open(src, O_RDONLY | O_CLOEXEC);
+                if (fd < 0)
+                        return -errno;
+
                 read(fd, buf, LINE_MAX);
                 buf[LINE_MAX - 1] = '\0';
-                close(fd);
                 if (buf[0] == '#' && buf[1] == '!') {
                         /* we have a shebang */
                         char *p, *q;
@@ -274,7 +352,14 @@ static int resolve_deps(const char *src)
         }
 
         /* run ldd */
-        asprintf(&cmd, "ldd %s 2>&1", src);
+        ret = asprintf(&cmd, "ldd %s 2>&1", src);
+        if (ret < 0) {
+                log_error("Out of memory!");
+                exit(EXIT_FAILURE);
+        }
+
+        ret = 0;
+
         fptr = popen(cmd, "r");
 
         while (!feof(fptr)) {
@@ -285,6 +370,12 @@ static int resolve_deps(const char *src)
 
                 log_debug("ldd: '%s'", buf);
 
+                if (strstr(buf, "you do not have execution permission")) {
+                        log_error("%s", buf);
+                        ret+=1;
+                        break;
+                }
+
                 if (strstr(buf, "not a dynamic executable"))
                         break;
 
@@ -294,31 +385,25 @@ static int resolve_deps(const char *src)
                 if (strstr(buf, "not regular file"))
                         break;
 
-                p = strstr(buf, "/");
+                if (strstr(buf, "cannot read header"))
+                        break;
+
+                if (strstr(buf, destrootdir))
+                        break;
+
+                p = strstr(buf, "=>");
+                if (!p)
+                        p = buf;
+
+                p = strchr(p, '/');
                 if (p) {
-                        int r;
                         for (q = p; *q && *q != ' ' && *q != '\n'; q++) ;
                         *q = '\0';
-                        r = dracut_install(p, p, false, false, true);
-                        if (r != 0)
-                                log_error("ERROR: failed to install '%s' for '%s'", p, src);
-                        else
-                                log_debug("Lib install: '%s'", p);
-                        ret += r;
 
-                        /* also install lib.so for lib.so.* files */
-                        q = strstr(p, ".so.");
-                        if (q) {
-                                q += 3;
-                                *q = '\0';
+                        ret += library_install(src, p);
 
-                                /* ignore errors for base lib symlink */
-                                if (dracut_install(p, p, false, false, true) == 0)
-                                        log_debug("Lib install: '%s'", p);
-                        }
                 }
         }
-        pclose(fptr);
 
         return ret;
 }
@@ -326,10 +411,15 @@ static int resolve_deps(const char *src)
 /* Install ".<filename>.hmac" file for FIPS self-checks */
 static int hmac_install(const char *src, const char *dst, const char *hmacpath)
 {
-        char *srcpath = strdup(src);
-        char *dstpath = strdup(dst);
-        char *srchmacname = NULL;
-        char *dsthmacname = NULL;
+        _cleanup_free_ char *srcpath = strdup(src);
+        _cleanup_free_ char *dstpath = strdup(dst);
+        _cleanup_free_ char *srchmacname = NULL;
+        _cleanup_free_ char *dsthmacname = NULL;
+        int ret;
+
+        if (!(srcpath && dstpath))
+                return -ENOMEM;
+
         size_t dlen = dir_len(src);
 
         if (endswith(src, ".hmac"))
@@ -338,35 +428,51 @@ static int hmac_install(const char *src, const char *dst, const char *hmacpath)
 	if (!hmacpath) {
                 hmac_install(src, dst, "/lib/fipscheck");
                 hmac_install(src, dst, "/lib64/fipscheck");
+                hmac_install(src, dst, "/lib/hmaccalc");
+                hmac_install(src, dst, "/lib64/hmaccalc");
         }
 
         srcpath[dlen] = '\0';
         dstpath[dir_len(dst)] = '\0';
         if (hmacpath) {
-                asprintf(&srchmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
-                asprintf(&dsthmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
+                ret = asprintf(&srchmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
+                if (ret < 0) {
+                        log_error("Out of memory!");
+                        exit(EXIT_FAILURE);
+                }
+
+                ret = asprintf(&dsthmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
+                if (ret < 0) {
+                        log_error("Out of memory!");
+                        exit(EXIT_FAILURE);
+                }
         } else {
-                asprintf(&srchmacname, "%s/.%s.hmac", srcpath, &src[dlen + 1]);
-                asprintf(&dsthmacname, "%s/.%s.hmac", dstpath, &src[dlen + 1]);
+                ret = asprintf(&srchmacname, "%s/.%s.hmac", srcpath, &src[dlen + 1]);
+                if (ret < 0) {
+                        log_error("Out of memory!");
+                        exit(EXIT_FAILURE);
+                }
+
+                ret = asprintf(&dsthmacname, "%s/.%s.hmac", dstpath, &src[dlen + 1]);
+                if (ret < 0) {
+                        log_error("Out of memory!");
+                        exit(EXIT_FAILURE);
+                }
         }
         log_debug("hmac cp '%s' '%s')", srchmacname, dsthmacname);
         dracut_install(srchmacname, dsthmacname, false, false, true);
-        free(dsthmacname);
-        free(srchmacname);
-        free(srcpath);
-        free(dstpath);
         return 0;
 }
 
 static int dracut_install(const char *src, const char *dst, bool isdir, bool resolvedeps, bool hashdst)
 {
         struct stat sb, db;
-        char *dname = NULL;
-        char *fulldstpath = NULL;
-        char *fulldstdir = NULL;
+        _cleanup_free_ char *fulldstpath = NULL;
+        _cleanup_free_ char *fulldstdir = NULL;
         int ret;
         bool src_exists = true;
-        char *i, *existing;
+        char *i = NULL;
+        char *existing;
 
         log_debug("dracut_install('%s', '%s')", src, dst);
 
@@ -399,9 +505,16 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
         }
 
         i = strdup(dst);
+        if (!i)
+                return -ENOMEM;
+
         hashmap_put(items, i, i);
 
-        asprintf(&fulldstpath, "%s%s", destrootdir, dst);
+        ret = asprintf(&fulldstpath, "%s%s", destrootdir, dst);
+        if (ret < 0) {
+                log_error("Out of memory!");
+                exit(EXIT_FAILURE);
+        }
 
         ret = stat(fulldstpath, &sb);
 
@@ -417,7 +530,6 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
                 } else
                         log_debug("'%s' already exists", fulldstpath);
 
-                free(fulldstpath);
                 /* dst does already exist */
                 return ret;
         }
@@ -429,6 +541,8 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
         ret = stat(fulldstdir, &db);
 
         if (ret < 0) {
+                _cleanup_free_ char *dname = NULL;
+
                 if (errno != ENOENT) {
                         log_error("ERROR: stat '%s': %m", fulldstdir);
                         return 1;
@@ -436,35 +550,34 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
                 /* create destination directory */
                 log_debug("dest dir '%s' does not exist", fulldstdir);
                 dname = strdup(dst);
+                if (!dname)
+                        return 1;
+
                 dname[dir_len(dname)] = '\0';
                 ret = dracut_install(dname, dname, true, false, true);
 
-                free(dname);
-
                 if (ret != 0) {
                         log_error("ERROR: failed to create directory '%s'", fulldstdir);
-                        free(fulldstdir);
                         return 1;
                 }
         }
 
-        free(fulldstdir);
-
         if (isdir && !src_exists) {
                 log_info("mkdir '%s'", fulldstpath);
-                return mkdir(fulldstpath, 0755);
+                ret = mkdir(fulldstpath, 0755);
+                return ret;
         }
 
         /* ready to install src */
 
         if (S_ISDIR(sb.st_mode)) {
                 log_info("mkdir '%s'", fulldstpath);
-                return mkdir(fulldstpath, sb.st_mode | S_IWUSR);
+                ret = mkdir(fulldstpath, sb.st_mode | S_IWUSR);
+                return ret;
         }
 
         if (S_ISLNK(sb.st_mode)) {
-                char *abspath;
-                char *absdestpath = NULL;
+                _cleanup_free_ char *abspath = NULL;
 
                 abspath = realpath(src, NULL);
 
@@ -482,15 +595,17 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
                 }
 
                 if (lstat(fulldstpath, &sb) != 0) {
+                        _cleanup_free_ char *absdestpath = NULL;
 
-                        asprintf(&absdestpath, "%s%s", destrootdir, abspath);
+                        ret = asprintf(&absdestpath, "%s%s", destrootdir, abspath);
+                        if (ret < 0) {
+                                log_error("Out of memory!");
+                                exit(EXIT_FAILURE);
+                        }
 
                         ln_r(absdestpath, fulldstpath);
-
-                        free(absdestpath);
                 }
 
-                free(abspath);
                 if (arg_hmac) {
                         /* copy .hmac files also */
                         hmac_install(src, dst, NULL);
@@ -508,8 +623,12 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
                 }
         }
 
+        log_debug("dracut_install ret = %d", ret);
         log_info("cp '%s' '%s'", src, fulldstpath);
         ret += cp(src, fulldstpath);
+
+        log_debug("dracut_install ret = %d", ret);
+
         return ret;
 }
 
@@ -520,49 +639,49 @@ static void item_free(char *i)
 }
 
 static void usage(int status)
-{
-        /*                                                                     */
-        printf("\
-Usage: %s -D DESTROOTDIR [OPTION]... -a SOURCE...\n\
-   or: %s -D DESTROOTDIR [OPTION]... SOURCE DEST\n\
-\n\
-Install SOURCE to DEST in DESTROOTDIR with all needed dependencies.\n\
-\n\
-  -D --destrootdir    Install all files to DESTROOTDIR as the root\n\
-  -a --all            Install all SOURCE arguments to DESTROOTDIR\n\
-  -o --optional       If SOURCE does not exist, do not fail\n\
-  -d --dir            SOURCE is a directory\n\
-  -l --ldd            Also install shebang executables and libraries\n\
-  -R --resolvelazy    Only install shebang executables and libraries for all SOURCE files\n\
-  -H --fips           Also install all '.SOURCE.hmac' files\n\
-  -v --verbose        Show more output\n\
-     --debug          Show debug output\n\
-     --version        Show package version\n\
-  -h --help           Show this help\n\
-\n\
-Example:\n\
-# mkdir -p /var/tmp/test-root\n\
-# %s -D /var/tmp/test-root --ldd -a sh tr\n\
-# tree /var/tmp/test-root\n\
-/var/tmp/test-root\n\
-|-- lib64 -> usr/lib64\n\
-`-- usr\n\
-    |-- bin\n\
-    |   |-- bash\n\
-    |   |-- sh -> bash\n\
-    |   `-- tr\n\
-    `-- lib64\n\
-        |-- ld-2.15.90.so\n\
-        |-- ld-linux-x86-64.so.2 -> ld-2.15.90.so\n\
-        |-- libc-2.15.90.so\n\
-        |-- libc.so\n\
-        |-- libc.so.6 -> libc-2.15.90.so\n\
-        |-- libdl-2.15.90.so\n\
-        |-- libdl.so -> libdl-2.15.90.so\n\
-        |-- libdl.so.2 -> libdl-2.15.90.so\n\
-        |-- libtinfo.so.5 -> libtinfo.so.5.9\n\
-        `-- libtinfo.so.5.9\n\
-", program_invocation_short_name, program_invocation_short_name, program_invocation_short_name);
+{        
+             /*                                                                     */
+        printf("Usage: %s -D DESTROOTDIR [OPTION]... -a SOURCE...\n"
+               "or: %s -D DESTROOTDIR [OPTION]... SOURCE DEST\n"
+               "\n"
+               "Install SOURCE to DEST in DESTROOTDIR with all needed dependencies.\n"
+               "\n"
+               "  -D --destrootdir    Install all files to DESTROOTDIR as the root\n"
+               "  -a --all            Install all SOURCE arguments to DESTROOTDIR\n"
+               "  -o --optional       If SOURCE does not exist, do not fail\n"
+               "  -d --dir            SOURCE is a directory\n"
+               "  -l --ldd            Also install shebang executables and libraries\n"
+               "  -R --resolvelazy    Only install shebang executables and libraries\n"
+               "                      for all SOURCE files\n"
+               "  -H --fips           Also install all '.SOURCE.hmac' files\n"
+               "  -v --verbose        Show more output\n"
+               "     --debug          Show debug output\n"
+               "     --version        Show package version\n"
+               "  -h --help           Show this help\n"
+               "\n"
+               "Example:\n"
+               "# mkdir -p /var/tmp/test-root\n"
+               "# %s -D /var/tmp/test-root --ldd -a sh tr\n"
+               "# tree /var/tmp/test-root\n"
+               "/var/tmp/test-root\n"
+               "|-- lib64 -> usr/lib64\n"
+               "`-- usr\n"
+               "    |-- bin\n"
+               "    |   |-- bash\n"
+               "    |   |-- sh -> bash\n"
+               "    |   `-- tr\n"
+               "    `-- lib64\n"
+               "        |-- ld-2.15.90.so\n"
+               "        |-- ld-linux-x86-64.so.2 -> ld-2.15.90.so\n"
+               "        |-- libc-2.15.90.so\n"
+               "        |-- libc.so\n"
+               "        |-- libc.so.6 -> libc-2.15.90.so\n"
+               "        |-- libdl-2.15.90.so\n"
+               "        |-- libdl.so -> libdl-2.15.90.so\n"
+               "        |-- libdl.so.2 -> libdl-2.15.90.so\n"
+               "        |-- libtinfo.so.5 -> libtinfo.so.5.9\n"
+               "        `-- libtinfo.so.5.9\n"
+               , program_invocation_short_name, program_invocation_short_name, program_invocation_short_name);
         exit(status);
 }
 
@@ -575,7 +694,7 @@ static int parse_argv(int argc, char *argv[])
                 ARG_DEBUG
         };
 
-        static const struct option const options[] = {
+        static struct option const options[] = {
                 {"help", no_argument, NULL, 'h'},
                 {"version", no_argument, NULL, ARG_VERSION},
                 {"dir", no_argument, NULL, 'd'},
@@ -590,7 +709,7 @@ static int parse_argv(int argc, char *argv[])
                 {NULL, 0, NULL, 0}
         };
 
-        while ((c = getopt_long(argc, argv, "adhloD:DHILR", options, NULL)) != -1) {
+        while ((c = getopt_long(argc, argv, "adhloD:HR", options, NULL)) != -1) {
                 switch (c) {
                 case ARG_VERSION:
                         puts(PROGRAM_VERSION_STRING);
@@ -641,7 +760,7 @@ static int parse_argv(int argc, char *argv[])
 static int resolve_lazy(int argc, char **argv)
 {
         int i;
-        int destrootdirlen = strlen(destrootdir);
+        size_t destrootdirlen = strlen(destrootdir);
         int ret = 0;
         char *item;
         for (i = 0; i < argc; i++) {
@@ -671,10 +790,12 @@ static int resolve_lazy(int argc, char **argv)
 
 static char *find_binary(const char *src)
 {
-        char *path;
+        _cleanup_free_ char *path = NULL;
         char *p, *q;
         bool end = false;
         char *newsrc = NULL;
+        int ret;
+
         path = getenv("PATH");
 
         if (path == NULL) {
@@ -683,6 +804,12 @@ static char *find_binary(const char *src)
         }
         path = strdup(path);
         p = path;
+
+        if (path == NULL) {
+                log_error("Out of memory!");
+                exit(EXIT_FAILURE);
+        }
+
         log_debug("PATH=%s", path);
 
         do {
@@ -695,7 +822,12 @@ static char *find_binary(const char *src)
                 else
                         *q = '\0';
 
-                asprintf(&newsrc, "%s/%s", p, src);
+                ret = asprintf(&newsrc, "%s/%s", p, src);
+                if (ret < 0) {
+                        log_error("Out of memory!");
+                        exit(EXIT_FAILURE);
+                }
+
                 p = q + 1;
 
                 if (stat(newsrc, &sb) != 0) {
@@ -709,15 +841,15 @@ static char *find_binary(const char *src)
 
         } while (!end);
 
-        free(path);
         if (newsrc)
                 log_debug("find_binary(%s) == %s", src, newsrc);
+
         return newsrc;
 }
 
 static int install_one(const char *src, const char *dst)
 {
-        int r = 0;
+        int r = EXIT_SUCCESS;
         int ret;
 
         if (strchr(src, '/') == NULL) {
@@ -746,29 +878,27 @@ static int install_one(const char *src, const char *dst)
 
 static int install_all(int argc, char **argv)
 {
-        int r = 0;
+        int r = EXIT_SUCCESS;
         int i;
         for (i = 0; i < argc; i++) {
                 int ret;
                 log_debug("Handle '%s'", argv[i]);
 
                 if (strchr(argv[i], '/') == NULL) {
-                        char *newsrc = find_binary(argv[i]);
+                        _cleanup_free_ char *newsrc = find_binary(argv[i]);
                         if (newsrc) {
                                 log_debug("dracut_install '%s'", newsrc);
                                 ret = dracut_install(newsrc, newsrc, arg_createdir, arg_resolvedeps, true);
                                 if (ret == 0) {
                                         log_debug("dracut_install '%s' OK", newsrc);
                                 }
-                                free(newsrc);
                         } else {
                                 ret = -1;
                         }
 
                 } else {
-                        char *dest = strdup(argv[i]);
+                        _cleanup_free_ char *dest = strdup(argv[i]);
                         ret = dracut_install(argv[i], dest, arg_createdir, arg_resolvedeps, true);
-                        free(dest);
                 }
 
                 if ((ret != 0) && (!arg_optional)) {

install/macro.h

@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foomacrohfoo
-#define foomacrohfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -45,16 +44,38 @@
 #define _hidden_ __attribute__ ((visibility("hidden")))
 #define _weakref_(x) __attribute__((weakref(#x)))
 #define _introspect_(x) __attribute__((section("introspect." x)))
+#define _alignas_(x) __attribute__((aligned(__alignof(x))))
+#define _cleanup_(x) __attribute__((cleanup(x)))
+
+/* automake test harness */
+#define EXIT_TEST_SKIP 77
 
 #define XSTRINGIFY(x) #x
 #define STRINGIFY(x) XSTRINGIFY(x)
 
 /* Rounds up */
-#define ALIGN(l) ALIGN_TO((l), sizeof(void*))
+
+#define ALIGN4(l) (((l) + 3) & ~3)
+#define ALIGN8(l) (((l) + 7) & ~7)
+
+#if __SIZEOF_POINTER__ == 8
+#define ALIGN(l) ALIGN8(l)
+#elif __SIZEOF_POINTER__ == 4
+#define ALIGN(l) ALIGN4(l)
+#else
+#error "Wut? Pointers are neither 4 nor 8 bytes long?"
+#endif
+
+#define ALIGN_PTR(p) ((void*) ALIGN((unsigned long) p))
+#define ALIGN4_PTR(p) ((void*) ALIGN4((unsigned long) p))
+#define ALIGN8_PTR(p) ((void*) ALIGN8((unsigned long) p))
+
 static inline size_t ALIGN_TO(size_t l, size_t ali) {
         return ((l + ali - 1) & ~(ali - 1));
 }
 
+#define ALIGN_TO_PTR(p, ali) ((void*) ALIGN_TO((unsigned long) p))
+
 #define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
 
 /*
@@ -64,34 +85,35 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
  * @member: the name of the member within the struct.
  *
  */
-#define container_of(ptr, type, member) ({ \
-        const typeof( ((type *)0)->member ) *__mptr = (ptr); \
-        (type *)( (char *)__mptr - offsetof(type,member) );})
-
-#ifndef MAX
-#define MAX(a,b)                                \
-        __extension__ ({                        \
-                        typeof(a) _a = (a);     \
-                        typeof(b) _b = (b);     \
-                        _a > _b ? _a : _b;      \
+#define container_of(ptr, type, member)                                 \
+        __extension__ ({                                                \
+                        const typeof( ((type *)0)->member ) *__mptr = (ptr); \
+                        (type *)( (char *)__mptr - offsetof(type,member) ); \
                 })
-#endif
 
-#define MAX3(a,b,c)                             \
-        MAX(MAX(a,b),c)
+#undef MAX
+#define MAX(a,b)                                 \
+        __extension__ ({                         \
+                        typeof(a) _a = (a);      \
+                        typeof(b) _b = (b);      \
+                        _a > _b ? _a : _b;       \
+                })
 
-#ifndef MIN
+#define MAX3(x,y,z)                              \
+        __extension__ ({                         \
+                        typeof(x) _c = MAX(x,y); \
+                        MAX(_c, z);              \
+                })
+
+#undef MIN
 #define MIN(a,b)                                \
         __extension__ ({                        \
                         typeof(a) _a = (a);     \
                         typeof(b) _b = (b);     \
                         _a < _b ? _a : _b;      \
                 })
-#endif
-
-#define MIN3(a,b,c)                             \
-        MIN(MIN(a,b),c)
 
+#ifndef CLAMP
 #define CLAMP(x, low, high)                                             \
         __extension__ ({                                                \
                         typeof(x) _x = (x);                             \
@@ -99,6 +121,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
                         typeof(high) _high = (high);                    \
                         ((_x > _high) ? _high : ((_x < _low) ? _low : _x)); \
                 })
+#endif
 
 #define assert_se(expr)                                                 \
         do {                                                            \
@@ -119,14 +142,21 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
                 log_assert_failed_unreachable(t, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
         } while (false)
 
-#define assert_cc(expr)                            \
-        do {                                       \
-                switch (0) {                       \
-                        case 0:                    \
-                        case !!(expr):             \
-                                ;                  \
-                }                                  \
+#if defined(static_assert)
+#define assert_cc(expr)                         \
+        do {                                    \
+                static_assert(expr, #expr);     \
         } while (false)
+#else
+#define assert_cc(expr)                         \
+        do {                                    \
+                switch (0) {                    \
+                case 0:                         \
+                case !!(expr):                  \
+                        ;                       \
+                }                               \
+        } while (false)
+#endif
 
 #define PTR_TO_UINT(p) ((unsigned int) ((uintptr_t) (p)))
 #define UINT_TO_PTR(u) ((void*) ((uintptr_t) (u)))
@@ -149,6 +179,8 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
 #define memzero(x,l) (memset((x), 0, (l)))
 #define zero(x) (memzero(&(x), sizeof(x)))
 
+#define CHAR_TO_STR(x) ((char[2]) { x, 0 })
+
 #define char_array_0(x) x[sizeof(x)-1] = 0;
 
 #define IOVEC_SET_STRING(i, s)                  \
@@ -187,6 +219,66 @@ static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) {
         return k;
 }
 
-#include "log.h"
+#define VA_FORMAT_ADVANCE(format, ap)                                   \
+do {                                                                    \
+        int _argtypes[128];                                             \
+        size_t _i, _k;                                                  \
+        _k = parse_printf_format((format), ELEMENTSOF(_argtypes), _argtypes); \
+        assert(_k < ELEMENTSOF(_argtypes));                             \
+        for (_i = 0; _i < _k; _i++) {                                   \
+                if (_argtypes[_i] & PA_FLAG_PTR)  {                     \
+                        (void) va_arg(ap, void*);                       \
+                        continue;                                       \
+                }                                                       \
+                                                                        \
+                switch (_argtypes[_i]) {                                \
+                case PA_INT:                                            \
+                case PA_INT|PA_FLAG_SHORT:                              \
+                case PA_CHAR:                                           \
+                        (void) va_arg(ap, int);                         \
+                        break;                                          \
+                case PA_INT|PA_FLAG_LONG:                               \
+                        (void) va_arg(ap, long int);                    \
+                        break;                                          \
+                case PA_INT|PA_FLAG_LONG_LONG:                          \
+                        (void) va_arg(ap, long long int);               \
+                        break;                                          \
+                case PA_WCHAR:                                          \
+                        (void) va_arg(ap, wchar_t);                     \
+                        break;                                          \
+                case PA_WSTRING:                                        \
+                case PA_STRING:                                         \
+                case PA_POINTER:                                        \
+                        (void) va_arg(ap, void*);                       \
+                        break;                                          \
+                case PA_FLOAT:                                          \
+                case PA_DOUBLE:                                         \
+                        (void) va_arg(ap, double);                      \
+                        break;                                          \
+                case PA_DOUBLE|PA_FLAG_LONG_DOUBLE:                     \
+                        (void) va_arg(ap, long double);                 \
+                        break;                                          \
+                default:                                                \
+                        assert_not_reached("Unknown format string argument."); \
+                }                                                       \
+        }                                                               \
+} while(false)
 
-#endif
+ /* Because statfs.t_type can be int on some architecures, we have to cast
+  * the const magic to the type, otherwise the compiler warns about
+  * signed/unsigned comparison, because the magic can be 32 bit unsigned.
+ */
+#define F_TYPE_CMP(a, b) (a == (typeof(a)) b)
+
+
+/* Returns the number of chars needed to format variables of the
+ * specified type as a decimal string. Adds in extra space for a
+ * negative '-' prefix. */
+
+#define DECIMAL_STR_MAX(type)                                           \
+        (1+(sizeof(type) <= 1 ? 3 :                                     \
+            sizeof(type) <= 2 ? 5 :                                     \
+            sizeof(type) <= 4 ? 10 :                                    \
+            sizeof(type) <= 8 ? 20 : sizeof(int[-2*(sizeof(type) > 8)])))
+
+#include "log.h"

install/util.c

@@ -185,3 +185,95 @@ static const char *const log_level_table[] = {
 };
 
 DEFINE_STRING_TABLE_LOOKUP(log_level, int);
+
+char *strnappend(const char *s, const char *suffix, size_t b) {
+        size_t a;
+        char *r;
+
+        if (!s && !suffix)
+                return strdup("");
+
+        if (!s)
+                return strndup(suffix, b);
+
+        if (!suffix)
+                return strdup(s);
+
+        assert(s);
+        assert(suffix);
+
+        a = strlen(s);
+        if (b > ((size_t) -1) - a)
+                return NULL;
+
+        r = new(char, a+b+1);
+        if (!r)
+                return NULL;
+
+        memcpy(r, s, a);
+        memcpy(r+a, suffix, b);
+        r[a+b] = 0;
+
+        return r;
+}
+
+char *strappend(const char *s, const char *suffix) {
+        return strnappend(s, suffix, suffix ? strlen(suffix) : 0);
+}
+
+char *strjoin(const char *x, ...) {
+        va_list ap;
+        size_t l;
+        char *r, *p;
+
+        va_start(ap, x);
+
+        if (x) {
+                l = strlen(x);
+
+                for (;;) {
+                        const char *t;
+                        size_t n;
+
+                        t = va_arg(ap, const char *);
+                        if (!t)
+                                break;
+
+                        n = strlen(t);
+                        if (n > ((size_t) -1) - l) {
+                                va_end(ap);
+                                return NULL;
+                        }
+
+                        l += n;
+                }
+        } else
+                l = 0;
+
+        va_end(ap);
+
+        r = new(char, l+1);
+        if (!r)
+                return NULL;
+
+        if (x) {
+                p = stpcpy(r, x);
+
+                va_start(ap, x);
+
+                for (;;) {
+                        const char *t;
+
+                        t = va_arg(ap, const char *);
+                        if (!t)
+                                break;
+
+                        p = stpcpy(p, t);
+                }
+
+                va_end(ap);
+        } else
+                r[0] = 0;
+
+        return r;
+}

install/util.h

@@ -507,6 +507,42 @@ void* memdup(const void *p, size_t l);
 
 int is_kernel_thread(pid_t pid);
 
+static inline void freep(void *p) {
+        free(*(void**) p);
+}
+
+static inline void fclosep(FILE **f) {
+        if (*f)
+                fclose(*f);
+}
+
+static inline void pclosep(FILE **f) {
+        if (*f)
+                pclose(*f);
+}
+
+static inline void closep(int *fd) {
+        if (*fd >= 0)
+                close_nointr_nofail(*fd);
+}
+
+static inline void closedirp(DIR **d) {
+        if (*d)
+                closedir(*d);
+}
+
+static inline void umaskp(mode_t *u) {
+        umask(*u);
+}
+
+#define _cleanup_free_ _cleanup_(freep)
+#define _cleanup_fclose_ _cleanup_(fclosep)
+#define _cleanup_pclose_ _cleanup_(pclosep)
+#define _cleanup_close_ _cleanup_(closep)
+#define _cleanup_closedir_ _cleanup_(closedirp)
+#define _cleanup_umask_ _cleanup_(umaskp)
+#define _cleanup_globfree_ _cleanup_(globfree)
+
 int fd_inc_sndbuf(int fd, size_t n);
 int fd_inc_rcvbuf(int fd, size_t n);
 
@@ -524,4 +560,6 @@ bool in_initrd(void);
 
 void warn_melody(void);
 
+char *strjoin(const char *x, ...) _sentinel_;
+
 #endif

lsinitrd-bash-completion.sh

@@ -0,0 +1,63 @@
+#
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Copyright 2013 Red Hat, Inc.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+__contains_word () {
+        local word=$1; shift
+        for w in $*; do [[ $w = $word ]] && return 0; done
+        return 1
+}
+
+_lsinitrd() {
+        local field_vals= cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+        local -A OPTS=(
+                [STANDALONE]='-s --size -h --help'
+
+                       [ARG]='-f --file -k --kver'
+        )
+
+        if __contains_word "$prev" ${OPTS[ARG]}; then
+                case $prev in
+                        --file|-f)
+                                comps=$(compgen -f -- "$cur")
+                                compopt -o filenames
+                        ;;
+                        --kver|-k)
+                                comps=$(cd /lib/modules; echo [0-9]*)
+                        ;;
+                        *)
+                                return 0
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+        fi
+
+        if [[ $cur = -* ]]; then
+                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+                return 0
+        fi
+
+        comps=$(compgen -f -- "$cur")
+        compopt -o filenames
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+}
+
+complete -F _lsinitrd lsinitrd

lsinitrd.1.asc

@@ -10,7 +10,9 @@ lsinitrd - tool to show the contents of an initramfs image
 
 SYNOPSIS
 --------
-*lsinitrd* ['OPTION...'] [<image>]
+*lsinitrd* ['OPTION...'] [<image> [<filename> [<filename> [...] ]]]
+
+*lsinitrd* ['OPTION...'] -k <kernel-version>
 
 DESCRIPTION
 -----------
@@ -26,6 +28,12 @@ OPTIONS
 **-s, --size**::
     sort the contents of the initramfs by size.
 
+**-f, --file** _<filename>_::
+    print the contents of <filename>.
+
+**-k, --kver** _<kernel version>_::
+    inspect the initramfs of <kernel version>.
+
 AVAILABILITY
 ------------
 The lsinitrd command is part of the dracut package and is available from

lsinitrd.sh

@@ -22,29 +22,58 @@
 usage()
 {
     {
-        echo "Usage: ${0##*/} [-s] [<initramfs file> [<filename>]]"
+        echo "Usage: ${0##*/} [options] [<initramfs file> [<filename> [<filename> [...] ]]]"
+        echo "Usage: ${0##*/} [options] -k <kernel version>"
         echo
-        echo "-h, --help     print a help message and exit."
-        echo "-s, --size     sort the contents of the initramfs by size."
+        echo "-h, --help                  print a help message and exit."
+        echo "-s, --size                  sort the contents of the initramfs by size."
+        echo "-m, --mod                   list modules."
+        echo "-f, --file <filename>       print the contents of <filename>."
+        echo "-k, --kver <kernel version> inspect the initramfs of <kernel version>."
         echo
     } >&2
 }
 
-[[ $# -le 2 ]] || { usage ; exit 1 ; }
+
+[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
 
 sorted=0
-while getopts "s" opt; do
-    case $opt in
-        s)  sorted=1;;
-        h)  usage; exit 0;;
-        \?) usage; exit 1;;
+modules=0
+declare -A filenames
+
+unset POSIXLY_CORRECT
+TEMP=$(getopt \
+    -o "shmf:k:" \
+    --long kver: \
+    --long file: \
+    --long mod \
+    --long help \
+    --long size \
+    -- "$@")
+
+if (( $? != 0 )); then
+    usage
+    exit 1
+fi
+
+eval set -- "$TEMP"
+
+while (($# > 0)); do
+    case $1 in
+        -k|--kver)  KERNEL_VERSION="$2"; shift;;
+        -f|--file)  filenames[${2#/}]=1; shift;;
+        -s|--size)  sorted=1;;
+        -h|--help)  usage; exit 0;;
+        -m|--mod)   modules=1;;
+        --)         shift;break;;
+        *)          usage; exit 1;;
     esac
+    shift
 done
-shift $((OPTIND-1))
 
-KERNEL_VERSION="$(uname -r)"
+[[ $KERNEL_VERSION ]] || KERNEL_VERSION="$(uname -r)"
 
-if [[ "$1" ]]; then
+if [[ $1 ]]; then
     image="$1"
     if ! [[ -f "$image" ]]; then
         {
@@ -54,16 +83,24 @@ if [[ "$1" ]]; then
         usage
         exit 1
     fi
-fi
-
-[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
-
-if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
-    image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
 else
-    image="/boot/initramfs-${KERNEL_VERSION}.img}"
+    [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
+
+    if [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \
+        && [[ $MACHINE_ID ]] \
+        && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
+        image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
+    else
+        image="/boot/initramfs-${KERNEL_VERSION}.img"
+    fi
 fi
 
+shift
+while (($# > 0)); do
+    filenames[${1#/}]=1;
+    shift
+done
+
 if ! [[ -f "$image" ]]; then
     {
         echo "No <initramfs file> specified and the default image '$image' cannot be accessed!"
@@ -73,37 +110,130 @@ if ! [[ -f "$image" ]]; then
     exit 1
 fi
 
-CAT=zcat
-FILE_T=$(file --dereference "$image")
+extract_files()
+{
+    (( ${#filenames[@]} == 1 )) && nofileinfo=1
+    for f in ${!filenames[@]}; do
+        [[ $nofileinfo ]] || echo "initramfs:/$f"
+        [[ $nofileinfo ]] || echo "========================================================================"
+        $CAT $image 2>/dev/null | cpio --extract --verbose --quiet --to-stdout $f 2>/dev/null
+        ((ret+=$?))
+        [[ $nofileinfo ]] || echo "========================================================================"
+        [[ $nofileinfo ]] || echo
+    done
+}
 
-if echo "test"|xz|xz -dc --single-stream >/dev/null 2>&1; then
-    XZ_SINGLE_STREAM="--single-stream"
+list_modules()
+{
+    echo "dracut modules:"
+    $CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
+    ((ret+=$?))
+}
+
+list_files()
+{
+    echo "========================================================================"
+    if [ "$sorted" -eq 1 ]; then
+        $CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --list | sort -n -k5
+    else
+        $CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --list | sort -k9
+    fi
+    ((ret+=$?))
+    echo "========================================================================"
+}
+
+
+if (( ${#filenames[@]} <= 0 )); then
+    echo "Image: $image: $(du -h $image | while read a b; do echo $a;done)"
+    echo "========================================================================"
 fi
 
-if [[ "$FILE_T" =~ :\ gzip\ compressed\ data ]]; then
-    CAT=zcat
-elif [[ "$FILE_T" =~ :\ xz\ compressed\ data ]]; then
-    CAT="xzcat $XZ_SINGLE_STREAM"
-elif [[ "$FILE_T" =~ :\ XZ\ compressed\ data ]]; then
-    CAT="xzcat $XZ_SINGLE_STREAM"
-elif [[ "$FILE_T" =~ :\ LZMA ]]; then
-    CAT="xzcat $XZ_SINGLE_STREAM"
-elif [[ "$FILE_T" =~ :\ data ]]; then
-    CAT="xzcat $XZ_SINGLE_STREAM"
+read -N 6 bin < "$image"
+case $bin in
+    $'\x71\xc7'*|070701)
+        CAT="cat --"
+        is_early=$(cpio --extract --verbose --quiet --to-stdout -- 'early_cpio' < "$image" 2>/dev/null)
+        if [[ "$is_early" ]]; then
+            if (( ${#filenames[@]} > 0 )); then
+                extract_files
+            else
+                echo "Early CPIO image"
+                list_files
+            fi
+            SKIP="$dracutbasedir/skipcpio"
+            if ! [[ -x $SKIP ]]; then
+                echo
+                echo "'$SKIP' not found, cannot display remaining contents!" >&2
+                echo
+                exit 0
+            fi
+        fi
+        ;;
+esac
+
+
+CAT=$({
+        if [[ $SKIP ]]; then
+            $SKIP "$image"
+        else
+            cat "$image"
+        fi } | {
+        read -N 6 bin
+        case $bin in
+            $'\x1f\x8b'*)
+                echo "zcat --"
+                ;;
+            BZh*)
+                echo "bzcat --"
+                ;;
+            $'\x71\xc7'*|070701)
+                echo "cat --"
+                ;;
+            $'\x02\x21'*)
+                echo "lz4 -d -c"
+                ;;
+            $'\x89'LZO$'\0'*)
+                echo "lzop -d -c"
+                ;;
+            *)
+                if echo "test"|xz|xzcat --single-stream >/dev/null 2>&1; then
+                    echo "xzcat --single-stream --"
+                else
+                    echo "xzcat --"
+                fi
+                ;;
+        esac
+    })
+
+skipcpio()
+{
+    $SKIP "$@" | $ORIG_CAT
+}
+
+if [[ $SKIP ]]; then
+    ORIG_CAT="$CAT"
+    CAT=skipcpio
 fi
 
-if [[ $# -eq 2 ]]; then
-    $CAT $image | cpio --extract --verbose --quiet --to-stdout ${2#/} 2>/dev/null
-    exit $?
-fi
+ret=0
 
-echo "$image: $(du -h $image | while read a b; do echo $a;done)"
-echo "========================================================================"
-$CAT "$image" | cpio --extract --verbose --quiet --to-stdout '*lib/dracut/dracut-*' 2>/dev/null
-echo "========================================================================"
-if [ "$sorted" -eq 1 ]; then
-    $CAT "$image" | cpio --extract --verbose --quiet --list | sort -n -k5
+if (( ${#filenames[@]} > 0 )); then
+    extract_files
 else
-    $CAT "$image" | cpio --extract --verbose --quiet --list | sort -k9
+    version=$($CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
+    ((ret+=$?))
+    echo "Version: $version"
+    echo
+    if [ "$modules" -eq 1 ]; then
+        list_modules
+        echo "========================================================================"
+    else
+        echo -n "Arguments: "
+        $CAT "$image" 2>/dev/null | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null
+        echo
+        list_modules
+        list_files
+    fi
 fi
-echo "========================================================================"
+
+exit $ret

mkinitrd.8.asc

@@ -41,8 +41,8 @@ OPTIONS
 
 **--preload=<module>**::
      preload the kernel module <module> in the initramfs before any other kernel
-     modules are loaded. This can be used to ensure a certain device naming, which
-     should in theory be avoided and the use of symbolic links in /dev is
+     modules are loaded. This can be used to ensure a certain device naming,
+     which should in theory be avoided and the use of symbolic links in /dev is
      encouraged.
 
 **--nocompress**::

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

@@ -0,0 +1,20 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    require_binaries /bin/bash
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    # If another shell is already installed, do not use bash
+    [[ -x $initdir/bin/sh ]] && return
+
+    # Prefer bash as /bin/sh if it is available.
+    inst /bin/bash && ln -sf bash "${initdir}/bin/sh"
+}
+

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

@@ -4,7 +4,7 @@
 
 check() {
     [[ "$mount_needs" ]] && return 1
-    [ -x /sbin/bootchartd ] || return 1
+    require_binaries /sbin/bootchartd || return 1
     return 255
 }
 
@@ -16,7 +16,7 @@ install() {
     inst_symlink /init /sbin/init
     inst_dir /lib/bootchart/tmpfs
 
-    dracut_install bootchartd bash \
+    inst_multiple bootchartd bash \
         /lib/bootchart/bootchart-collector /etc/bootchartd.conf \
         accton \
         echo \

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

@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
-    [ -x /bin/dash ]
+    require_binaries /bin/dash
 }
 
 depends() {

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

@@ -4,7 +4,7 @@
 
 check() {
     [[ "$mount_needs" ]] && return 1
-    [ -x $systemdutildir/systemd-bootchart ] || return 1
+    require_binaries $systemdutildir/systemd-bootchart || return 1
     return 255
 }
 
@@ -14,5 +14,5 @@ depends() {
 
 install() {
     inst_symlink /init /sbin/init
-    dracut_install $systemdutildir/systemd-bootchart
+    inst_multiple $systemdutildir/systemd-bootchart
 }

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

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

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

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

modules.d/01fips/fips.sh

@@ -15,6 +15,12 @@ mount_boot()
         UUID=*)
             boot="/dev/disk/by-uuid/${boot#UUID=}"
             ;;
+        PARTUUID=*)
+            boot="/dev/disk/by-partuuid/${boot#PARTUUID=}"
+            ;;
+        PARTLABEL=*)
+            boot="/dev/disk/by-partlabel/${boot#PARTLABEL=}"
+            ;;
         /dev/*)
             ;;
         *)
@@ -44,14 +50,34 @@ mount_boot()
         info "Mounting $boot as /boot"
         mount -oro "$boot" /boot || return 1
     elif [ -d "$NEWROOT/boot" ]; then
-        rm -fr /boot
+        rm -fr -- /boot
         ln -sf "$NEWROOT/boot" /boot
     fi
 }
 
+do_rhevh_check()
+{
+    KERNEL=$(uname -r)
+    kpath=${1}
+
+    # If we're on RHEV-H, the kernel is in /run/initramfs/live/vmlinuz0
+    HMAC_SUM_ORIG=$(cat $NEWROOT/boot/.vmlinuz-${KERNEL}.hmac | while read a b; do printf "%s\n" $a; done)
+    HMAC_SUM_CALC=$(sha512hmac $kpath | while read a b; do printf "%s\n" $a; done || return 1)
+    if [ -z "$HMAC_SUM_ORIG" ] || [ -z "$HMAC_SUM_CALC" ] || [ "${HMAC_SUM_ORIG}" != "${HMAC_SUM_CALC}" ]; then
+        warn "HMAC sum mismatch"
+        return 1
+    fi
+    info "rhevh_check OK"
+    return 0
+}
+
 do_fips()
 {
-    info "Checking integrity of kernel"
+    local _v
+    local _s
+    local _v
+    local _module
+
     KERNEL=$(uname -r)
 
     if ! [ -e "/boot/.vmlinuz-${KERNEL}.hmac" ]; then
@@ -59,19 +85,40 @@ do_fips()
         return 1
     fi
 
-    sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1
-
     FIPSMODULES=$(cat /etc/fipsmodules)
 
     info "Loading and integrity checking all crypto modules"
-    for module in $FIPSMODULES; do
-        if [ "$module" != "tcrypt" ]; then
-            modprobe ${module} || return 1
+    mv /etc/modprobe.d/fips.conf /etc/modprobe.d/fips.conf.bak
+    for _module in $FIPSMODULES; do
+        if [ "$_module" != "tcrypt" ]; then
+            if ! modprobe "${_module}"; then
+                # check if kernel provides generic algo
+                _found=0
+                while read _k _s _v; do
+                    [ "$_k" != "name" -a "$_k" != "driver" ] && continue
+                    [ "$_v" != "$_module" ] && continue
+                    _found=1
+                    break
+                done </proc/crypto
+                [ "$_found" = "0" ] && return 1
+            fi
         fi
     done
+    mv /etc/modprobe.d/fips.conf.bak /etc/modprobe.d/fips.conf
+
     info "Self testing crypto algorithms"
     modprobe tcrypt || return 1
     rmmod tcrypt
+
+    info "Checking integrity of kernel"
+    if [ -e "/run/initramfs/live/vmlinuz0" ]; then
+        do_rhevh_check /run/initramfs/live/vmlinuz0 || return 1
+    elif [ -e "/run/initramfs/live/isolinux/vmlinuz0" ]; then
+        do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1
+    else
+        sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1
+    fi
+
     info "All initrd crypto checks done"
 
     > /tmp/fipsdone

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

@@ -12,9 +12,12 @@ depends() {
 
 installkernel() {
     local _fipsmodules _mod
-    _fipsmodules="aead aes_generic xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr gcm ghash_generic"
-    _fipsmodules+=" des deflate ecb eseqiv hmac seqiv sha256 sha256_generic sha512 sha512_generic"
-    _fipsmodules+=" cryptomgr crypto_null tcrypt dm-mod dm-crypt lzo"
+    _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm "
+    _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg "
+    _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
+    _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
+    _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key sha1_s390 sha512_s390"
+    _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
 
     mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
 
@@ -32,12 +35,14 @@ install() {
     inst_hook pre-pivot 01 "$moddir/fips-noboot.sh"
     inst_script "$moddir/fips.sh" /sbin/fips.sh
 
-    dracut_install sha512hmac rmmod insmod mount uname umount fipscheck
+    inst_multiple sha512hmac rmmod insmod mount uname umount fipscheck
 
     inst_libdir_file libsoftokn3.so libsoftokn3.so \
         libsoftokn3.chk libfreebl3.so libfreebl3.chk \
-        libssl.so 'hmaccalc/sha512hmac.hmac'
+        libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \
+        libfreeblpriv3.so libfreeblpriv3.chk
 
-    dracut_install -o prelink
+    inst_multiple -o prelink
+    inst_simple /etc/system-fips
 }
 

modules.d/02caps/module-setup.sh

@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
-    type -P capsh >/dev/null 2>&1
+    require_binaries capsh
 }
 
 depends() {
@@ -11,9 +11,13 @@ depends() {
 }
 
 install() {
-    inst_hook pre-pivot 00 "$moddir/caps.sh"
-    inst $(type -P capsh 2>/dev/null) /usr/sbin/capsh
-    # capsh wants bash and we need bash also
-    inst /bin/bash
+    if ! dracut_module_included "systemd"; then
+        inst_hook pre-pivot 00 "$moddir/caps.sh"
+        inst $(type -P capsh 2>/dev/null) /usr/sbin/capsh
+        # capsh wants bash and we need bash also
+        inst /bin/bash
+    else
+        dwarning "caps: does not work with systemd in the initramfs"
+    fi
 }
 

modules.d/03modsign/load-modsign-keys.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Licensed under the GPLv2
+#
+# Copyright 2013 Red Hat, Inc.
+# Peter Jones <pjones@redhat.com>
+
+for x in /lib/modules/keys/* ; do
+    [ "${x}" = "/lib/modules/keys/*" ] && break
+    keyctl padd asymmetric "" @s < ${x}
+done

modules.d/03modsign/module-setup.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Licensed under the GPLv2
+#
+# Copyright 2013 Red Hat, Inc.
+# Peter Jones <pjones@redhat.com>
+
+check() {
+    require_binaries keyctl || return 1
+
+    # do not include module in hostonly mode,
+    # if no keys are present
+    if [[ $hostonly ]]; then
+        x=$(echo /lib/modules/keys/*)
+        [[ "${x}" = "/lib/modules/keys/*" ]] && return 255
+    fi
+
+    return 0
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    inst_dir /lib/modules/keys
+    inst_binary /usr/bin/keyctl
+
+    inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh"
+
+    for x in /lib/modules/keys/* ; do
+        [[ "${x}" = "/lib/modules/keys/*" ]] && break
+        inst_simple "${x}"
+    done
+}

modules.d/03rescue/module-setup.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    # do not add this module by default
+    return 255
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    inst_multiple -o ps grep more cat rm strace free showmount \
+        ping netstat rpcinfo vi scp ping6 ssh \
+        fsck fsck.ext2 fsck.ext4 fsck.ext3 fsck.ext4dev fsck.vfat e2fsck
+}
+

modules.d/04watchdog/module-setup.sh

@@ -23,6 +23,6 @@ install() {
     inst_hook cleanup   00 "$moddir/watchdog.sh"
     inst_hook cleanup   99 "$moddir/watchdog.sh"
     inst_hook emergency 02 "$moddir/watchdog-stop.sh"
-    dracut_install -o wdctl
+    inst_multiple -o wdctl
 }
 

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

@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
-    type -P busybox >/dev/null || return 1
+    require_binaries busybox || return 1
 
     return 255
 }

modules.d/10i18n/console_init.sh

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

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

@@ -4,6 +4,9 @@
 
 check() {
     [[ "$mount_needs" ]] && return 1
+
+    require_binaries setfont loadkeys kbd_mode || return 1
+
     return 0
 }
 
@@ -12,9 +15,14 @@ depends() {
 }
 
 install() {
-    [ -x /lib/systemd/systemd-vconsole-setup ] && dracut_install /lib/systemd/systemd-vconsole-setup
+    if dracut_module_included "systemd"; then
+        unset FONT
+        unset KEYMAP
+        [[ -f /etc/vconsole.conf ]] && . /etc/vconsole.conf
+    fi
+
     KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
-    DEFAULT_FONT=LatArCyrHeb-16
+    DEFAULT_FONT="${i18n_default_font:-LatArCyrHeb-16}"
     I18N_CONF="/etc/locale.conf"
     VCONFIG_CONF="/etc/vconsole.conf"
 
@@ -84,7 +92,7 @@ install() {
     }
 
     install_base() {
-        dracut_install setfont loadkeys kbd_mode stty
+        inst_multiple setfont loadkeys kbd_mode stty
 
         if ! dracut_module_included "systemd"; then
             inst ${moddir}/console_init.sh /lib/udev/console_init
@@ -102,16 +110,16 @@ install() {
         done
 
         # remove unnecessary files
-        rm -f "${initdir}${kbddir}/consoletrans/utflist"
+        rm -f -- "${initdir}${kbddir}/consoletrans/utflist"
         find "${initdir}${kbddir}/" -name README\* -delete
         find "${initdir}${kbddir}/" -name '*.gz' -print -quit \
             | while read line; do
-            dracut_install gzip
+            inst_multiple gzip
             done
 
         find "${initdir}${kbddir}/" -name '*.bz2' -print -quit \
             | while read line; do
-            dracut_install bzip2
+            inst_multiple bzip2
             done
     }
 
@@ -193,10 +201,20 @@ install() {
             inst_simple ${kbddir}/unimaps/${FONT_UNIMAP}.uni
         fi
 
-        mksubdirs ${initdir}${I18N_CONF}
-        mksubdirs ${initdir}${VCONFIG_CONF}
-        print_vars LC_ALL LANG >> ${initdir}${I18N_CONF}
-        print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> ${initdir}${VCONFIG_CONF}
+        if dracut_module_included "systemd" && [[ -f ${I18N_CONF} ]]; then
+            inst_simple ${I18N_CONF}
+        else
+            mksubdirs ${initdir}${I18N_CONF}
+            print_vars LC_ALL LANG >> ${initdir}${I18N_CONF}
+        fi
+
+        if dracut_module_included "systemd" && [[ -f ${VCONFIG_CONF} ]]; then
+            inst_simple ${VCONFIG_CONF}
+        else
+            mksubdirs ${initdir}${VCONFIG_CONF}
+            print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> ${initdir}${VCONFIG_CONF}
+        fi
+
         return 0
     }
 
@@ -212,12 +230,6 @@ install() {
             kbddir=''
         done
 
-        [[ ${kbddir} ]] || {
-            derror "Directories ${KBDSUBDIRS//,/, } not found.  Please" \
-                "inform us about the issue including your OS name and version."
-            return 1
-        }
-
         [[ -f $I18N_CONF && -f $VCONFIG_CONF ]] || \
             [[ ! ${hostonly} || ${i18n_vars} ]] || {
             derror 'i18n_vars not set!  Please set up i18n_vars in ' \
@@ -226,16 +238,13 @@ install() {
         return 0
     }
 
-    if checks
-    then
+    if checks; then
         install_base
 
-        if [[ ${hostonly} ]]
-        then
+        if [[ ${hostonly} ]] && ! [[ ${i18n_install_all} == "yes" ]]; then
             install_local_i18n || install_all_kbd
         else
             install_all_kbd
         fi
     fi
 }
-

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

@@ -36,7 +36,7 @@ if [ -f /etc/locale.conf ]; then
 fi
 
 if [ -n "$DRACUT_SYSTEMD" ]; then
-    rm -f /etc/udev/rules.d/10-console.rules
-    rm -f /lib/udev/rules.d/10-console.rules
-    rm -f /lib/udev/console_init
+    rm -f -- /etc/udev/rules.d/10-console.rules
+    rm -f -- /lib/udev/rules.d/10-console.rules
+    rm -f -- /lib/udev/console_init
 fi

modules.d/30convertfs/convertfs.sh

@@ -56,22 +56,22 @@ if ! needconvert; then
 fi
 
 testfile="$ROOT/.usrmovecheck$$"
-rm -f "$testfile"
+rm -f -- "$testfile"
 > "$testfile"
 if [[ ! -e "$testfile" ]]; then
     echo "Cannot write to $ROOT/"
     exit 1
 fi
-rm -f "$testfile"
+rm -f -- "$testfile"
 
 testfile="$ROOT/usr/.usrmovecheck$$"
-rm -f "$testfile"
+rm -f -- "$testfile"
 > "$testfile"
 if [[ ! -e "$testfile" ]]; then
     echo "Cannot write to $ROOT/usr/"
     exit 1
 fi
-rm -f "$testfile"
+rm -f -- "$testfile"
 
 find_mount() {
     local dev mnt etc wanted_dev
@@ -108,11 +108,11 @@ cleanup() {
     for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" \
 	"$ROOT/usr/bin" "$ROOT/usr/sbin" "$ROOT/usr/lib" \
         "$ROOT/usr/lib64"; do
-        [[ -d "${dir}.usrmove-new" ]] && rm -fr "${dir}.usrmove-new"
+        [[ -d "${dir}.usrmove-new" ]] && rm -fr -- "${dir}.usrmove-new"
         if [[ -d "${dir}.usrmove-old" ]]; then
             mv "$dir" "${dir}.del~"
             mv "${dir}.usrmove-old" "$dir"
-            rm -fr "${dir}.del~"
+            rm -fr -- "${dir}.del~"
         fi
     done
 }
@@ -126,7 +126,7 @@ set -e
 
 # merge / and /usr in new dir in /usr
 for dir in bin sbin lib lib64; do
-    rm -rf "$ROOT/usr/${dir}.usrmove-new"
+    rm -rf -- "$ROOT/usr/${dir}.usrmove-new"
     [[ -L "$ROOT/$dir" ]] && continue
     [[ -d "$ROOT/$dir" ]] || continue
     echo "Make a copy of \`$ROOT/usr/$dir'."
@@ -150,7 +150,7 @@ done
 for dir in bin sbin lib lib64; do
     [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
     echo "Switch to new \`$ROOT/usr/$dir'."
-    rm -fr "$ROOT/usr/${dir}.usrmove-old"
+    rm -fr -- "$ROOT/usr/${dir}.usrmove-old"
     mv "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-old"
     mv "$ROOT/usr/${dir}.usrmove-new" "$ROOT/usr/$dir"
 done
@@ -160,7 +160,7 @@ for dir in bin sbin lib lib64; do
     [[ -L "$ROOT/$dir" ]] && continue
     [[ -d "$ROOT/$dir" ]] || continue
     echo "Create \`$ROOT/$dir' symlink."
-    rm -rf "$ROOT/${dir}.usrmove-old" || :
+    rm -fr -- "$ROOT/${dir}.usrmove-old" || :
     mv "$ROOT/$dir" "$ROOT/${dir}.usrmove-old"
     ln -sfn usr/$dir "$ROOT/$dir"
 done
@@ -178,9 +178,9 @@ done
 
 for dir in bin sbin lib lib64; do
     [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
-        && rm -rf "$ROOT/usr/${dir}.usrmove-old~" || :
+        && rm -rf -- "$ROOT/usr/${dir}.usrmove-old~" || :
     [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
-        && rm -rf "$ROOT/${dir}.usrmove-old~" || :
+        && rm -rf -- "$ROOT/${dir}.usrmove-old~" || :
 done
 
 for dir in lib lib64; do

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

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

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

@@ -2,6 +2,14 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
+
+# We already need a set netif here
+netif=$interface
+
 setup_interface() {
     ip=$new_ip_address
     mtu=$new_interface_mtu
@@ -9,10 +17,15 @@ setup_interface() {
     bcast=$new_broadcast_address
     gw=${new_routers%%,*}
     domain=$new_domain_name
-    search=$(printf "$new_domain_search")
+    search=$(printf -- "$new_domain_search")
     namesrv=$new_domain_name_servers
     hostname=$new_host_name
 
+    [ -n "$new_dhcp_lease_time" ] && lease_time=$new_dhcp_lease_time
+    [ -n "$new_max_life" ] && lease_time=$new_max_life
+    preferred_lft=$lease_time
+    [ -n "$new_preferred_life" ] && preferred_lft=$new_preferred_life
+
     [ -f /tmp/net.$netif.override ] && . /tmp/net.$netif.override
 
     # Taken from debian dhclient-script:
@@ -29,9 +42,17 @@ setup_interface() {
         fi
     fi
 
-    ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} dev $netif
+    ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} dev $netif \
+        ${lease_time:+valid_lft $lease_time} \
+        ${preferred_lft:+preferred_lft ${preferred_lft}}
 
-    [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
+    if [ -n "$gw" ] ; then
+        if [ "$mask" == "255.255.255.255" ] ; then
+            # point-to-point connection => set explicit route to gateway
+            echo ip route add $gw dev $netif > /tmp/net.$netif.gw
+        fi
+        echo ip route replace default via $gw dev $netif >> /tmp/net.$netif.gw
+    fi
 
     [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
     if  [ -n "$namesrv" ] ; then
@@ -42,27 +63,50 @@ setup_interface() {
 
     # 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
+    [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
 }
 
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+setup_interface6() {
+    domain=$new_domain_name
+    search=$(printf -- "$new_domain_search")
+    namesrv=$new_domain_name_servers
+    hostname=$new_host_name
+    [ -n "$new_dhcp_lease_time" ] && lease_time=$new_dhcp_lease_time
+    [ -n "$new_max_life" ] && lease_time=$new_max_life
+    preferred_lft=$lease_time
+    [ -n "$new_preferred_life" ] && preferred_lft=$new_preferred_life
 
-export PS4="dhclient.$interface.$$ + "
-exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
+    [ -f /tmp/net.$netif.override ] && . /tmp/net.$netif.override
 
-# We already need a set netif here
-netif=$interface
+    ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+        dev ${netif} scope global \
+        ${lease_time:+valid_lft $lease_time} \
+        ${preferred_lft:+preferred_lft ${preferred_lft}}
 
-# Huh? Interface configured?
-[ -f "/tmp/net.$netif.up" ] && exit 0
+    [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
+    if  [ -n "$namesrv" ] ; then
+        for s in $namesrv; do
+            echo nameserver $s
+        done
+    fi >> /tmp/net.$netif.resolv.conf
+
+    # Note: hostname can be fqdn OR short hostname, so chop off any
+    # trailing domain name and explicity add any domain if set.
+    [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
+}
 
 case $reason in
     PREINIT)
         echo "dhcp: PREINIT $netif up"
         linkup $netif
         ;;
+
+    PREINIT6)
+        echo "dhcp: PREINIT6 $netif up"
+        linkup $netif
+        wait_for_ipv6_dad $netif
+        ;;
+
     BOUND)
         echo "dhcp: BOND setting $netif"
         unset layer2
@@ -70,7 +114,7 @@ case $reason in
             read layer2 < /sys/class/net/$netif/device/layer2
         fi
         if [ "$layer2" != "0" ]; then
-            if ! arping -q -D -c 2 -I $netif $new_ip_address ; then
+            if ! arping -f -q -D -c 2 -I $netif $new_ip_address ; then
                 warn "Duplicate address detected for $new_ip_address while doing dhcp. retrying"
                 exit 1
             fi
@@ -87,14 +131,63 @@ case $reason in
             echo "setup_net $netif"
             echo "source_hook initqueue/online $netif"
             [ -e /tmp/net.$netif.manualup ] || echo "/sbin/netroot $netif"
-            echo "> /tmp/setup_net_$netif.ok"
-            echo "> /tmp/setup_net_\$(cat /sys/class/net/$netif/address).ok"
-            echo "rm -f $hookdir/initqueue/setup_net_$netif.sh"
+            echo "rm -f -- $hookdir/initqueue/setup_net_$netif.sh"
         } > $hookdir/initqueue/setup_net_$netif.sh
 
-        echo "[ -f /tmp/setup_net_$netif.ok ]" > $hookdir/initqueue/finished/dhclient-$netif.sh
+        echo "[ -f /tmp/net.$netif.did-setup ]" > $hookdir/initqueue/finished/dhclient-$netif.sh
         >/tmp/net.$netif.up
+        if [ -e /sys/class/net/${netif}/address ]; then
+            > /tmp/net.$(cat /sys/class/net/${netif}/address).up
+        fi
+
         ;;
+
+    RENEW|REBIND)
+        unset lease_time
+        [ -n "$new_dhcp_lease_time" ] && lease_time=$new_dhcp_lease_time
+        [ -n "$new_max_life" ] && lease_time=$new_max_life
+        preferred_lft=$lease_time
+        [ -n "$new_preferred_life" ] && preferred_lft=$new_preferred_life
+        ip -4 addr change ${new_ip_address}/${new_subnet_mask} broadcast ${new_broadcast_address} dev ${interface} \
+           ${lease_time:+valid_lft $lease_time} ${preferred_lft:+preferred_lft ${preferred_lft}} \
+           >/dev/null 2>&1
+        ;;
+
+    BOUND6)
+        echo "dhcp: BOND6 setting $netif"
+        setup_interface6
+
+        set | while read line; do
+            [ "${line#new_}" = "$line" ] && continue
+            echo "$line"
+        done >/tmp/dhclient.$netif.dhcpopts
+
+        {
+            echo '. /lib/net-lib.sh'
+            echo "setup_net $netif"
+            echo "source_hook initqueue/online $netif"
+            [ -e /tmp/net.$netif.manualup ] || echo "/sbin/netroot $netif"
+            echo "rm -f -- $hookdir/initqueue/setup_net_$netif.sh"
+        } > $hookdir/initqueue/setup_net_$netif.sh
+
+        echo "[ -f /tmp/net.$netif.did-setup ]" > $hookdir/initqueue/finished/dhclient-$netif.sh
+        >/tmp/net.$netif.up
+        if [ -e /sys/class/net/${netif}/address ]; then
+            > /tmp/net.$(cat /sys/class/net/${netif}/address).up
+        fi
+        ;;
+
+    RENEW6|REBIND6)
+        unset lease_time
+        [ -n "$new_dhcp_lease_time" ] && lease_time=$new_dhcp_lease_time
+        [ -n "$new_max_life" ] && lease_time=$new_max_life
+        preferred_lft=$lease_time
+        [ -n "$new_preferred_life" ] && preferred_lft=$new_preferred_life
+        ip -6 addr change ${new_ip6_address}/${new_ip6_prefixlen} dev ${interface} scope global \
+           ${lease_time:+valid_lft $lease_time} ${preferred_lft:+preferred_lft ${preferred_lft}} \
+           >/dev/null 2>&1
+        ;;
+
     *) echo "dhcp: $reason";;
 esac
 

modules.d/40network/dhcp-root.sh

@@ -2,20 +2,24 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-# Don't continue if root is ok
-[ -n "$rootok" ] && return
-
 # This script is sourced, so root should be set. But let's be paranoid
 [ -z "$root" ] && root=$(getarg root=)
-[ -z "$netroot" ] && netroot=$(getarg netroot=)
 
-if [ "$root" = "dhcp" ] || [ "$root" = "dhcp6" ] || [ "$netroot" = "dhcp" ] ; then
+if [ -z "$netroot" ]; then
+    for netroot in $(getargs netroot=); do
+        [ "$netroot" = "dhcp" ] && break
+        [ "$netroot" = "dhcp6" ] && break
+    done
+    [ "$netroot" = "dhcp" ] || [ "$netroot" = "dhcp6" ] || unset netroot
+fi
+
+if [ "$root" = "dhcp" ] || [ "$root" = "dhcp6" ] || [ "$netroot" = "dhcp" ] || [ "$netroot" = "dhcp6" ]; then
     # Tell ip= checker that we need dhcp
     NEEDDHCP="1"
 
     # Done, all good!
     rootok=1
-    if [ "$netroot" != "dhcp" ] ; then
+    if [ "$netroot" != "dhcp" ] && [ "$netroot" != "dhcp6" ]; then
         netroot=$root
     fi
 

modules.d/40network/ifup.sh

@@ -21,31 +21,56 @@ use_bridge='false'
 use_vlan='false'
 
 # enslave this interface to bond?
-if [ -e /tmp/bond.info ]; then
-    . /tmp/bond.info
+for i in /tmp/bond.*.info; do
+    [ -e "$i" ] || continue
+    unset bondslaves
+    unset bondname
+    . "$i"
     for slave in $bondslaves ; do
         if [ "$netif" = "$slave" ] ; then
             netif=$bondname
+            break 2
         fi
     done
-fi
+done
 
-if [ -e /tmp/team.info ]; then
-    . /tmp/team.info
+for i in /tmp/team.*.info; do
+    [ -e "$i" ] || continue
+    unset teamslaves
+    unset teammaster
+    . "$i"
     for slave in $teamslaves ; do
         if [ "$netif" = "$slave" ] ; then
             netif=$teammaster
         fi
     done
+done
+
+if [ -e /tmp/vlan.info ]; then
+    . /tmp/vlan.info
+    if [ "$netif" = "$phydevice" ]; then
+        if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
+            : # We need to really setup bond (recursive call)
+        elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+            : # We need to really setup team (recursive call)
+        else
+            netif="$vlanname"
+            use_vlan='true'
+        fi
+    fi
 fi
 
 # bridge this interface?
 if [ -e /tmp/bridge.info ]; then
     . /tmp/bridge.info
-    for ethname in $ethnames ; do
+    for ethname in $bridgeslaves ; do
         if [ "$netif" = "$ethname" ]; then
             if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
                 : # We need to really setup bond (recursive call)
+            elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+                : # We need to really setup team (recursive call)
+            elif [ "$netif" = "$vlanname" ] && [ -n "$DO_VLAN_SETUP" ]; then
+                : # We need to really setup vlan (recursive call)
             else
                 netif="$bridgename"
                 use_bridge='true'
@@ -54,35 +79,56 @@ if [ -e /tmp/bridge.info ]; then
     done
 fi
 
-if [ -e /tmp/vlan.info ]; then
-    . /tmp/vlan.info
-    if [ "$netif" = "$phydevice" ]; then
-        if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
-            : # We need to really setup bond (recursive call)
-        else
-            netif="$vlanname"
-            use_vlan='true'
-        fi
-    fi
-fi
-
 # disable manual ifup while netroot is set for simplifying our logic
 # in netroot case we prefer netroot to bringup $netif automaticlly
 [ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
-[ -z "$netroot" ] && [ -z "$manualup" ] && exit 0
-[ -n "$manualup" ] && >/tmp/net.$netif.manualup
+
+if [ -n "$manualup" ]; then
+    >/tmp/net.$netif.manualup
+    rm -f /tmp/net.${netif}.did-setup
+else
+    [ -e /tmp/net.${netif}.did-setup ] && exit 0
+    [ -e /sys/class/net/$netif/address ] && \
+        [ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && exit 0
+fi
 
 # Run dhclient
 do_dhcp() {
     # dhclient-script will mark the netif up and generate the online
     # event for nfsroot
     # XXX add -V vendor class and option parsing per kernel
-    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"
+
+    local _COUNT=0
+    local _timeout=$(getargs rd.net.timeout.dhcp=)
+    local _DHCPRETRY=$(getargs rd.net.dhcp.retry=)
+    _DHCPRETRY=${_DHCPRETRY:-1}
+
+    [ -e /tmp/dhclient.$netif.pid ] && return 0
+
+    if ! iface_has_link $netif; then
+        warn "No carrier detected on interface $netif"
+        return 1
+    fi
+
+    while [ $_COUNT -lt $_DHCPRETRY ]; do
+        info "Starting dhcp for interface $netif"
+        dhclient "$@" \
+                 ${_timeout:+-timeout $_timeout} \
+                 -q \
+                 -cf /etc/dhclient.conf \
+                 -pf /tmp/dhclient.$netif.pid \
+                 -lf /tmp/dhclient.$netif.lease \
+                 $netif \
+            && return 0
+        _COUNT=$(($_COUNT+1))
+        [ $_COUNT -lt $_DHCPRETRY ] && sleep 1
+    done
+    warn "dhcp for interface $netif failed"
+    return 1
 }
 
 load_ipv6() {
+    [ -d /proc/sys/net/ipv6 ] && return
     modprobe ipv6
     i=0
     while [ ! -d /proc/sys/net/ipv6 ]; do
@@ -98,6 +144,7 @@ do_ipv6auto() {
     echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra
     echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects
     linkup $netif
+    wait_for_ipv6_auto $netif
 
     [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
 
@@ -108,21 +155,38 @@ do_ipv6auto() {
 do_static() {
     strstr $ip '*:*:*' && load_ipv6
 
-    linkup $netif
+    if ! linkup $netif; then
+        warn "Could not bring interface $netif up!"
+        return 1
+    fi
+
+    ip route get "$ip" | {
+        read a rest
+        if [ "$a" = "local" ]; then
+            warn "Not assigning $ip to interface $netif, cause it is already assigned!"
+            return 1
+        fi
+        return 0
+    } || return 1
+
     [ -n "$macaddr" ] && ip link set address $macaddr dev $netif
     [ -n "$mtu" ] && ip link set mtu $mtu dev $netif
     if strstr $ip '*:*:*'; then
         # note no ip addr flush for ipv6
-        ip addr add $ip/$mask ${srv+peer $srv} dev $netif
+        ip addr add $ip/$mask ${srv:+peer $srv} dev $netif
+        wait_for_ipv6_dad $netif
     else
+        if ! arping -f -q -D -c 2 -I $netif $ip; then
+            warn "Duplicate address detected for $ip for interface $netif."
+            return 1
+        fi
         ip addr flush dev $netif
-        ip addr add $ip/$mask ${srv+peer $srv} brd + dev $netif
+        ip addr add $ip/$mask ${srv:+peer $srv} brd + dev $netif
     fi
 
-    [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
+    [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw
     [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
 
-    > /tmp/setup_net_${netif}.ok
     return 0
 }
 
@@ -134,11 +198,12 @@ if [ "$netif" = "lo" ] ; then
 fi
 
 # start bond if needed
-if [ -e /tmp/bond.info ]; then
-    . /tmp/bond.info
+if [ -e /tmp/bond.${netif}.info ]; then
+    . /tmp/bond.${netif}.info
 
     if [ "$netif" = "$bondname" ] && [ ! -e /tmp/net.$bondname.up ] ; then # We are master bond device
         modprobe bonding
+        echo "+$netif" >  /sys/class/net/bonding_masters
         ip link set $netif down
 
         # Stolen from ifup-eth
@@ -163,6 +228,7 @@ if [ -e /tmp/bond.info ]; then
 
         for slave in $bondslaves ; do
             ip link set $slave down
+            cat /sys/class/net/$slave/address > /tmp/net.${netif}.${slave}.hwaddr
             echo "+$slave" > /sys/class/net/$bondname/bonding/slaves
             linkup $slave
         done
@@ -178,26 +244,44 @@ if [ -e /tmp/bond.info ]; then
     fi
 fi
 
-if [ -e /tmp/team.info ]; then
-    . /tmp/team.info
+if [ -e /tmp/team.${netif}.info ]; then
+    . /tmp/team.${netif}.info
     if [ "$netif" = "$teammaster" ] && [ ! -e /tmp/net.$teammaster.up ] ; then
         # We shall only bring up those _can_ come up
         # in case of some slave is gone in active-backup mode
         working_slaves=""
         for slave in $teamslaves ; do
-            ip link set $slave up 2>/dev/null
+            teamdctl ${teammaster} port present ${slave} 2>/dev/null \
+                     && continue
+            ip link set dev $slave up 2>/dev/null
             if wait_for_if_up $slave; then
                 working_slaves+="$slave "
             fi
         done
         # Do not add slaves now
-        teamd -d -U -n -t $teammaster -f /etc/teamd/$teammaster.conf
+        teamd -d -U -n -N -t $teammaster -f /etc/teamd/$teammaster.conf
         for slave in $working_slaves; do
             # team requires the slaves to be down before joining team
-            ip link set $slave down
+            ip link set dev $slave down
+            (
+                unset TEAM_PORT_CONFIG
+                _hwaddr=$(cat /sys/class/net/$slave/address)
+                _subchannels=$(iface_get_subchannels "$slave")
+                if [ -n "$_hwaddr" ] && [ -e "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then
+                    . "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf"
+                elif [ -n "$_subchannels" ] && [ -e "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" ]; then
+                    . "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf"
+                elif [ -e "/etc/sysconfig/network-scripts/ifcfg-${slave}" ]; then
+                    . "/etc/sysconfig/network-scripts/ifcfg-${slave}"
+                fi
+
+                if [ -n "${TEAM_PORT_CONFIG}" ]; then
+                    /usr/bin/teamdctl ${teammaster} port config update ${slave} "${TEAM_PORT_CONFIG}"
+                fi
+            )
             teamdctl $teammaster port add $slave
         done
-        ip link set $teammaster up
+        ip link set dev $teammaster up
     fi
 fi
 
@@ -209,9 +293,13 @@ if [ -e /tmp/bridge.info ]; then
     if [ "$netif" = "$bridgename" ] && [ ! -e /tmp/net.$bridgename.up ]; then
         brctl addbr $bridgename
         brctl setfd $bridgename 0
-        for ethname in $ethnames ; do
+        for ethname in $bridgeslaves ; do
             if [ "$ethname" = "$bondname" ] ; then
                 DO_BOND_SETUP=yes ifup $bondname -m
+            elif [ "$ethname" = "$teammaster" ] ; then
+                DO_TEAM_SETUP=yes ifup $teammaster -m
+            elif [ "$ethname" = "$vlanname" ]; then
+                DO_VLAN_SETUP=yes ifup $vlanname -m
             else
                 linkup $ethname
             fi
@@ -235,24 +323,24 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
     modprobe 8021q
     if [ "$phydevice" = "$bondname" ] ; then
         DO_BOND_SETUP=yes ifup $phydevice -m
+    elif [ "$phydevice" = "$teammaster" ] ; then
+        DO_TEAM_SETUP=yes ifup $phydevice -m
     else
         linkup "$phydevice"
     fi
     ip link add dev "$vlanname" link "$phydevice" type vlan id "$(get_vid $vlanname)"
+    ip link set "$vlanname" up
 fi
 
-# setup nameserver
-namesrv=$(getargs nameserver)
-if  [ -n "$namesrv" ] ; then
-    for s in $namesrv; do
-        echo nameserver $s
-    done
-fi >> /tmp/net.$netif.resolv.conf
-
 # No ip lines default to dhcp
 ip=$(getarg ip)
 
 if [ -z "$ip" ]; then
+    for s in $(getargs nameserver); do
+        [ -n "$s" ] || continue
+        echo nameserver $s >> /tmp/net.$netif.resolv.conf
+    done
+
     if [ "$netroot" = "dhcp6" ]; then
         do_dhcp -6
     else
@@ -268,32 +356,59 @@ for p in $(getargs ip=); do
     # skip ibft
     [ "$autoconf" = "ibft" ] && continue
 
+    case "$dev" in
+        ??:??:??:??:??:??)  # MAC address
+            _dev=$(iface_for_mac $dev)
+            [ -n "$_dev" ] && dev="$_dev"
+            ;;
+        ??-??-??-??-??-??)  # MAC address in BOOTIF form
+            _dev=$(iface_for_mac $(fix_bootif $dev))
+            [ -n "$_dev" ] && dev="$_dev"
+            ;;
+    esac
+
     # If this option isn't directed at our interface, skip it
     [ -n "$dev" ] && [ "$dev" != "$netif" ] && \
     [ "$use_bridge" != 'true' ] && \
     [ "$use_vlan" != 'true' ] && continue
 
+    # setup nameserver
+    for s in "$dns1" "$dns2" $(getargs nameserver); do
+        [ -n "$s" ] || continue
+        echo nameserver $s >> /tmp/net.$netif.resolv.conf
+    done
+
     # Store config for later use
-    for i in ip srv gw mask hostname macaddr; do
+    for i in ip srv gw mask hostname macaddr dns1 dns2; do
         eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
     done > /tmp/net.$netif.override
 
-    case $autoconf in
-        dhcp|on|any)
-            do_dhcp -4 ;;
-        dhcp6)
-            do_dhcp -6 ;;
-        auto6)
-            do_ipv6auto ;;
-        *)
-            do_static ;;
-    esac
+    for autoopt in $(str_replace "$autoconf" "," " "); do
+        case $autoopt in
+            dhcp|on|any)
+                do_dhcp -4 ;;
+            dhcp6)
+                load_ipv6
+                do_dhcp -6 ;;
+            auto6)
+                do_ipv6auto ;;
+            *)
+                do_static ;;
+        esac
+    done
+    ret=$?
+
+    > /tmp/net.${netif}.up
+
+    if [ -e /sys/class/net/${netif}/address ]; then
+        > /tmp/net.$(cat /sys/class/net/${netif}/address).up
+    fi
 
     case $autoconf in
         dhcp|on|any|dhcp6)
             ;;
         *)
-            if [ $? -eq 0 ]; then
+            if [ $ret -eq 0 ]; then
                 setup_net $netif
                 source_hook initqueue/online $netif
                 if [ -z "$manualup" ]; then
@@ -303,6 +418,33 @@ for p in $(getargs ip=); do
             ;;
     esac
 
-    break
+    exit 0
 done
+
+# netif isn't the top stack? Then we should exit here.
+# eg. netif is bond0. br0 is on top of it. dhcp br0 is correct but dhcp
+#     bond0 doesn't make sense.
+if [ -n "$DO_BOND_SETUP" -o -n "$DO_TEAM_SETUP" -o -n "$DO_VLAN_SETUP" ]; then
+    exit 0
+fi
+
+# no ip option directed at our interface?
+if [ ! -e /tmp/net.${netif}.up ]; then
+    if [ -e /tmp/net.bootdev ]; then
+        BOOTDEV=$(cat /tmp/net.bootdev)
+        if [ "$netif" = "$BOOTDEV" ] || [ "$BOOTDEV" = "$(cat /sys/class/net/${netif}/address)" ]; then
+            load_ipv6
+            do_dhcp
+        fi
+    else
+        if getargs 'ip=dhcp6'; then
+            load_ipv6
+            do_dhcp -6
+        fi
+        if getargs 'ip=dhcp'; then
+            do_dhcp -4
+        fi
+    fi
+fi
+
 exit 0

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

@@ -5,18 +5,12 @@
 check() {
     local _program
 
-    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
+    require_binaries ip arping dhclient || return 1
 
     return 255
 }
 
 depends() {
-    [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg
     return 0
 }
 
@@ -24,8 +18,8 @@ installkernel() {
     # Include wired net drivers, excluding wireless
 
     net_module_filter() {
-        local _net_drivers='eth_type_trans|register_virtio_device'
-        local _unwanted_drivers='/(wireless|isdn|uwb)/'
+        local _net_drivers='eth_type_trans|register_virtio_device|usbnet_open'
+        local _unwanted_drivers='/(wireless|isdn|uwb|net/ethernet|net/phy|net/team)/'
         local _ret
         # subfunctions inherit following FDs
         local _merge=8 _side2=9
@@ -65,15 +59,20 @@ installkernel() {
         | net_module_filter | instmods
 
     #instmods() will take care of hostonly
-    instmods =drivers/net/phy ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net =drivers/net/team
+    instmods \
+        =drivers/net/phy \
+        =drivers/net/team \
+        =drivers/net/ethernet \
+        ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net
+    hostonly="" instmods iscsi_ibft crc32c iscsi_boot_sysfs
 }
 
 install() {
     local _arch _i _dir
-    dracut_install ip arping dhclient sed
-    dracut_install -o ping ping6
-    dracut_install -o brctl
-    dracut_install -o teamd teamdctl teamnl
+    inst_multiple ip arping dhclient sed
+    inst_multiple -o ping ping6
+    inst_multiple -o brctl
+    inst_multiple -o teamd teamdctl teamnl
     inst_simple /etc/libnl/classid
     inst_script "$moddir/ifup.sh" "/sbin/ifup"
     inst_script "$moddir/netroot.sh" "/sbin/netroot"
@@ -83,6 +82,7 @@ install() {
     inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
     inst_hook pre-udev 60 "$moddir/net-genrules.sh"
     inst_hook cmdline 91 "$moddir/dhcp-root.sh"
+    inst_hook cmdline 92 "$moddir/parse-ibft.sh"
     inst_hook cmdline 95 "$moddir/parse-vlan.sh"
     inst_hook cmdline 96 "$moddir/parse-bond.sh"
     inst_hook cmdline 96 "$moddir/parse-team.sh"
@@ -91,6 +91,43 @@ install() {
     inst_hook cmdline 99 "$moddir/parse-ifname.sh"
     inst_hook cleanup 10 "$moddir/kill-dhclient.sh"
 
+    # install all config files for teaming
+    unset TEAM_MASTER
+    unset TEAM_CONFIG
+    unset TEAM_PORT_CONFIG
+    unset HWADDR
+    unset SUBCHANNELS
+    for i in /etc/sysconfig/network-scripts/ifcfg-*; do
+        [ -e "$i" ] || continue
+        case "$i" in
+            *~ | *.bak | *.orig | *.rpmnew | *.rpmorig | *.rpmsave)
+                continue
+                ;;
+        esac
+        (
+            . "$i"
+            if ! [ "${ONBOOT}" = "no" -o "${ONBOOT}" = "NO" ] \
+                    && [ -n "${TEAM_MASTER}${TEAM_CONFIG}${TEAM_PORT_CONFIG}" ]; then
+                if [ -n "$TEAM_CONFIG" ] && [ -n "$DEVICE" ]; then
+                    mkdir -p $initdir/etc/teamd
+                    printf -- "%s" "$TEAM_CONFIG" > "$initdir/etc/teamd/${DEVICE}.conf"
+                elif [ -n "$TEAM_PORT_CONFIG" ]; then
+                    inst_simple "$i"
+
+                    HWADDR="$(echo $HWADDR | sed 'y/ABCDEF/abcdef/')"
+                    if [ -n "$HWADDR" ]; then
+                        ln_r "$i" "/etc/sysconfig/network-scripts/mac-${HWADDR}.conf"
+                    fi
+
+                    SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')"
+                    if [ -n "$SUBCHANNELS" ]; then
+                        ln_r "$i" "/etc/sysconfig/network-scripts/ccw-${SUBCHANNELS}.conf"
+                    fi
+                fi
+            fi
+        )
+    done
+
     _arch=$(uname -m)
 
     inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \

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

@@ -2,46 +2,48 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-# pxelinux provides macaddr '-' separated, but we need ':'
-fix_bootif() {
-    local macaddr=${1}
-    local IFS='-'
-    macaddr=$(for i in ${macaddr} ; do echo -n $i:; done)
-    macaddr=${macaddr%:}
-    # strip hardware type field from pxelinux
-    [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:}
-    # return macaddr with lowercase alpha characters expected by udev
-    echo $macaddr | sed 'y/ABCDEF/abcdef/'
-}
+getargbool 0 rd.neednet && NEEDNET=1
 
 # Don't continue if we don't need network
-if [ -z "$netroot" ] && [ ! -e "/tmp/net.ifaces" ] && ! getargbool 0 rd.neednet >/dev/null; then
+if [ -z "$netroot" ] && [ ! -e "/tmp/net.ifaces" ] && [ "$NEEDNET" != "1" ]; then
     return
 fi
 
+command -v fix_bootif >/dev/null || . /lib/net-lib.sh
+
 # Write udev rules
 {
     # bridge: attempt only the defined interface
     if [ -e /tmp/bridge.info ]; then
         . /tmp/bridge.info
-        IFACES="$IFACES ${ethnames%% *}"
+        IFACES="$IFACES ${bridgeslaves%% *}"
+        MASTER_IFACES="$MASTER_IFACES $bridgename"
     fi
 
     # bond: attempt only the defined interface (override bridge defines)
-    if [ -e /tmp/bond.info ]; then
-        . /tmp/bond.info
+    for i in /tmp/bond.*.info; do
+        [ -e "$i" ] || continue
+        unset bondslaves
+        unset bondname
+        . "$i"
         # It is enough to fire up only one
         IFACES="$IFACES ${bondslaves%% *}"
-    fi
+        MASTER_IFACES="$MASTER_IFACES ${bondname}"
+    done
 
-    if [ -e /tmp/team.info ]; then
-        . /tmp/team.info
+    for i in /tmp/team.*.info; do
+        [ -e "$i" ] || continue
+        unset teamslaves
+        unset teammaster
+        . "$i"
         IFACES="$IFACES ${teamslaves}"
-    fi
+        MASTER_IFACES="$MASTER_IFACES ${teammaster}"
+    done
 
     if [ -e /tmp/vlan.info ]; then
         . /tmp/vlan.info
         IFACES="$IFACES $phydevice"
+        MASTER_IFACES="$MASTER_IFACES ${vlanname}"
     fi
 
     if [ -z "$IFACES" ]; then
@@ -53,29 +55,51 @@ fi
     fi
 
     ifup='/sbin/ifup $env{INTERFACE}'
-    [ -z "$netroot" ] && ifup="$ifup -m"
 
-    # BOOTIF says everything, use only that one
-    BOOTIF=$(getarg 'BOOTIF=')
-    if [ -n "$BOOTIF" ] ; then
-        BOOTIF=$(fix_bootif "$BOOTIF")
-        printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", RUN+="%s"\n' "$BOOTIF" "/sbin/initqueue --onetime $ifup"
-        echo "[ -f /tmp/setup_net_${BOOTIF}.ok ]" >$hookdir/initqueue/finished/wait-${BOOTIF}.sh
+    runcmd="RUN+=\"/sbin/initqueue --name ifup-\$env{INTERFACE} --unique --onetime $ifup\""
 
-    # If we have to handle multiple interfaces, handle only them.
-    elif [ -n "$IFACES" ] ; then
-        for iface in $IFACES ; do
-            printf 'SUBSYSTEM=="net", ENV{INTERFACE}=="%s", RUN+="%s"\n' "$iface" "/sbin/initqueue --onetime $ifup"
-            if [ "$bootdev" = "$iface" ]; then
-                echo "[ -f /tmp/setup_net_${iface}.ok ]" >$hookdir/initqueue/finished/wait-$iface.sh
+    # We have some specific interfaces to handle
+    if [ -n "$IFACES" ]; then
+        echo 'SUBSYSTEM!="net", GOTO="net_end"'
+        echo 'ACTION!="add|change|move", GOTO="net_end"'
+        for iface in $IFACES; do
+            case "$iface" in
+                ??:??:??:??:??:??)  # MAC address
+                    cond="ATTR{address}==\"$iface\""
+                    echo "$cond, $runcmd, GOTO=\"net_end\""
+                    ;;
+                ??-??-??-??-??-??)  # MAC address in BOOTIF form
+                    cond="ATTR{address}==\"$(fix_bootif $iface)\""
+                    echo "$cond, $runcmd, GOTO=\"net_end\""
+                    ;;
+                *)                  # an interface name
+                    cond="ENV{INTERFACE}==\"$iface\""
+                    echo "$cond, $runcmd, GOTO=\"net_end\""
+                    cond="NAME==\"$iface\""
+                    echo "$cond, $runcmd, GOTO=\"net_end\""
+                    ;;
+            esac
+            # The GOTO prevents us from trying to ifup the same device twice
+        done
+        echo 'LABEL="net_end"'
+
+        if [ -n "$MASTER_IFACES" ]; then
+            wait_ifaces=$MASTER_IFACES
+        else
+            wait_ifaces=$IFACES
+        fi
+
+        for iface in $wait_ifaces; do
+            if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
+                echo "[ -f /tmp/net.${iface}.did-setup ]" >$hookdir/initqueue/finished/wait-$iface.sh
             fi
         done
-
     # Default: We don't know the interface to use, handle all
     # Fixme: waiting for the interface as well.
     else
+        cond='ACTION=="add", SUBSYSTEM=="net"'
         # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh
-        printf 'SUBSYSTEM=="net", RUN+="%s"\n' "/sbin/initqueue --onetime $ifup" > /etc/udev/rules.d/91-default-net.rules
+        echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
     fi
 
 # if you change the name of "90-net.rules", also change modules.d/80cms/cmssetup.sh

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

@@ -2,6 +2,18 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
+is_ip() {
+    echo "$1" | {
+        IFS=. read a b c d
+        test "$a" -ge 0 -a "$a" -le 255 \
+             -a "$b" -ge 0 -a "$b" -le 255 \
+             -a "$c" -ge 0 -a "$c" -le 255 \
+             -a "$d" -ge 0 -a "$d" -le 255 \
+             2> /dev/null
+    } && return 0
+    return 1
+}
+
 get_ip() {
     local iface="$1" ip=""
     ip=$(ip -o -f inet addr show $iface)
@@ -14,6 +26,11 @@ iface_for_remote_addr() {
     echo $5
 }
 
+iface_for_ip() {
+    set -- $(ip -o addr show to $1)
+    echo $2
+}
+
 iface_for_mac() {
     local interface="" mac="$(echo $1 | sed 'y/ABCDEF/abcdef/')"
     for interface in /sys/class/net/*; do
@@ -23,15 +40,30 @@ iface_for_mac() {
     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..
+# get the iface name for the given identifier - either a MAC, IP, or iface name
+iface_name() {
+    case $1 in
+        ??:??:??:??:??:??|??-??-??-??-??-??) iface_for_mac $1 ;;
+        *:*:*|*.*.*.*) iface_for_ip $1 ;;
+        *) echo $1 ;;
+    esac
+}
+
+# list the configured interfaces
+configured_ifaces() {
+    local IFACES="" iface_id="" rv=1
+    [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
+    if { pidof udevd || pidof systemd-udevd; } > /dev/null; then
+        for iface_id in $IFACES; do
+            echo $(iface_name $iface_id)
+            rv=0
+        done
+    else
+        warn "configured_ifaces called before udev is running"
+        echo $IFACES
+        [ -n "$IFACES" ] && rv=0
+    fi
+    return $rv
 }
 
 all_ifaces_up() {
@@ -42,6 +74,14 @@ all_ifaces_up() {
     done
 }
 
+all_ifaces_setup() {
+    local iface="" IFACES=""
+    [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
+    for iface in $IFACES; do
+        [ -e /tmp/net.$iface.did-setup ] || return 1
+    done
+}
+
 get_netroot_ip() {
     local prefix="" server="" rest=""
     splitsep "$1" ":" prefix server rest
@@ -61,23 +101,42 @@ ifdown() {
     ip link set $netif down
     ip addr flush dev $netif
     echo "#empty" > /etc/resolv.conf
-    rm -f /tmp/net.$netif.did-setup
+    rm -f -- /tmp/net.$netif.did-setup
+    [ -e /sys/class/net/$netif/address ] && \
+        rm -f -- /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
     # TODO: send "offline" uevent?
 }
 
 setup_net() {
     local netif="$1" f="" gw_ip="" netroot_ip="" iface="" IFACES=""
+    local _p
     [ -e /tmp/net.$netif.did-setup ] && return
+    [ -e /sys/class/net/$netif/address ] && \
+        [ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && return
     [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
     [ -z "$IFACES" ] && IFACES="$netif"
     # run the scripts written by ifup
-    [ -e /tmp/net.$netif.gw ]            && . /tmp/net.$netif.gw
     [ -e /tmp/net.$netif.hostname ]      && . /tmp/net.$netif.hostname
     [ -e /tmp/net.$netif.override ]      && . /tmp/net.$netif.override
     [ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
     # set up resolv.conf
     [ -e /tmp/net.$netif.resolv.conf ] && \
         cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf
+    [ -e /tmp/net.$netif.gw ]            && . /tmp/net.$netif.gw
+
+    # add static route
+    for _p in $(getargs rd.route); do
+        route_to_var "$_p" || continue
+        [ -n "$route_dev" ] && [ "$route_dev" != "$netif" ] && continue
+        ip route add "$route_mask" ${route_gw:+via "$route_gw"} ${route_dev:+dev "$route_dev"}
+        if strstr "$route_mask" ":"; then
+            printf -- "%s\n" "$route_mask ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}" \
+                > /tmp/net.route6."$netif"
+        else
+            printf -- "%s\n" "$route_mask ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}" \
+                > /tmp/net.route."$netif"
+        fi
+    done
 
     # Handle STP Timeout: arping the default gateway.
     # (or the root server, if a) it's local or b) there's no gateway.)
@@ -103,12 +162,14 @@ setup_net() {
         read layer2 < /sys/class/net/$netif/device/layer2
     fi
 
-    if [ "$layer2" != "0" ] && [ -n "$dest" ] && ! arping -q -f -w 60 -I $netif $dest ; then
-        info "Resolving $dest via ARP on $netif failed"
+    if [ "$layer2" != "0" ] && [ -n "$dest" ] && ! strstr "$dest" ":"; then
+        arping -q -f -w 60 -I $netif $dest || info "Resolving $dest via ARP on $netif failed"
     fi
     unset layer2
 
     > /tmp/net.$netif.did-setup
+    [ -e /sys/class/net/$netif/address ] && \
+        > /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
 }
 
 save_netinfo() {
@@ -128,41 +189,104 @@ save_netinfo() {
 }
 
 set_ifname() {
-    local name="$1" mac="$2" num=0 n=""
+    local name="$1" mac="$2" num=-1 n=""
     # if it's already set, return the existing name
     for n in $(getargs ifname=); do
         strstr "$n" "$mac" && echo ${n%%:*} && return
     done
     # otherwise, pick a new name and use that
-    while [ -e /sys/class/$name$num ]; do num=$(($num+1)); done
+    while :; do
+        num=$(($num+1));
+        [ -e /sys/class/net/$name$num ] && continue
+        for n in $(getargs ifname=); do
+            [ "$name$num" = "${n%%:*}" ] && continue 2
+        done
+        break
+    done
     echo "ifname=$name$num:$mac" >> /etc/cmdline.d/45-ifname.conf
     echo "$name$num"
 }
 
+# pxelinux provides macaddr '-' separated, but we need ':'
+fix_bootif() {
+    local macaddr=${1}
+    local IFS='-'
+    macaddr=$(for i in ${macaddr} ; do echo -n $i:; done)
+    macaddr=${macaddr%:}
+    # strip hardware type field from pxelinux
+    [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:}
+    # return macaddr with lowercase alpha characters expected by udev
+    echo $macaddr | sed 'y/ABCDEF/abcdef/'
+}
+
 ibft_to_cmdline() {
-    local iface="" mac="" dev=""
-    local dhcp="" ip="" gw="" mask="" hostname=""
+    local iface=""
     modprobe -q iscsi_ibft
     (
         for iface in /sys/firmware/ibft/ethernet*; do
+            local mac="" dev=""
+            local dhcp="" ip="" gw="" mask="" hostname=""
+            local dns1 dns2
+
             [ -e ${iface}/mac ] || continue
             mac=$(read a < ${iface}/mac; echo $a)
             [ -z "$mac" ] && continue
             dev=$(set_ifname ibft $mac)
-            dhcp=$(read a < ${iface}/dhcp; echo $a)
+
+            [ -e /tmp/net.${dev}.has_ibft_config ] && continue
+
+            [ -e ${iface}/dhcp ] && dhcp=$(read a < ${iface}/dhcp; echo $a)
+
             if [ -n "$dhcp" ]; then
                 echo "ip=$dev:dhcp"
+            elif [ -e ${iface}/ip-addr ]; then
+                [ -e ${iface}/ip-addr ] && ip=$(read a < ${iface}/ip-addr; echo $a)
+                # skip not assigned ip adresses
+                [ "$ip" = "0.0.0.0" ] && continue
+                [ -e ${iface}/gateway ] && gw=$(read a < ${iface}/gateway; echo $a)
+                [ "$gateway" = "0.0.0.0" ] && unset $gateway
+                [ -e ${iface}/subnet-mask ] && mask=$(read a < ${iface}/subnet-mask; echo $a)
+                [ -e ${iface}/primary-dns ] && dns1=$(read a < ${iface}/primary-dns; echo $a)
+                [ "$dns1" = "0.0.0.0" ] && unset $dns1
+                [ -e ${iface}/secondary-dns ] && dns2=$(read a < ${iface}/secondary-dns; echo $a)
+                [ "$dns2" = "0.0.0.0" ] && unset $dns2
+                [ -e ${iface}/hostname ] && hostname=$(read a < ${iface}/hostname; echo $a)
+                if [ -n "$ip" ] && [ -n "$mask" ]; then
+                    echo "ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}"
+                else
+                    warn "${iface} does not contain a valid iBFT configuration"
+                    warn "ip-addr=$ip"
+                    warn "gateway=$gw"
+                    warn "subnet-mask=$mask"
+                    warn "hostname=$hostname"
+                fi
             else
-                ip=$(read a < ${iface}/ip-addr; echo $a)
-                gw=$(read a < ${iface}/gateway; echo $a)
-                mask=$(read a < ${iface}/subnet-mask; echo $a)
-                hostname=$(read a < ${iface}/hostname; echo $a)
-                echo "ip=$ip::$gw:$mask:$hostname:$dev:none"
+                info "${iface} does not contain a valid iBFT configuration"
+                ls -l ${iface} | vinfo
             fi
+
+            if [ -e ${iface}/vlan ]; then
+               vlan=$(read a < ${iface}/vlan; echo $a)
+               if [ "$vlan" -ne "0" ]; then
+                   case "$vlan" in
+                       [0-9]*)
+                           echo "vlan=$dev.$vlan:$dev"
+                           echo $mac > /tmp/net.${dev}.${vlan}.has_ibft_config
+                           ;;
+                       *)
+                           echo "vlan=$vlan:$dev"
+                           echo $mac > /tmp/net.${vlan}.has_ibft_config
+                           ;;
+                   esac
+               else
+                   echo $mac > /tmp/net.${dev}.has_ibft_config
+               fi
+            else
+                echo $mac > /tmp/net.${dev}.has_ibft_config
+            fi
+
         done
     ) >> /etc/cmdline.d/40-ibft.conf
-    # reread cmdline
-    unset CMDLINE
 }
 
 parse_iscsi_root()
@@ -170,66 +294,63 @@ parse_iscsi_root()
     local v
     v=${1#iscsi:}
 
-# extract authentication info
+    # extract authentication info
     case "$v" in
-	*@*:*:*:*:*)
-	    authinfo=${v%%@*}
-	    v=${v#*@}
-    # allow empty authinfo to allow having an @ in iscsi_target_name like this:
-    # netroot=iscsi:@192.168.1.100::3260::iqn.2009-01.com.example:testdi@sk
-	    if [ -n "$authinfo" ]; then
-		OLDIFS="$IFS"
-		IFS=:
-		set $authinfo
-		IFS="$OLDIFS"
-		if [ $# -gt 4 ]; then
-		    warn "Wrong authentication info in iscsi: parameter!"
-		    return 1
-		fi
-		iscsi_username=$1
-		iscsi_password=$2
-		if [ $# -gt 2 ]; then
-		    iscsi_in_username=$3
-		    iscsi_in_password=$4
-		fi
-	    fi
-	    ;;
+        *@*:*:*:*:*)
+            authinfo=${v%%@*}
+            v=${v#*@}
+            # allow empty authinfo to allow having an @ in iscsi_target_name like this:
+            # netroot=iscsi:@192.168.1.100::3260::iqn.2009-01.com.example:testdi@sk
+            if [ -n "$authinfo" ]; then
+                OLDIFS="$IFS"
+                IFS=:
+                set $authinfo
+                IFS="$OLDIFS"
+                if [ $# -gt 4 ]; then
+                    warn "Wrong authentication info in iscsi: parameter!"
+                    return 1
+                fi
+                iscsi_username=$1
+                iscsi_password=$2
+                if [ $# -gt 2 ]; then
+                    iscsi_in_username=$3
+                    iscsi_in_password=$4
+                fi
+            fi
+            ;;
     esac
 
-# extract target ip
+    # extract target ip
     case "$v" in
-	[[]*[]]:*)
-	    iscsi_target_ip=${v#[[]}
-		iscsi_target_ip=${iscsi_target_ip%%[]]*}
-	    v=${v#[[]$iscsi_target_ip[]]:}
-	    ;;
-	*)
-	    iscsi_target_ip=${v%%[:]*}
-	    v=${v#$iscsi_target_ip:}
-	    ;;
+        [[]*[]]:*)
+            iscsi_target_ip=${v#[[]}
+                iscsi_target_ip=${iscsi_target_ip%%[]]*}
+            v=${v#[[]$iscsi_target_ip[]]:}
+            ;;
+        *)
+            iscsi_target_ip=${v%%[:]*}
+            v=${v#$iscsi_target_ip:}
+            ;;
     esac
 
-# extract target name
+    unset iscsi_target_name
+    # extract target name
     case "$v" in
-	*:iqn.*)
-	    iscsi_target_name=iqn.${v##*:iqn.}
-	    v=${v%:iqn.*}:
-	    ;;
-	*:eui.*)
-	    iscsi_target_name=iqn.${v##*:eui.}
-	    v=${v%:iqn.*}:
-	    ;;
-	*:naa.*)
-	    iscsi_target_name=iqn.${v##*:naa.}
-	    v=${v%:iqn.*}:
-	    ;;
-	*)
-	    warn "Invalid iscii target name, should begin with 'iqn.' or 'eui.' or 'naa.'"
-	    return 1
-	    ;;
+        *:iqn.*)
+            iscsi_target_name=iqn.${v##*:iqn.}
+            v=${v%:iqn.*}:
+            ;;
+        *:eui.*)
+            iscsi_target_name=eui.${v##*:eui.}
+            v=${v%:eui.*}:
+            ;;
+        *:naa.*)
+            iscsi_target_name=naa.${v##*:naa.}
+            v=${v%:naa.*}:
+            ;;
     esac
 
-# parse the rest
+    # parse the rest
     OLDIFS="$IFS"
     IFS=:
     set $v
@@ -237,17 +358,34 @@ parse_iscsi_root()
 
     iscsi_protocol=$1; shift # ignored
     iscsi_target_port=$1; shift
-    if [ $# -eq 3 ]; then
-	iscsi_iface_name=$1; shift
+
+    if [ -n "$iscsi_target_name" ]; then
+        if [ $# -eq 3 ]; then
+            iscsi_iface_name=$1; shift
+        fi
+        if [ $# -eq 2 ]; then
+            iscsi_netdev_name=$1; shift
+        fi
+        iscsi_lun=$1; shift
+        if [ $# -ne 0 ]; then
+            warn "Invalid parameter in iscsi: parameter!"
+            return 1
+        fi
+        return 0
     fi
-    if [ $# -eq 2 ]; then
-	iscsi_netdev_name=$1; shift
+
+
+    if [ $# -gt 3 ] && [ -n "$1$2" ]; then
+        if [ -z "$3" ] || [ "$3" -ge 0 ]  2>/dev/null ; then
+            iscsi_iface_name=$1; shift
+            iscsi_netdev_name=$1; shift
+        fi
     fi
+
     iscsi_lun=$1; shift
-    if [ $# -ne 0 ]; then
-	warn "Invalid parameter in iscsi: parameter!"
-	return 1
-    fi
+
+    iscsi_target_name=$(printf "%s:" "$@")
+    iscsi_target_name=${iscsi_target_name%:}
 }
 
 ip_to_var() {
@@ -267,7 +405,7 @@ ip_to_var() {
         fi
     done
 
-    unset ip srv gw mask hostname dev autoconf macaddr mtu
+    unset ip srv gw mask hostname dev autoconf macaddr mtu dns1 dns2
     case $# in
         0)  autoconf="error" ;;
         1)  autoconf=$1 ;;
@@ -275,13 +413,27 @@ ip_to_var() {
         3)  [ -n "$1" ] && dev=$1; [ -n "$2" ] && autoconf=$2; [ -n "$3" ] && mtu=$3 ;;
         4)  [ -n "$1" ] && dev=$1; [ -n "$2" ] && autoconf=$2; [ -n "$3" ] && mtu=$3; [ -n "$4" ] && macaddr=$4 ;;
         *)  [ -n "$1" ] && ip=$1; [ -n "$2" ] && srv=$2; [ -n "$3" ] && gw=$3; [ -n "$4" ] && mask=$4;
-            [ -n "$5" ] && hostname=$5; [ -n "$6" ] && dev=$6; [ -n "$7" ] && autoconf=$7; [ -n "$8" ] && mtu=$8;
-            if [ -n "${9}" -a -n "${10}" -a -n "${11}" -a -n "${12}" -a -n "${13}" -a -n "${14}" ]; then
-                macaddr="${9}:${10}:${11}:${12}:${13}:${14}"
-            fi
-	    ;;
+            [ -n "$5" ] && hostname=$5; [ -n "$6" ] && dev=$6; [ -n "$7" ] && autoconf=$7;
+            case "$8" in
+                [0-9]*:*|[0-9]*.[0-9]*.[0-9]*.[0-9]*)
+                    dns1="$8"
+                    [ -n "$9" ] && dns2="$9"
+                    ;;
+                [0-9]*)
+                    mtu="$8"
+                    ;;
+                *)
+                    if [ -n "${9}" -a -n "${10}" -a -n "${11}" -a -n "${12}" -a -n "${13}" -a -n "${14}" ]; then
+                        macaddr="${9}:${10}:${11}:${12}:${13}:${14}"
+                    fi
+	            ;;
+            esac
+            ;;
     esac
-    # anaconda-style argument cluster
+
+    # ip=<ipv4-address> means anaconda-style static config argument cluster:
+    # ip=<ip> gateway=<gw> netmask=<nm> hostname=<host> mtu=<mtu>
+    # ksdevice={link|bootif|ibft|<MAC>|<ifname>}
     if strstr "$autoconf" "*.*.*.*"; then
         ip="$autoconf"
         gw=$(getarg gateway=)
@@ -290,13 +442,43 @@ ip_to_var() {
         dev=$(getarg ksdevice=)
         autoconf="none"
         mtu=$(getarg mtu=)
+
+        # handle special values for ksdevice
         case "$dev" in
-            # ignore fancy values for ksdevice=XXX
-            link|bootif|BOOTIF|ibft|*:*:*:*:*:*) dev="" ;;
+            bootif|BOOTIF) dev=$(fix_bootif $(getarg BOOTIF=)) ;;
+            link) dev="" ;; # FIXME: do something useful with this
+            ibft) dev="" ;; # ignore - ibft is handled elsewhere
         esac
     fi
 }
 
+route_to_var() {
+    local v=${1}:
+    local i
+    set --
+    while [ -n "$v" ]; do
+        if [ "${v#\[*:*:*\]:}" != "$v" ]; then
+            # handle IPv6 address
+            i="${v%%\]:*}"
+            i="${i##\[}"
+            set -- "$@" "$i"
+            v=${v#\[$i\]:}
+        else
+            set -- "$@" "${v%%:*}"
+            v=${v#*:}
+        fi
+    done
+
+    unset route_mask route_gw route_dev
+    case $# in
+        2)  [ -n "$1" ] && route_mask="$1"; [ -n "$2" ] && route_gw="$2"
+            return 0;;
+        3)  [ -n "$1" ] && route_mask="$1"; [ -n "$2" ] && route_gw="$2"; [ -n "$3" ] && route_dev="$3"
+            return 0;;
+        *)  return 1;;
+    esac
+}
+
 parse_ifname_opts() {
     local IFS=:
     set $1
@@ -327,7 +509,11 @@ parse_ifname_opts() {
 wait_for_if_link() {
     local cnt=0
     local li
-    while [ $cnt -lt 600 ]; do
+    local timeout="$(getargs rd.net.timeout.iflink=)"
+    timeout=${timeout:-60}
+    timeout=$(($timeout*10))
+
+    while [ $cnt -lt $timeout ]; do
         li=$(ip -o link show dev $1 2>/dev/null)
         [ -n "$li" ] && return 0
         sleep 0.1
@@ -339,9 +525,29 @@ wait_for_if_link() {
 wait_for_if_up() {
     local cnt=0
     local li
-    while [ $cnt -lt 200 ]; do
+    local timeout="$(getargs rd.net.timeout.ifup=)"
+    timeout=${timeout:-20}
+    timeout=$(($timeout*10))
+
+    while [ $cnt -lt $timeout ]; do
         li=$(ip -o link show up dev $1)
-        [ -n "$li" ] && return 0
+        if ! strstr "$li" "NO-CARRIER"; then
+            if [ -n "$li" ]; then
+                case "$li" in
+                    *\<UP*)
+                        return 0;;
+                    *\<*,UP\>*)
+                        return 0;;
+                    *\<*,UP,*\>*)
+                        return 0;;
+                esac
+            fi
+            if strstr "$li" "LOWER_UP" \
+                    && strstr "$li" "state UNKNOWN" \
+                    && ! strstr "$li" "DORMANT"; then
+                return 0
+            fi
+        fi
         sleep 0.1
         cnt=$(($cnt+1))
     done
@@ -350,7 +556,11 @@ wait_for_if_up() {
 
 wait_for_route_ok() {
     local cnt=0
-    while [ $cnt -lt 200 ]; do
+    local timeout="$(getargs rd.net.timeout.route=)"
+    timeout=${timeout:-20}
+    timeout=$(($timeout*10))
+
+    while [ $cnt -lt $timeout ]; do
         li=$(ip route show)
         [ -n "$li" ] && [ -z "${li##*$1*}" ] && return 0
         sleep 0.1
@@ -359,9 +569,163 @@ wait_for_route_ok() {
     return 1
 }
 
+wait_for_ipv6_dad() {
+    local cnt=0
+    local li
+    local timeout="$(getargs rd.net.timeout.ipv6dad=)"
+    timeout=${timeout:-50}
+    timeout=$(($timeout*10))
+
+    while [ $cnt -lt $timeout ]; do
+        li=$(ip -6 addr show dev $1 scope link)
+        strstr "$li" "tentative" || return 0
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+wait_for_ipv6_auto() {
+    local cnt=0
+    local li
+    local timeout="$(getargs rd.net.timeout.ipv6auto=)"
+    timeout=${timeout:-40}
+    timeout=$(($timeout*10))
+
+    while [ $cnt -lt $timeout ]; do
+        li=$(ip -6 addr show dev $1)
+        if ! strstr "$li" "tentative"; then
+            strstr "$li" "dynamic" && return 0
+        fi
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
 linkup() {
     wait_for_if_link $1 2>/dev/null\
      && ip link set $1 up 2>/dev/null\
      && wait_for_if_up $1 2>/dev/null
 }
 
+type hostname >/dev/null 2>&1 || \
+hostname() {
+	cat /proc/sys/kernel/hostname
+}
+
+iface_has_link() {
+    local cnt=0
+    local interface="$1" flags=""
+    [ -n "$interface" ] || return 2
+    interface="/sys/class/net/$interface"
+    [ -d "$interface" ] || return 2
+    local timeout="$(getargs rd.net.timeout.carrier=)"
+    timeout=${timeout:-5}
+    timeout=$(($timeout*10))
+
+    linkup "$1"
+    while [ $cnt -lt $timeout ]; do
+        [ "$(cat $interface/carrier)" = 1 ] && return 0
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+find_iface_with_link() {
+    local iface_path="" iface=""
+    for iface_path in /sys/class/net/*; do
+        iface=${iface_path##*/}
+        str_starts "$iface" "lo" && continue
+        if iface_has_link $iface; then
+            echo "$iface"
+            return 0
+        fi
+    done
+    return 1
+}
+
+is_persistent_ethernet_name() {
+    local _netif="$1"
+    local _name_assign_type="0"
+
+    [ -f "/sys/class/net/$_netif/name_assign_type" ] \
+        && _name_assign_type=$(cat "/sys/class/net/$_netif/name_assign_type")
+
+    # NET_NAME_ENUM 1
+    [ "$_name_assign_type" = "1" ] && return 1
+
+    # NET_NAME_PREDICTABLE 2
+    [ "$_name_assign_type" = "2" ] && return 0
+
+    case "$_netif" in
+        # udev persistent interface names
+        eno[0-9]|eno[0-9][0-9]|eno[0-9][0-9][0-9]*)
+            ;;
+        ens[0-9]|ens[0-9][0-9]|ens[0-9][0-9][0-9]*)
+            ;;
+        enp[0-9]s[0-9]*|enp[0-9][0-9]s[0-9]*|enp[0-9][0-9][0-9]*s[0-9]*)
+            ;;
+        enP*p[0-9]s[0-9]*|enP*p[0-9][0-9]s[0-9]*|enP*p[0-9][0-9][0-9]*s[0-9]*)
+            ;;
+        # biosdevname
+        em[0-9]|em[0-9][0-9]|em[0-9][0-9][0-9]*)
+            ;;
+        p[0-9]p[0-9]*|p[0-9][0-9]p[0-9]*|p[0-9][0-9][0-9]*p[0-9]*)
+            ;;
+        *)
+            return 1
+    esac
+    return 0
+}
+
+is_kernel_ethernet_name() {
+    local _netif="$1"
+    local _name_assign_type="1"
+
+    if [ -e "/sys/class/net/$_netif/name_assign_type" ]; then
+        _name_assign_type=$(cat "/sys/class/net/$_netif/name_assign_type")
+
+        case "$_name_assign_type" in
+            2|3|4)
+                # NET_NAME_PREDICTABLE 2
+                # NET_NAME_USER 3
+                # NET_NAME_RENAMED 4
+                return 1
+                ;;
+            1|*)
+                # NET_NAME_ENUM 1
+                return 0
+                ;;
+        esac
+    fi
+
+    # fallback to error prone manual name check
+    case "$_netif" in
+        eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*)
+            return 0
+            ;;
+        *)
+            return 1
+    esac
+
+}
+
+iface_get_subchannels() {
+    local _netif
+    local _subchannels
+
+    _netif="$1"
+
+    _subchannels=$({
+        for i in /sys/class/net/$_netif/device/cdev[0-9]*; do
+            [ -e $i ] || continue
+            channel=$(readlink -f $i)
+            printf -- "%s" "${channel##*/},"
+        done
+    })
+    [ -n "$_subchannels" ] || return 1
+
+    printf -- "%s" ${_subchannels%,}
+}

modules.d/40network/netroot.sh

@@ -14,19 +14,33 @@ command -v setup_net >/dev/null || . /lib/net-lib.sh
 # no sense in doing something if no (net)root info is available
 # or root is already there
 [ -d $NEWROOT/proc ] && exit 0
+
+if [ -z "$netroot" ]; then
+    netroot=$(getarg netroot=)
+fi
+
 [ -z "$netroot" ] && exit 1
 
 # Set or override primary interface
 netif=$1
 [ -e "/tmp/net.bootdev" ] && read netif < /tmp/net.bootdev
 
+case "$netif" in
+    ??:??:??:??:??:??)  # MAC address
+        for i in /sys/class/net/*/address; do
+            mac=$(cat $i)
+            if [ "$mac" = "$netif" ]; then
+                i=${i%/address}
+                netif=${i##*/}
+                break
+            fi
+        done
+esac
+
 # 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
-
+    if getarg "root=dhcp" || getarg "netroot=dhcp" || getarg "root=dhcp6" || getarg "netroot=dhcp6"; then
         # Load dhcp options
         [ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
 
@@ -38,10 +52,13 @@ if [ -z "$2" ]; then
             exit 1
         fi
 
+        rm -f -- $hookdir/initqueue/finished/dhcp.sh
+
         # Set netroot to new_root_path, so cmdline parsers don't call
         netroot=$new_root_path
 
         # FIXME!
+        unset rootok
         for f in $hookdir/cmdline/90*.sh; do
             [ -f "$f" ] && . "$f";
         done
@@ -66,9 +83,7 @@ source_hook netroot $netif
 
 # Run the handler; don't store the root, it may change from device to device
 # XXX other variables to export?
-if $handler $netif $netroot $NEWROOT; then
-    rm -f $hookdir/initqueue/finished/dhcp.sh
-    # Network rootfs mount successful - save interface info for ifcfg etc.
-    save_netinfo $netif
-fi
+[ -n "$handler" ] && "$handler" "$netif" "$netroot" "$NEWROOT"
+save_netinfo $netif
+
 exit 0

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

@@ -54,8 +54,8 @@ if getarg bond >/dev/null; then
     fi
     # Make it suitable for initscripts export
     bondoptions=$(str_replace "$bondoptions" ";" ",")
-    echo "bondname=$bondname" > /tmp/bond.info
-    echo "bondslaves=\"$bondslaves\"" >> /tmp/bond.info
-    echo "bondoptions=\"$bondoptions\"" >> /tmp/bond.info
+    echo "bondname=$bondname" > /tmp/bond.${bondname}.info
+    echo "bondslaves=\"$bondslaves\"" >> /tmp/bond.${bondname}.info
+    echo "bondoptions=\"$bondoptions\"" >> /tmp/bond.${bondname}.info
     return
 fi

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

@@ -3,9 +3,9 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 #
 # Format:
-#       bridge=<bridgename>:<ethnames>
+#       bridge=<bridgename>:<bridgeslaves>
 #
-#       <ethnames> is a comma-separated list of physical (ethernet) interfaces
+#       <bridgeslaves> is a comma-separated list of physical (ethernet) interfaces
 #       bridge without parameters assumes bridge=br0:eth0
 #
 
@@ -25,26 +25,20 @@ parsebridge() {
         v=${v#*:}
     done
 
-    unset bridgename ethnames
+    unset bridgename bridgeslaves
     case $# in
-        0)  bridgename=br0; ethnames=$iface ;;
+        0)  bridgename=br0; bridgeslaves=$iface ;;
         1)  die "bridge= requires two parameters" ;;
-        2)  bridgename=$1; ethnames=$(str_replace "$2" "," " ") ;;
+        2)  bridgename=$1; bridgeslaves=$(str_replace "$2" "," " ") ;;
         *)  die "bridge= requires two parameters" ;;
     esac
 }
 
-unset bridgename ethnames
+unset bridgename bridgeslaves
 
 iface=eth0
-if [ -e /tmp/bond.info ]; then
-    . /tmp/bond.info
-    if [ -n "$bondname" ] ; then
-        iface=$bondname
-    fi
-fi
 
-# Parse bridge for bridgename and ethnames
+# Parse bridge for bridgename and bridgeslaves
 if bridge="$(getarg bridge)"; then
     # Read bridge= parameters if they exist
     if [ -n "$bridge" ]; then
@@ -53,9 +47,9 @@ if bridge="$(getarg bridge)"; then
     # Simple default bridge
     if [ -z "$bridgename" ]; then
         bridgename=br0
-        ethnames=$iface
+        bridgeslaves=$iface
     fi
     echo "bridgename=$bridgename" > /tmp/bridge.info
-    echo "ethnames=\"$ethnames\"" >> /tmp/bridge.info
+    echo "bridgeslaves=\"$bridgeslaves\"" >> /tmp/bridge.info
     return
 fi

modules.d/40network/parse-ibft.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
+
+command -v getarg >/dev/null          || . /lib/dracut-lib.sh
+command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh
+
+if getargbool 0 rd.iscsi.ibft -d "ip=ibft"; then
+    modprobe -b -q iscsi_boot_sysfs 2>/dev/null
+    modprobe -b -q iscsi_ibft
+    ibft_to_cmdline
+fi

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

@@ -15,16 +15,8 @@
 #
 
 command -v getarg >/dev/null          || . /lib/dracut-lib.sh
-command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh
 
-# Don't mix BOOTIF=macaddr from pxelinux and ip= lines
-getarg ip= >/dev/null && getarg BOOTIF= >/dev/null && \
-    die "Mixing BOOTIF and ip= lines is dangerous"
-
-# No more parsing stuff, BOOTIF says everything
-[ -n "$(getarg BOOTIF)" ] && return
-
-if [ -n "$netroot" ] && [ -z "$(getarg ip=)" ] ; then
+if [ -n "$netroot" ] && [ -z "$(getarg ip=)" ] && [ -z "$(getarg BOOTIF=)" ]; then
     # No ip= argument(s) for netroot provided, defaulting to DHCP
     return;
 fi
@@ -33,6 +25,10 @@ fi
 if [ -z "$NEEDBOOTDEV" ] ; then
     count=0
     for p in $(getargs ip=); do
+        case "$p" in
+            ibft)
+                continue;;
+        esac
         count=$(( $count + 1 ))
     done
     [ $count -gt 1 ] && NEEDBOOTDEV=1
@@ -42,18 +38,23 @@ unset count
 # If needed, check if bootdev= contains anything usable
 BOOTDEV=$(getarg bootdev=)
 
-if [ -n "$NEEDBOOTDEV" ] ; then
-    [ -z "$BOOTDEV" ] && warn "Please supply bootdev argument for multiple ip= lines"
+if [ -n "$NEEDBOOTDEV" ] && getargbool 1 rd.neednet; then
+    #[ -z "$BOOTDEV" ] && warn "Please supply bootdev argument for multiple ip= lines"
+    echo "rd.neednet=1" > /etc/cmdline.d/dracut-neednet.conf
+    info "Multiple ip= arguments: assuming rd.neednet=1"
 fi
 
-# If ibft is requested, read ibft vals and write ip=XXX cmdline args
-[ "ibft" = "$(getarg ip=)" ] && ibft_to_cmdline
-
 # Check ip= lines
 # XXX Would be nice if we could errorcheck ip addresses here as well
 for p in $(getargs ip=); do
     ip_to_var $p
 
+    # make first device specified the BOOTDEV
+    if [ -z "$BOOTDEV" ] && [ -n "$dev" ]; then
+        BOOTDEV="$dev"
+        [ -n "$NEEDBOOTDEV" ] && info "Setting bootdev to '$BOOTDEV'"
+    fi
+
     # skip ibft since we did it above
     [ "$autoconf" = "ibft" ] && continue
 
@@ -67,24 +68,26 @@ for p in $(getargs ip=); do
     fi
 
     # Error checking for autoconf in combination with other values
-    case $autoconf in
-        error) die "Error parsing option 'ip=$p'";;
-        bootp|rarp|both) die "Sorry, ip=$autoconf is currenty unsupported";;
-        none|off)
-            [ -z "$ip" ] && \
-            die "For argument 'ip=$p'\nValue '$autoconf' without static configuration does not make sense"
-            [ -z "$mask" ] && \
-                die "Sorry, automatic calculation of netmask is not yet supported"
-            ;;
-        auto6);;
-        dhcp|dhcp6|on|any) \
-            [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
-            die "Sorry, 'ip=$p' does not make sense for multiple interface configurations"
-            [ -n "$ip" ] && \
-                die "For argument 'ip=$p'\nSorry, setting client-ip does not make sense for '$autoconf'"
-            ;;
-        *) die "For argument 'ip=$p'\nSorry, unknown value '$autoconf'";;
-    esac
+    for autoopt in $(str_replace "$autoconf" "," " "); do
+        case $autoopt in
+            error) die "Error parsing option 'ip=$p'";;
+            bootp|rarp|both) die "Sorry, ip=$autoopt is currenty unsupported";;
+            none|off)
+                [ -z "$ip" ] && \
+                    die "For argument 'ip=$p'\nValue '$autoopt' without static configuration does not make sense"
+                [ -z "$mask" ] && \
+                    die "Sorry, automatic calculation of netmask is not yet supported"
+                ;;
+            auto6);;
+            dhcp|dhcp6|on|any) \
+                [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
+                    die "Sorry, 'ip=$p' does not make sense for multiple interface configurations"
+                [ -n "$ip" ] && \
+                    die "For argument 'ip=$p'\nSorry, setting client-ip does not make sense for '$autoopt'"
+                ;;
+            *) die "For argument 'ip=$p'\nSorry, unknown value '$autoopt'";;
+        esac
+    done
 
     if [ -n "$dev" ] ; then
         # We don't like duplicate device configs
@@ -110,8 +113,24 @@ for p in $(getargs ip=); do
         die "Server-ip or dhcp for netboot needed, but current arguments say otherwise"
     fi
 
+    if str_starts "$dev" "enx" && [ ${#dev} -eq 15 ]; then
+        printf -- "ifname=%s:%s:%s:%s:%s:%s:%s\n" \
+               "$dev" \
+               "${dev:3:2}" \
+               "${dev:5:2}" \
+               "${dev:7:2}" \
+               "${dev:9:2}" \
+               "${dev:11:2}" \
+               "${dev:13:2}" >> /etc/cmdline.d/80-enx.conf
+    fi
 done
 
+# put BOOTIF in IFACES to make sure it comes up
+if getargbool 1 "rd.bootif" && BOOTIF="$(getarg BOOTIF=)"; then
+    BOOTDEV=$(fix_bootif $BOOTIF)
+    IFACES="$BOOTDEV $IFACES"
+fi
+
 # This ensures that BOOTDEV is always first in IFACES
 if [ -n "$BOOTDEV" ] && [ -n "$IFACES" ] ; then
     IFACES="${IFACES%$BOOTDEV*} ${IFACES#*$BOOTDEV}"
@@ -121,6 +140,3 @@ fi
 # Store BOOTDEV and IFACES for later use
 [ -n "$BOOTDEV" ] && echo $BOOTDEV > /tmp/net.bootdev
 [ -n "$IFACES" ]  && echo $IFACES > /tmp/net.ifaces
-
-# We need a ip= line for the configured bootdev=
-[ -n "$NEEDBOOTDEV" ] && [ -z "$BOOTDEVOK" ] && die "Bootdev Argument '$BOOTDEV' not found"

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

@@ -24,21 +24,31 @@ parseteam() {
 
     unset teammaster teamslaves
     case $# in
-    2)  teammaster=$1; teamslaves=$(str_replace "$2" "," " ") ;;
-    *)  die "team= requires two parameters" ;;
+        2)  teammaster=$1; teamslaves=$(str_replace "$2" "," " ") ;;
+        *)  warn "team= requires two parameters"; return 1;;
     esac
+    return 0
 }
 
 unset teammaster teamslaves
 
 if getarg team>/dev/null; then
     # Read team= parameters if they exist
-    team="$(getarg team=)"
-    if [ ! "$team" = "team" ]; then
-        parseteam "$(getarg team=)"
-    fi
+    for team in $(getargs team); do
+        [ "$team" = "team" ] && continue
 
-    echo "teammaster=$teammaster" > /tmp/team.info
-    echo "teamslaves=\"$teamslaves\"" >> /tmp/team.info
-    return
+        unset teammaster
+        unset teamslaves
+
+        parseteam "$team" || continue
+
+        echo "teammaster=$teammaster" > /tmp/team.${teammaster}.info
+        echo "teamslaves=\"$teamslaves\"" >> /tmp/team.${teammaster}.info
+
+        if ! [ -e /etc/teamd/${teammaster}.conf ]; then
+            warn "Team master $teammaster specified, but no /etc/teamd/$teammaster.conf present. Using activebackup."
+            mkdir -p /etc/teamd
+            printf -- "%s" '{"runner": {"name": "activebackup"}, "link_watch": {"name": "ethtool"}}' > "/etc/teamd/${teammaster}.conf"
+        fi
+    done
 fi

modules.d/45ifcfg/module-setup.sh

@@ -3,10 +3,12 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
+    [[ -d /etc/sysconfig/network-scripts ]] && return 0
     return 255
 }
 
 depends() {
+    echo "network"
     return 0
 }
 

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

@@ -3,20 +3,18 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 # NFS root might have reached here before /tmp/net.ifaces was written
+type is_persistent_ethernet_name >/dev/null 2>&1 || . /lib/net-lib.sh
+
 udevadm settle --timeout=30
-# Don't write anything if we don't know our bootdev
-[ -f /tmp/net.ifaces ] || return 1
-
-read IFACES < /tmp/net.ifaces
-
-if [ -e /tmp/bond.info ]; then
-    . /tmp/bond.info
-fi
 
 if [ -e /tmp/bridge.info ]; then
     . /tmp/bridge.info
 fi
 
+if [ -e /tmp/vlan.info ]; then
+    . /tmp/vlan.info
+fi
+
 mkdir -m 0755 -p /tmp/ifcfg/
 mkdir -m 0755 -p /tmp/ifcfg-leases/
 
@@ -59,9 +57,9 @@ print_s390() {
 
     SUBCHANNELS=${SUBCHANNELS%,}
     echo "SUBCHANNELS=\"${SUBCHANNELS}\""
-    CONFIG_LINE=$(get_config_line_by_subchannel $SUBCHANNELS)
 
-    [ $? -ne 0 -o -z "$CONFIG_LINE" ] && return
+    CONFIG_LINE=$(get_config_line_by_subchannel $SUBCHANNELS)
+    [ $? -ne 0 -o -z "$CONFIG_LINE" ] && return 0
 
     OLD_IFS=$IFS
     IFS=","
@@ -81,72 +79,148 @@ print_s390() {
     OPTIONS=${OPTIONS## }
     echo "NETTYPE=\"${NETTYPE}\""
     echo "OPTIONS=\"${OPTIONS}\""
+    return 0
 }
 
+hw_bind() {
+    local _netif="$1"
+    local _macaddr="$2"
 
-for netif in $IFACES ; do
+    [ -n "$_macaddr" ] \
+        && echo "MACADDR=\"$_macaddr\""
+
+    print_s390 "$_netif" \
+        && return 0
+
+    [ -n "$_macaddr" ] && return 0
+
+    is_persistent_ethernet_name "$_netif" && return 0
+
+    [ -f "/sys/class/net/$_netif/addr_assign_type" ] \
+        && [ "$(cat "/sys/class/net/$_netif/addr_assign_type")" != "0" ] \
+        && return 1
+
+    [ -f "/sys/class/net/$_netif/address" ] \
+        || return 1
+
+    echo "HWADDR=\"$(cat /sys/class/net/$_netif/address)\""
+}
+
+interface_bind() {
+    local _netif="$1"
+    local _macaddr="$2"
+
+    # see, if we can bind it to some hw parms
+    if hw_bind "$_netif" "$_macaddr"; then
+        # only print out DEVICE, if it's user assigned
+        is_kernel_ethernet_name "$_netif" && return 0
+    fi
+
+    echo "DEVICE=\"$_netif\""
+}
+
+for netup in /tmp/net.*.did-setup ; do
+    [ -f $netup ] || continue
+
+    netif=${netup%%.did-setup}
+    netif=${netif##*/net.}
+    strstr "$netif" ":*:*:*:*:" && continue
     [ -e /tmp/ifcfg/ifcfg-$netif ] && continue
-    # bridge?
     unset bridge
     unset bond
+    unset team
+    unset bondslaves
+    unset bondname
+    unset bondoptions
+    unset uuid
+    unset ip
+    unset gw
+    unset mtu
+    unset mask
+    unset macaddr
+    unset slave
+    unset ethname
+    unset vlan
+
+    [ -e /tmp/bond.${netif}.info ] && . /tmp/bond.${netif}.info
+    [ -e /tmp/team.${netif}.info ] && . /tmp/team.${netif}.info
+
     uuid=$(cat /proc/sys/kernel/random/uuid)
     if [ "$netif" = "$bridgename" ]; then
         bridge=yes
+    elif [ "$netif" = "$teammaster" ]; then
+        team=yes
     elif [ "$netif" = "$bondname" ]; then
     # $netif can't be bridge and bond at the same time
         bond=yes
     fi
-    cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
+    if [ "$netif" = "$vlanname" ]; then
+        vlan=yes
+    fi
+
+    # skip team interfaces for now, the host config must be in sync
+    [ "$netif" = "$teammaster" ] && continue
+
     {
         echo "# Generated by dracut initrd"
-        echo "DEVICE=$netif"
+        echo "NAME=\"$netif\""
+        [ -z "$vlan" ] && interface_bind "$netif" "$macaddr"
         echo "ONBOOT=yes"
         echo "NETBOOT=yes"
-        echo "UUID=$uuid"
-        [ -n "$mtu" ] && echo "MTU=$mtu"
-        if [ -f /tmp/net.$netif.lease ]; then
-            strstr "$ip" '*:*:*' &&
-            echo "IPV6INIT=yes"
-            echo "DHCPV6C=yes"
-            echo "BOOTPROTO=dhcp"
-            cp /tmp/net.$netif.lease /tmp/ifcfg-leases/dhclient-$uuid-$netif.lease
+        echo "UUID=\"$uuid\""
+        strstr "$(ip -6 addr show dev $netif)" 'inet6' && echo "IPV6INIT=yes"
+        if [ -f /tmp/dhclient.$netif.lease ]; then
+            [ -f /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
+            if [ -f /tmp/net.$netif.has_ibft_config ]; then
+                echo "BOOTPROTO=ibft"
+            else
+                echo "BOOTPROTO=dhcp"
+            fi
+            cp /tmp/dhclient.$netif.lease /tmp/ifcfg-leases/dhclient-$uuid-$netif.lease
         else
             # If we've booted with static ip= lines, the override file is there
             [ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override
             if strstr "$ip" '*:*:*'; then
                 echo "IPV6INIT=yes"
                 echo "IPV6_AUTOCONF=no"
-                echo "IPV6ADDR=$ip/$mask"
+                echo "IPV6ADDR=\"$ip/$mask\""
             else
-                echo "BOOTPROTO=none"
-                echo "IPADDR=$ip"
-                if strstr "$mask" "."; then
-                    echo "NETMASK=$mask"
+                if [ -f /tmp/net.$netif.has_ibft_config ]; then
+                    echo "BOOTPROTO=ibft"
                 else
-                    echo "PREFIX=$mask"
+                    echo "BOOTPROTO=none"
+                    echo "IPADDR=\"$ip\""
+                    if strstr "$mask" "."; then
+                        echo "NETMASK=\"$mask\""
+                    else
+                        echo "PREFIX=\"$mask\""
+                    fi
                 fi
             fi
             if strstr "$gw" '*:*:*'; then
-                echo "IPV6_DEFAULTGW=$gw"
+                echo "IPV6_DEFAULTGW=\"$gw\""
             elif [ -n "$gw" ]; then
-                echo "GATEWAY=$gw"
+                echo "GATEWAY=\"$gw\""
             fi
         fi
+        [ -n "$mtu" ] && echo "MTU=\"$mtu\""
     } > /tmp/ifcfg/ifcfg-$netif
 
     # bridge needs different things written to ifcfg
-    if [ -z "$bridge" ] && [ -z "$bond" ]; then
+    if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ] && [ -z "$team" ]; then
         # standard interface
         {
-            if [ -n "$macaddr" ]; then
-                echo "MACADDR=$macaddr"
-            else
-                echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\""
-            fi
-            print_s390 $netif
             echo "TYPE=Ethernet"
-            echo "NAME=\"Boot Disk\""
-            [ -n "$mtu" ] && echo "MTU=$mtu"
+            [ -n "$mtu" ] && echo "MTU=\"$mtu\""
+        } >> /tmp/ifcfg/ifcfg-$netif
+    fi
+
+    if [ -n "$vlan" ] ; then
+        {
+            echo "TYPE=Vlan"
+            echo "DEVICE=\"$netif\""
+            echo "VLAN=yes"
+            echo "PHYSDEV=\"$phydevice\""
         } >> /tmp/ifcfg/ifcfg-$netif
     fi
 
@@ -155,23 +229,25 @@ for netif in $IFACES ; do
         {
             # This variable is an indicator of a bond interface for initscripts
             echo "BONDING_OPTS=\"$bondoptions\""
-            echo "NAME=\"Boot Disk\""
+            echo "NAME=\"$netif\""
+            echo "TYPE=Bond"
         } >> /tmp/ifcfg/ifcfg-$netif
 
         for slave in $bondslaves ; do
-            # Set ONBOOT=no to prevent initscripts from trying to setup already bonded physical interface
             # write separate ifcfg file for the raw eth interface
-            {
+            (
                 echo "# Generated by dracut initrd"
-                echo "DEVICE=$slave"
+                echo "NAME=\"$slave\""
                 echo "TYPE=Ethernet"
-                echo "ONBOOT=no"
+                echo "ONBOOT=yes"
                 echo "NETBOOT=yes"
-                echo "HWADDR=$(cat /sys/class/net/$slave/address)"
                 echo "SLAVE=yes"
-                echo "MASTER=$netif"
-                echo "NAME=$slave"
-            } >> /tmp/ifcfg/ifcfg-$slave
+                echo "MASTER=\"$netif\""
+                echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\""
+                unset macaddr
+                [ -e /tmp/net.$slave.override ] && . /tmp/net.$slave.override
+                interface_bind "$slave" "$macaddr"
+            ) >> /tmp/ifcfg/ifcfg-$slave
         done
     fi
 
@@ -179,54 +255,33 @@ for netif in $IFACES ; do
         # bridge
         {
             echo "TYPE=Bridge"
-            echo "NAME=\"Boot Disk\""
+            echo "NAME=\"$netif\""
         } >> /tmp/ifcfg/ifcfg-$netif
-        if [ "$ethname" = "$bondname" ] ; then
-            {
-                # Set ONBOOT=no to prevent initscripts from trying to setup already bridged bond interface
-                echo "# Generated by dracut initrd"
-                echo "DEVICE=$bondname"
-                echo "ONBOOT=no"
-                echo "NETBOOT=yes"
-                # This variable is an indicator of a bond interface for initscripts
-                echo "BONDING_OPTS=\"$bondoptions\""
-                echo "BRIDGE=$netif"
-                echo "NAME=\"$bondname\""
-            } >> /tmp/ifcfg/ifcfg-$bondname
-            for slave in $bondslaves ; do
-                # write separate ifcfg file for the raw eth interface
-                # Set ONBOOT=no to prevent initscripts from trying to setup already bridged physical interface
-                {
-                    echo "# Generated by dracut initrd"
-                    echo "DEVICE=$slave"
-                    echo "TYPE=Ethernet"
-                    echo "ONBOOT=no"
-                    echo "NETBOOT=yes"
-                    echo "HWADDR=$(cat /sys/class/net/$slave/address)"
-                    echo "SLAVE=yes"
-                    echo "MASTER=$bondname"
-                    echo "NAME=$slave"
-                } >> /tmp/ifcfg/ifcfg-$slave
-            done
-        else
+        for slave in $bridgeslaves ; do
             # write separate ifcfg file for the raw eth interface
-            {
+            (
                 echo "# Generated by dracut initrd"
-                echo "DEVICE=$ethname"
+                echo "NAME=\"$slave\""
                 echo "TYPE=Ethernet"
-                echo "ONBOOT=no"
+                echo "ONBOOT=yes"
                 echo "NETBOOT=yes"
-                echo "HWADDR=$(cat /sys/class/net/$ethname/address)"
-                echo "BRIDGE=$netif"
-                echo "NAME=$ethname"
-            } >> /tmp/ifcfg/ifcfg-$ethname
-        fi
+                echo "BRIDGE=\"$bridgename\""
+                echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\""
+                unset macaddr
+                [ -e /tmp/net.$slave.override ] && . /tmp/net.$slave.override
+                interface_bind "$slave" "$macaddr"
+            ) >> /tmp/ifcfg/ifcfg-$slave
+        done
     fi
+
     i=1
     for ns in $(getargs nameserver); do
-        echo "DNS${i}=${ns}" >> /tmp/ifcfg/ifcfg-$netif
+        echo "DNS${i}=\"${ns}\"" >> /tmp/ifcfg/ifcfg-$netif
         i=$((i+1))
     done
+
+    [ -f /tmp/net.route6."$netif" ] && cp /tmp/net.route6."$netif" /tmp/ifcfg/route6-"$netif"
+    [ -f /tmp/net.route."$netif" ] && cp /tmp/net.route."$netif" /tmp/ifcfg/route-"$netif"
 done
 
 # Pass network opts

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

@@ -2,7 +2,7 @@
 # module-setup for url-lib
 
 check() {
-    command -v curl >/dev/null || return 1
+    require_binaries curl || return 1
     return 255
 }
 
@@ -12,19 +12,29 @@ depends() {
 }
 
 install() {
+    local _dir _crt _found _lib
     inst_simple "$moddir/url-lib.sh" "/lib/url-lib.sh"
-    dracut_install curl
+    inst_multiple curl
     # also install libs for curl https
     inst_libdir_file "libnsspem.so*"
     inst_libdir_file "libnsssysinit.so*"
     inst_libdir_file "libsoftokn3.so*"
     inst_libdir_file "libsqlite3.so*"
 
-    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
+    for _dir in $libdirs; do
+	[[ -d $_dir ]] || continue
+        for _lib in $_dir/libcurl.so.*; do
+	    [[ -e $_lib ]] || continue
+            _crt=$(grep -F --binary-files=text -z .crt $_lib)
+            [[ $_crt ]] || continue
+            [[ $_crt == /*/* ]] || continue
+            if ! inst_simple "$_crt"; then
+                dwarn "Couldn't install '$_crt' SSL CA cert bundle; HTTPS might not work."
+                continue
+            fi
+            _found=1
+        done
+    done
+    [[ $_found ]] || dwarn "Couldn't find SSL CA cert bundle; HTTPS won't work."
 }
 

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

@@ -23,7 +23,7 @@ fetch_url() {
     local handler="$(get_url_handler $url)"
     [ -n "$handler" ] || return 254
     [ -n "$url" ] || return 255
-    $handler "$url" "$outloc"
+    "$handler" "$url" "$outloc"
 }
 
 # get_url_handler URL
@@ -54,7 +54,7 @@ add_url_handler() {
 
 export CURL_HOME="/run/initramfs/url-lib"
 mkdir -p $CURL_HOME
-curl_args="--location --retry 3 --fail --show-error"
+curl_args="--globoff --location --retry 3 --fail --show-error"
 getargbool 0 rd.noverifyssl && curl_args="$curl_args --insecure"
 
 proxy=$(getarg proxy=)
@@ -64,7 +64,7 @@ curl_fetch_url() {
     local url="$1" outloc="$2"
     echo "$url" > /proc/self/fd/0
     if [ -n "$outloc" ]; then
-        curl --globoff $curl_args --output "$outloc" "$url" || return $?
+        curl $curl_args --output - -- "$url" > "$outloc" || return $?
     else
         local outdir="$(mkuniqdir /tmp curl_fetch_url)"
         ( cd "$outdir"; curl $curl_args --remote-name "$url" || return $? )
@@ -106,18 +106,18 @@ nfs_fetch_url() {
     local filepath="${path%/*}" filename="${path##*/}" mntdir=""
 
     # skip mount if server:/filepath is already mounted
-    mntdir=$(nfs_already_mounted $server $path)
+    mntdir=$(nfs_already_mounted "$server" "$path")
     if [ -z "$mntdir" ]; then
         local mntdir="$(mkuniqdir /run nfs_mnt)"
-        mount_nfs $nfs:$server:$filepath${options:+:$options} $mntdir
+        mount_nfs "$nfs:$server:$filepath${options:+:$options}" "$mntdir"
         # lazy unmount during pre-pivot hook
-        inst_hook --hook pre-pivot --name 99url-lib-umount-nfs umount -l $mntdir
+        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 $?
+        cp -f -- "$mntdir/$filename" "$outloc" || return $?
     fi
     [ -f "$outloc" ] || return 253
     if [ -z "$2" ]; then echo "$outloc" ; fi

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

@@ -48,13 +48,15 @@ installkernel() {
         return 0
     }
 
+    instmods amdkfd hyperv_fb
+
     for _modname in $(find_kernel_modules_by_path drivers/gpu/drm \
         | drm_module_filter) ; do
         # 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
+            | grep -qxf - /sys/bus/pci/devices/*/modalias 2>/dev/null; then
             hostonly='' instmods $_modname
             continue
         fi

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

@@ -71,7 +71,7 @@ install() {
     mv dev.old dev
     popd >/dev/null
 
-    dracut_install chvt
+    inst_multiple chvt
     inst /usr/share/splashutils/initrd.splash /lib/gensplash-lib.sh
     inst_hook pre-pivot 90 "${moddir}"/gensplash-newroot.sh
     inst_hook pre-trigger 10 "${moddir}"/gensplash-pretrigger.sh

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

@@ -4,7 +4,7 @@
 
 check() {
     [[ "$mount_needs" ]] && return 1
-    [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
+    require_binaries plymouthd plymouth
 }
 
 depends() {
@@ -17,12 +17,16 @@ install() {
         . "$moddir"/plymouth-populate-initrd.sh
     else
         PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
-            /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir
+            /usr/libexec/plymouth/plymouth-populate-initrd -t "$initdir"
     fi
 
-    inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
-    inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
     inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
-    dracut_install readlink
+
+    inst_multiple readlink
+
+    if ! dracut_module_included "systemd"; then
+        inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
+        inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
+    fi
 }
 

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

@@ -1,4 +1,4 @@
 #!/bin/sh
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-[ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+plymouth --hide-splash 2>/dev/null || :

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

@@ -2,6 +2,6 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-if [ -x /bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
-    /bin/plymouth --newroot=$NEWROOT
+if type plymouth >/dev/null 2>&1 && [ -z "$DRACUT_SYSTEMD" ]; then
+    plymouth --newroot=$NEWROOT
 fi

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

@@ -4,17 +4,16 @@
 PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
 PLYMOUTH_THEME=$(plymouth-set-default-theme)
 
-inst /sbin/plymouthd /bin/plymouthd
-dracut_install /bin/plymouth \
+inst_multiple plymouthd plymouth \
     "${PLYMOUTH_LOGO_FILE}" \
     /etc/system-release
 
 mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
 
 inst_libdir_file "plymouth/text.so" "plymouth/details.so"
-    
+
 if [[ $hostonly ]]; then
-    dracut_install \
+    inst_multiple \
         "/usr/share/plymouth/themes/details/details.plymouth" \
         "/usr/share/plymouth/themes/text/text.plymouth" \
 
@@ -36,7 +35,7 @@ else
         [[ -f "$x" ]] || continue
         THEME_DIR=$(dirname "$x")
         mkdir -m 0755 -p "${initdir}/$THEME_DIR"
-        dracut_install "$x"
+        inst_multiple "$x"
     done
     (
         cd ${initdir}/usr/share/plymouth/themes;

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 [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
+if type plymouthd >/dev/null 2>&1 && [ -z "$DRACUT_SYSTEMD" ]; then
     if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
         # first trigger graphics subsystem
         udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
@@ -16,8 +16,8 @@ if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
         read consoledev rest < /sys/class/tty/console/active
         consoledev=${consoledev:-tty0}
         [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
-        [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
-        /bin/plymouth --show-splash 2>&1 | vinfo
+        plymouthd --attach-to-session --pid-file /run/plymouth/pid
+        plymouth --show-splash 2>&1 | vinfo
         # reset tty after plymouth messed with it
         [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
     fi

modules.d/80cms/cms-write-ifcfg.sh

@@ -9,6 +9,7 @@ mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
 function cms_write_config()
 {
     . /tmp/cms.conf
+    SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')"
     OLDIFS=$IFS
     IFS=,
     read -a subch_array <<< "indexzero,$SUBCHANNELS"

modules.d/80cms/cmsifup.sh

@@ -27,15 +27,14 @@ else
 fi
 
 {
-    echo "ip=$IPADDR::$GATEWAY:$NETMASK:$HOSTNAME:$DEVICE:none:$MACADDR"
+    echo "ip=$IPADDR::$GATEWAY:$NETMASK:$HOSTNAME:$DEVICE:none:$MTU:$MACADDR"
     for i in $DNS1 $DNS2; do
 	echo "nameserver=$i"
     done
 } > /etc/cmdline.d/80-cms.conf
-unset CMDLINE
 
 [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
 IFACES="$IFACES $DEVICE"
 echo "$IFACES" >> /tmp/net.ifaces
 
-ifup $DEVICE -m
+exec ifup "$DEVICE"

modules.d/80cms/cmssetup.sh

@@ -44,7 +44,7 @@ function dasd_settle() {
 }
 
 function dasd_settle_all() {
-    for dasdccw in $(while read line; do echo ${line%%(*}; done < /proc/dasd/devices) ; do
+    for dasdccw in $(while read line; do echo "${line%%(*}"; done < /proc/dasd/devices) ; do
         if ! dasd_settle $dasdccw ; then
             echo $"Could not access DASD $dasdccw in time"
             return 1
@@ -86,12 +86,12 @@ function readcmsfile() # $1=dasdport $2=filename
     #               dasd_mod must be loaded without setting any DASD online
     dev=$(canonicalize_devno $1)
     numcpus=$(
-	while read line; do
-	    if strstr "$line" "# processors"; then
-		echo ${line##*:};
-		break;
-	    fi;
-	done < /proc/cpuinfo
+        while read line; do
+            if strstr "$line" "# processors"; then
+                echo ${line##*:};
+                break;
+            fi;
+        done < /proc/cpuinfo
     )
 
     if [ ${numcpus} -eq 1 ]; then
@@ -115,7 +115,7 @@ function readcmsfile() # $1=dasdport $2=filename
 
     [[ -d /mnt ]] || mkdir /mnt
     if cmsfs-fuse --to=UTF-8 -a /dev/$devname /mnt; then
-	cat /mnt/$2 > /run/initramfs/$2
+        cat /mnt/$2 > /run/initramfs/$2
         umount /mnt || umount -l /mnt
         udevadm settle
     else
@@ -144,46 +144,59 @@ function readcmsfile() # $1=dasdport $2=filename
 processcmsfile()
 {
     source /tmp/cms.conf
+    SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')"
 
     if [[ $NETTYPE ]]; then
-	(
-	    echo -n $NETTYPE,$SUBCHANNELS
-	    [[ $PORTNAME ]] && echo ",portname=$PORTNAME"
-	    [[ $LAYER2 ]] && echo ",layer2=$LAYER"
-	    [[ "$NETTYPE" = "ctc" ]] && [[ $CTCPROT ]] && echo ",protocol=$CTCPROT"
-	    echo
-	) >> /etc/ccw.conf
+        (
+            echo -n $NETTYPE,$SUBCHANNELS
+            [[ $PORTNAME ]] && echo -n ",portname=$PORTNAME"
+            [[ $LAYER2 ]] && echo -n ",layer2=$LAYER2"
+            [[ "$NETTYPE" = "ctc" ]] && [[ $CTCPROT ]] && echo -n ",protocol=$CTCPROT"
+            echo
+        ) >> /etc/ccw.conf
 
-	OLDIFS=$IFS
-	IFS=,
-	read -a subch_array <<< "indexzero,$SUBCHANNELS"
-	IFS=$OLDIFS
-	devbusid=${subch_array[1]}
+        OLDIFS=$IFS
+        IFS=,
+        read -a subch_array <<< "indexzero,$SUBCHANNELS"
+        IFS=$OLDIFS
+        devbusid=${subch_array[1]}
         if [ "$NETTYPE" = "ctc" ]; then
             driver="ctcm"
         else
             driver=$NETTYPE
         fi
 
-	printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="%s", KERNELS=="%s", ENV{INTERFACE}=="?*", RUN+="/sbin/initqueue --onetime --unique --name cmsifup-$env{INTERFACE} /sbin/cmsifup $env{INTERFACE}"\n' "$driver" "$devbusid" > /etc/udev/rules.d/99-cms.rules
+        printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="%s", KERNELS=="%s", ENV{INTERFACE}=="?*", RUN+="/sbin/initqueue --onetime --unique --name cmsifup-$env{INTERFACE} /sbin/cmsifup $env{INTERFACE}"\n' "$driver" "$devbusid" > /etc/udev/rules.d/99-cms.rules
         # remove the default net rules
-        rm -f /etc/udev/rules.d/91-default-net.rules
-	[[ -f /etc/udev/rules.d/90-net.rules ]] \
-	    || printf 'SUBSYSTEM=="net", ACTION=="online", RUN+="/sbin/initqueue --onetime --env netif=$env{INTERFACE} source_hook initqueue/online"\n' >> /etc/udev/rules.d/99-cms.rules
-
-	znet_cio_free
+        rm -f -- /etc/udev/rules.d/91-default-net.rules
+        [[ -f /etc/udev/rules.d/90-net.rules ]] \
+            || printf 'SUBSYSTEM=="net", ACTION=="online", RUN+="/sbin/initqueue --onetime --env netif=$env{INTERFACE} source_hook initqueue/online"\n' >> /etc/udev/rules.d/99-cms.rules
+        udevadm control --reload
+        znet_cio_free
     fi
 
-    if [[ $DASD ]]; then
-	echo $DASD | normalize_dasd_arg > /etc/dasd.conf
-	echo "options dasd_mod dasd=$DASD" > /etc/modprobe.d/dasd_mod.conf
-	dasd_cio_free
+    if [[ $DASD ]] && [[ $DASD != "none" ]]; then
+        echo $DASD | normalize_dasd_arg > /etc/dasd.conf
+        echo "options dasd_mod dasd=$DASD" > /etc/modprobe.d/dasd_mod.conf
+        dasd_cio_free
     fi
 
     unset _do_zfcp
     for i in ${!FCP_*}; do
-	echo "${!i}" >> /etc/zfcp.conf
-	_do_zfcp=1
+        echo "${!i}" | while read port rest; do
+            case $port in
+                *.*.*)
+                    ;;
+                *.*)
+                    port="0.$port"
+                    ;;
+                *)
+                    port="0.0.$port"
+                    ;;
+            esac
+            echo $port $rest >> /etc/zfcp.conf
+        done
+        _do_zfcp=1
     done
     [[ $_do_zfcp ]] && zfcp_cio_free
     unset _do_zfcp

modules.d/80cms/module-setup.sh

@@ -23,7 +23,7 @@ install() {
     inst_hook pre-trigger 30 "$moddir/cmssetup.sh"
     inst_hook pre-pivot 95 "$moddir/cms-write-ifcfg.sh"
     inst_script "$moddir/cmsifup.sh" /sbin/cmsifup
-    dracut_install /etc/cmsfs-fuse/filetypes.conf /etc/udev/rules.d/99-fuse.rules /etc/fuse.conf \
+    inst_multiple /etc/cmsfs-fuse/filetypes.conf /etc/udev/rules.d/99-fuse.rules /etc/fuse.conf \
         cmsfs-fuse fusermount ulockmgr_server bash insmod rmmod cat normalize_dasd_arg sed \
         $(rpm -ql s390utils-base)
 

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

@@ -0,0 +1,33 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    if ! blkid -k | { while read line; do [[ $line == bcache ]] && exit 0; done; exit 1; } \
+        && ! type -P probe-bcache >/dev/null; then
+        return 1
+    fi
+
+    [[ $hostonly ]] || [[ $mount_needs ]] && {
+        for fs in "${host_fs_types[@]}"; do
+            [[ $fs = "bcache" ]] && return 0
+        done
+        return 255
+    }
+
+    return 0
+}
+
+depends() {
+    return 0
+}
+
+installkernel() {
+    instmods bcache
+}
+
+install() {
+    blkid -k | { while read line; do [[ $line == bcache ]] && exit 0; done; exit 1; } || inst_multiple -o probe-bcache
+    inst_multiple -o ${udevdir}/bcache-register
+    inst_rules 61-bcache.rules 69-bcache.rules
+}

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

@@ -6,15 +6,13 @@ 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
+    require_binaries btrfs || return 1
 
     [[ $hostonly ]] || [[ $mount_needs ]] && {
-        local _found
         for fs in ${host_fs_types[@]}; do
-            strstr "$fs" "\|btrfs" && _found="1"
+            [[ "$fs" == "btrfs" ]] && return 0
         done
-        [[ $_found ]] || return 1
-        unset _found
+        return 255
     }
 
     return 0
@@ -41,11 +39,10 @@ install() {
     fi
 
     if ! dracut_module_included "systemd"; then
-        inst_script "$moddir/btrfs_timeout.sh" \
-            /usr/lib/dracut/hooks/initqueue/timeout/btrfs_timeout.sh
+        inst_hook initqueue/timeout 10 "$moddir/btrfs_timeout.sh"
     fi
 
-    dracut_install btrfsck
+    inst_multiple -o btrfsck btrfs-zero-log
     inst $(command -v btrfs) /sbin/btrfs
 }
 

modules.d/90crypt/crypt-cleanup.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
 # close everything which is not busy
-rm -f /etc/udev/rules.d/70-luks.rules >/dev/null 2>&1
+rm -f -- /etc/udev/rules.d/70-luks.rules >/dev/null 2>&1
 
 if ! getarg rd.luks.uuid -d rd_LUKS_UUID >/dev/null 2>&1 && getargbool 1 rd.luks -d -n rd_NO_LUKS >/dev/null 2>&1; then
     while true; do

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

@@ -4,6 +4,19 @@
 
 command -v getarg >/dev/null || . /lib/dracut-lib.sh
 
+# check if the crypttab contains an entry for a LUKS UUID
+crypttab_contains() {
+    local luks="$1"
+    local l d rest
+    if [ -f /etc/crypttab ]; then
+        while read l d rest; do
+            strstr "${l##luks-}" "${luks##luks-}" && return 0
+            strstr "$d" "${luks##luks-}" && return 0
+        done < /etc/crypttab
+    fi
+    return 1
+}
+
 # ask_for_password
 #
 # Wraps around plymouth ask-for-password and adds fallback to tty password ask
@@ -47,8 +60,8 @@ ask_for_password() {
 
     { 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 \
+        if type plymouth >/dev/null 2>&1 && plymouth --ping 2>/dev/null; then
+            plymouth ask-for-password \
                 --prompt "$ply_prompt" --number-of-tries=$ply_tries \
                 --command="$ply_cmd"
             ret=$?

modules.d/90crypt/crypt-run-generator.sh

@@ -3,15 +3,12 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 . /lib/dracut-lib.sh
+type crypttab_contains >/dev/null 2>&1 || . /lib/dracut-crypt-lib.sh
 
 dev=$1
 luks=$2
 
-if [ -f /etc/crypttab ]; then
-    while read l rest; do
-        strstr "${l##luks-}" "${luks##luks-}" && exit 0
-    done < /etc/crypttab
-fi
+crypttab_contains "$luks" && exit 0
 
 allowdiscards="-"
 

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

@@ -5,27 +5,13 @@
 check() {
     local _rootdev
     # if cryptsetup is not installed, then we cannot support encrypted devices.
-    type -P cryptsetup >/dev/null || 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
-    }
+    require_binaries cryptsetup || return 1
 
     [[ $hostonly ]] || [[ $mount_needs ]] && {
-        for_each_host_dev_and_slaves_all check_crypt || return 1
+        for fs in "${host_fs_types[@]}"; do
+            [[ $fs = "crypto_LUKS" ]] && return 0
+        done
+        return 255
     }
 
     return 0
@@ -38,10 +24,35 @@ depends() {
 
 installkernel() {
     instmods dm_crypt =crypto
+    hostonly="" instmods drbg
+}
+
+cmdline() {
+    local dev UUID
+    for dev in "${!host_fs_types[@]}"; do
+        [[ "${host_fs_types[$dev]}" != "crypto_LUKS" ]] && continue
+
+        UUID=$(
+            blkid -u crypto -o export $dev \
+                | while read line; do
+                [[ ${line#UUID} = $line ]] && continue
+                printf "%s" "${line#UUID=}"
+                break
+            done
+        )
+        [[ ${UUID} ]] || continue
+        printf "%s" " rd.luks.uuid=luks-${UUID}"
+    done
 }
 
 install() {
-    dracut_install cryptsetup rmdir readlink umount
+
+    if [[ $hostonly_cmdline == "yes" ]]; then
+        cmdline >> "${initdir}/etc/cmdline.d/90crypt.conf"
+        echo >> "${initdir}/etc/cmdline.d/90crypt.conf"
+    fi
+
+    inst_multiple cryptsetup rmdir readlink umount
     inst_script "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
     inst_script "$moddir"/probe-keydev.sh /sbin/probe-keydev
     inst_hook cmdline 10 "$moddir/parse-keydev.sh"
@@ -49,11 +60,29 @@ install() {
     if ! dracut_module_included "systemd"; then
         inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
     fi
-    [[ $hostonly ]]  && inst_simple /etc/crypttab
+
+    if [[ $hostonly ]] && [[ -f /etc/crypttab ]]; then
+        # filter /etc/crypttab for the devices we need
+        while read _mapper _dev _rest || [ -n "$_mapper" ]; do
+            [[ $_mapper = \#* ]] && continue
+            [[ $_dev ]] || continue
+
+            [[ $_dev == UUID=* ]] && \
+                _dev="/dev/disk/by-uuid/${_dev#UUID=}"
+
+            for _hdev in "${!host_fs_types[@]}"; do
+                [[ ${host_fs_types[$_hdev]} == "crypto_LUKS" ]] || continue
+                if [[ $_hdev -ef $_dev ]] || [[ /dev/block/$_hdev -ef $_dev ]]; then
+                    echo "$_mapper $_dev $_rest"
+                    break
+                fi
+            done
+        done < /etc/crypttab > $initdir/etc/crypttab
+    fi
+
     inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
 
-    dracut_install -o \
-        $systemdutildir/system-generators/systemd-cryptsetup-generator \
+    inst_multiple -o \
         $systemdutildir/system-generators/systemd-cryptsetup-generator \
         $systemdutildir/systemd-cryptsetup \
         $systemdsystemunitdir/systemd-ask-password-console.path \

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

@@ -2,9 +2,11 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
+type crypttab_contains >/dev/null 2>&1 || . /lib/dracut-crypt-lib.sh
+
 if ! getargbool 1 rd.luks -d -n rd_NO_LUKS; then
     info "rd.luks=0: removing cryptoluks activation"
-    rm -f /etc/udev/rules.d/70-luks.rules
+    rm -f -- /etc/udev/rules.d/70-luks.rules
 else
     {
         echo 'SUBSYSTEM!="block", GOTO="luks_end"'
@@ -23,10 +25,20 @@ else
                 {
                     printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
                     printf -- 'ENV{ID_FS_UUID}=="*%s*", ' $luksid
-                    printf -- 'RUN+="%s --unique --onetime ' $(command -v initqueue)
+                    printf -- 'RUN+="%s --settled --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
+            else
+                if ! crypttab_contains "$luksid"; then
+                    {
+                        printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
+                        printf -- 'ENV{ID_FS_UUID}=="*%s*", ' $luksid
+                        printf -- 'RUN+="%s --settled --unique --onetime ' $(command -v initqueue)
+                        printf -- '--name systemd-cryptsetup-%%k %s start ' $(command -v systemctl)
+                        printf -- 'systemd-cryptsetup@luks$$(dev_unit_name -$env{ID_FS_UUID}).service"\n'
+                    } >> /etc/udev/rules.d/70-luks.rules.new
+                fi
             fi
 
             uuid=$luksid
@@ -43,13 +55,13 @@ else
         if [ -z "$DRACUT_SYSTEMD" ]; then
             {
                 printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' $(command -v initqueue)
-                printf -- '--unique --onetime --name cryptroot-ask-%%k '
+                printf -- '--unique --settled --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
         else
             {
                 printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' $(command -v initqueue)
-                printf -- '--unique --onetime --name crypt-run-generator-%%k '
+                printf -- '--unique --settled --onetime --name crypt-run-generator-%%k '
                 printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID}"\n' $(command -v crypt-run-generator)
             } >> /etc/udev/rules.d/70-luks.rules.new
         fi

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

@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
-    type -P dmsetup >/dev/null || return 1
+    require_binaries dmsetup || return 1
     return 255
 }
 
@@ -13,15 +13,15 @@ depends() {
 
 installkernel() {
     instmods =drivers/md
-    instmods dm_mod
+    instmods dm_mod dm-cache dm-cache-mq dm-cache-cleaner
 }
 
 install() {
     modinfo -k $kernel dm_mod >/dev/null 2>&1 && \
         inst_hook pre-udev 30 "$moddir/dm-pre-udev.sh"
 
-    dracut_install dmsetup
-    dracut_install -o dmeventd
+    inst_multiple dmsetup
+    inst_multiple -o dmeventd
 
     inst_libdir_file "libdevmapper-event.so*"
 
@@ -29,6 +29,8 @@ install() {
     # 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
+    # debian udev rules
+    inst_rules 60-persistent-storage-dm.rules 55-dm.rules
 
     inst_rules "$moddir/11-dm.rules"
 

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

@@ -24,6 +24,6 @@ PROGRAM=="/bin/sh -c 'for i in $sys/$devpath/holders/dm-[0-9]*; do [ -e $$i ] &&
 ENV{DEVTYPE}!="partition", \
     RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
 
-RUN+="/sbin/initqueue --onetime --unique --settled /sbin/dmraid_scan"
+RUN+="/sbin/initqueue --onetime --unique --settled /sbin/dmraid_scan $env{DEVNAME}"
 
 LABEL="dm_end"

modules.d/90dmraid/dmraid.sh

@@ -4,6 +4,13 @@
 
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
+dev="$1"
+devenc=$(str_replace "$1" '/' '\2f')
+
+[ -e /tmp/dmraid.$devenc ] && exit 0
+
+>/tmp/dmraid.$devenc
+
 DM_RAIDS=$(getargs rd.dm.uuid -d rd_DM_UUID=)
 
 if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then
@@ -28,7 +35,7 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then
                 if [ "${s##$r}" != "$s" ]; then
                     info "Activating $s"
                     dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
-                    [ -e "/dev/mapper/$s" ] && kpartx -a -p p "/dev/mapper/$s" 2>&1 | vinfo
+                    [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo
                     udevsettle
                 fi
             done
@@ -38,7 +45,7 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then
         for s in $SETS; do
             info "Activating $s"
             dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
-            [ -e "/dev/mapper/$s" ] && kpartx -a -p p "/dev/mapper/$s" 2>&1 | vinfo
+            [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo
         done
     fi
 

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

@@ -6,39 +6,22 @@ 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
-
-    check_dmraid() {
-        local dev=$1 fs=$2 holder DEVPATH DM_NAME
-        [[ "$fs" = "${fs%%_raid_member}" ]] && 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
-    }
+    require_binaries dmraid || return 1
 
     [[ $hostonly ]] || [[ $mount_needs ]] && {
-        for_each_host_dev_and_slaves_all check_dmraid || return 1
+        for dev in "${!host_fs_types[@]}"; do
+            [[ "${host_fs_types[$dev]}" != *_raid_member ]] && continue
+
+            DEVPATH=$(get_devpath_block "$dev")
+
+            for holder in "$DEVPATH"/holders/*; do
+                [[ -e "$holder" ]] || continue
+                [[ -e "$holder/dm" ]] && return 0
+                break
+            done
+
+        done
+        return 255
     }
 
     return 0
@@ -49,10 +32,42 @@ depends() {
     return 0
 }
 
+cmdline() {
+    local _activated
+    declare -A _activated
+
+    for dev in "${!host_fs_types[@]}"; do
+        local holder DEVPATH DM_NAME majmin
+        [[ "${host_fs_types[$dev]}" != *_raid_member ]] && continue
+
+        DEVPATH=$(get_devpath_block "$dev")
+
+        for holder in "$DEVPATH"/holders/*; do
+            [[ -e "$holder" ]] || continue
+            dev="/dev/${holder##*/}"
+            DM_NAME="$(dmsetup info -c --noheadings -o name "$dev" 2>/dev/null)"
+            [[ ${DM_NAME} ]] && break
+        done
+
+        [[ ${DM_NAME} ]] || continue
+
+        if ! [[ ${_activated[${DM_NAME}]} ]]; then
+            printf "%s" " rd.dm.uuid=${DM_NAME}"
+            _activated["${DM_NAME}"]=1
+        fi
+    done
+}
+
 install() {
     local _i
-    dracut_install dmraid
-    dracut_install -o kpartx
+
+    if [[ $hostonly_cmdline == "yes" ]]; then
+        cmdline >> "${initdir}/etc/cmdline.d/90dmraid.conf"
+        echo >> "${initdir}/etc/cmdline.d/90dmraid.conf"
+    fi
+
+    inst_multiple dmraid
+    inst_multiple -o kpartx
     inst $(command -v partx) /sbin/partx
 
     inst "$moddir/dmraid.sh" /sbin/dmraid_scan