prepare 034 release

default_kernel_images and -i/-k paths are new (SuSE) code paths and
would have resulted in usage errors before.

There we want to build host only images for faster building and
smaller images.
Also force creation (overriding) of initrd images in these code paths.

Signed-off-by: Thomas Renninger <trenn@suse.de>

50-dracut.install

@@ -22,7 +22,7 @@ done
 ret=0
 case "$1" in
     add)
-	dracut ${noimageifnotneeded+--noimageifnotneeded} "$3"/initrd "$2"
+	dracut ${noimageifnotneeded:+--noimageifnotneeded} "$3"/initrd "$2"
         ret=$?
 	;;
     remove)

51-dracut-rescue.install

@@ -6,6 +6,9 @@ export LANG=C
 
 COMMAND="$1"
 KERNEL_VERSION="$2"
+BOOT_DIR_ABS="${3%/*}/0-rescue"
+KERNEL_IMAGE="$4"
+
 
 dropindirs_sort()
 {
@@ -50,7 +53,6 @@ fi
 
 LOADER_ENTRY="/boot/loader/entries/${MACHINE_ID}-0-rescue.conf"
 BOOT_DIR="/${MACHINE_ID}/0-rescue"
-BOOT_DIR_ABS="/boot${BOOT_DIR}"
 
 ret=0
 

AUTHORS

@@ -5,8 +5,8 @@ Will Woods <wwoods@redhat.com>
 Philippe Seewer <philippe.seewer@bfh.ch>
 Warren Togami <wtogami@redhat.com>
 Jeremy Katz <katzj@redhat.com>
-David Dillow <dave@thedillows.org>
 Dave Young <dyoung@redhat.com>
+David Dillow <dave@thedillows.org>
 Michal Soltys <soltys@ziu.info>
 Amerigo Wang <amwang@redhat.com>
 Colin Guthrie <colin@mageia.org>
@@ -14,24 +14,27 @@ Andrey Borzenkov <arvidjaar@gmail.com>
 Peter Jones <pjones@redhat.com>
 Andreas Thienemann <andreas@bawue.net>
 Hans de Goede <hdegoede@redhat.com>
+WANG Chao <chaowang@redhat.com>
 John Reiser <jreiser@bitwagon.com>
 Luca Berra <bluca@vodka.it>
+Thomas Renninger <trenn@suse.de>
 Daniel Drake <dsd@laptop.org>
 Dan Horák <dhorak@redhat.com>
-WANG Chao <chaowang@redhat.com>
-Leho Kraav <leho@kraav.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>
+Colin Walters <walters@verbum.org>
 Frederic Crozat <fcrozat@suse.com>
 Jesse Keating <jkeating@redhat.com>
 Milan Broz <mbroz@redhat.com>
+Peter Rajnoha <prajnoha@redhat.com>
+Radek Vykydal <rvykydal@redhat.com>
 Roberto Sassu <roberto.sassu@polito.it>
 Anton Blanchard <anton@samba.org>
 Bill Nottingham <notting@redhat.com>
-Colin Walters <walters@verbum.org>
 David Cantrell <dcantrell@redhat.com>
 Dennis Gilmore <dennis@ausil.us>
 Jon Ander Hernandez <jonan.h@gmail.com>
@@ -39,14 +42,14 @@ 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>
-Radek Vykydal <rvykydal@redhat.com>
 Wim Muskee <wimmuskee@gmail.com>
 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
 Alan Pevec <apevec@redhat.com>
+Alexander Tsoy <alexander@tsoy.me>
 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>
@@ -64,6 +67,7 @@ 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>
@@ -71,7 +75,6 @@ Duane Griffin <duaneg@dghda.com>
 Glen Gray <slaine@slaine.org>
 Hermann Gausterer <git-dracut-2012@mrq1.org>
 James Laska <jlaska@redhat.com>
-James Lee <jlee@thestaticvoid.com>
 Jan Stodola <jstodola@redhat.com>
 Jiri Pirko <jiri@resnulli.us>
 Joe Lawrence <Joe.Lawrence@stratus.com>

Makefile

@@ -76,11 +76,11 @@ endif
 %.xml: %.asc
 	asciidoc -d manpage -b docbook -o $@ $<
 
-dracut.html: dracut.asc $(manpages)
+dracut.html: dracut.asc $(manpages) dracut.css
 	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 -f -- dracut.xml
 
@@ -158,7 +158,7 @@ clean:
 
 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)
@@ -168,7 +168,7 @@ dracut-$(VERSION).tar.bz2: doc
 	bzip2 -9 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; \
@@ -204,7 +204,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,98 @@
+dracut-034
+==========
+- do not run dhcp on parts of assembled network interfaces (bond, bridge)
+- add option to turn on/off prelinking
+    --prelink, --noprelink
+    do_prelink=[yes|no]
+- add ACPI table overriding
+- do not log to syslog/kmsg/journal for UID != 0
+- lvm/mdraid: Fix LVM on MD activation
+- bcache module removed (now in bcache-tools upstream)
+- mdadm: also install configs from /etc/mdadm.conf.d
+- fixes for mdadm-3.2.6+
+- mkinitrd: better compat support for SUSE
+- fcoe: add FCoE UEFI boot device support
+- rootfs-block: add support for the rootfallback= kernel cmdline option
+
+Contributions from:
+Thomas Renninger
+Alexander Tsoy
+Peter Rajnoha
+WANG Chao
+Harald Hoyer
+
+
+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
+
+Contributions from:
+WANG Chao
+Colin Walters
+Harald Hoyer
+
+
+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,

dracut-bash-completion.sh

@@ -34,13 +34,13 @@ _dracut() {
                               --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'
+                              --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'
+                              --kernel-cmdline --sshkey --persistent-policy'
         )
 
         if __contains_word "$prev" ${OPTS[ARG]}; then
@@ -56,6 +56,9 @@ _dracut() {
                         -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]*)
                         ;;

dracut-logger.sh

@@ -140,8 +140,16 @@ dlog_init() {
         fi
     fi
 
+    if (( $UID  != 0 )); then
+        kmsgloglvl=0
+        sysloglvl=0
+    fi
+
     if (( $sysloglvl > 0 )); then
-        if [[ -d /run/systemd/journal ]] && type -P systemd-cat &>/dev/null && (( $UID  == 0 )) ; 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"
@@ -150,6 +158,7 @@ dlog_init() {
             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"
@@ -173,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
@@ -323,7 +332,7 @@ _do_dlog() {
         if [[ "$_dlogfd" ]]; then
             echo "<$(_dlvl2syslvl $lvl)>$msg" >&$_dlogfd
         else
-            logger -t "dracut[$$]" -p $(_lvl2syspri $lvl) "$msg"
+            logger -t "dracut[$$]" -p $(_lvl2syspri $lvl) -- "$msg"
         fi
     fi
 

dracut.8.asc

@@ -225,6 +225,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 +269,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)
 
@@ -322,6 +337,11 @@ provide a valid _/etc/fstab_.
 **-N, --no-hostonly**::
     Disable Host-Only mode
 
+**--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_.
 

dracut.asc

@@ -744,6 +744,23 @@ the dracut shell
 ==== Additional dracut boot parameters
 For more debugging options, see <<dracutkerneldebug>> in <<dracutcmdline7>>.
 
+
+[[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.
+
+
 = Developer Manual
 
 == dracut Components
@@ -777,25 +794,12 @@ 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.
+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
@@ -813,63 +817,49 @@ 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. 
-
-
+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 gets executed every time udev has settled.
-
+This hooks (initqueue/settled) gets executed every time udev has settled.
 
 
 ==== Initqueue timeout
 
-This hooks gets executed, when the main loop counter becomes half of the
+This hooks (initqueue/timeout) 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.
-
-
+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
 
@@ -877,20 +867,15 @@ 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
@@ -900,21 +885,18 @@ 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.
+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
@@ -926,8 +908,6 @@ First we create a check() function, which just exits with 0 indicating that this
 module should be included by default.
 
 check():
-
-
 ----
 return 0
 ----
@@ -937,8 +917,6 @@ 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
@@ -949,8 +927,6 @@ 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
@@ -967,8 +943,6 @@ 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
 
@@ -1010,7 +984,7 @@ depends on.
 
 === install()
 
-dracut_install
+inst_multiple
 
 inst
 

dracut.cmdline.7.asc

@@ -69,6 +69,12 @@ rootfstype=ext3
     force mounting _/_ and _/usr_ (if it is a separate device) read-write.
     See also ro option.
 
+**rootfallback=**_<path to blockdevice>_::
+    specify the block device to use as the root filesystem, if the normal root cannot be found.
+    This can only be a simple block device with a simple file system, for which the filesystem
+    driver is either compiled in, or added manually to the initramfs.
+    This parameter can be specified multiple times.
+
 **rd.auto** **rd.auto=1**::
     enable autoassembly of special devices like cryptoLUKS, dmraid, mdraid or lvm.
     Default is off as of dracut version >= 024.
@@ -121,10 +127,6 @@ Misc
    specify the controlling terminal for the console.
    This is useful, if you have multiple "console=" arguments.
 
-**rd.action_on_fail=**_{shell|continue}_::
-   Specify the action after failure. By default it's emergency_shell.
-   'continue' means: ignore the current failure and go ahead.
-
 [[dracutkerneldebug]]
 Debug
 ~~~~~

dracut.conf.5.asc

@@ -67,10 +67,18 @@ 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.
 
+*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.
 
@@ -105,7 +113,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__"::
@@ -117,6 +125,24 @@ If chrooted to another root other than the real root device, use --fstab and pro
 *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.
 

dracut.sh

@@ -91,11 +91,14 @@ Creates initial ramdisk images for preloading modules
                          firmwares, separated by :
   --kernel-only         Only install kernel drivers and firmware files
   --no-kernel           Do not install kernel drivers and firmware files
+  --print-cmdline       Print the kernel command line for the given disk layout
   --early-microcode     Combine early microcode with ramdisk
   --no-early-microcode  Do not combine early microcode with ramdisk
   --kernel-cmdline [PARAMETERS] Specify default kernel command line parameters
   --strip               Strip binaries in the initramfs
   --nostrip             Do not strip binaries in the initramfs
+  --prelink             Prelink binaries in the initramfs
+  --noprelink           Do not prelink binaries in the initramfs
   --hardlink            Hardlink files in the initramfs
   --nohardlink          Do not hardlink files in the initramfs
   --prefix [DIR]        Prefix initramfs files with [DIR]
@@ -131,8 +134,12 @@ Creates initial ramdisk images for preloading modules
                          /usr/lib/dracut/modules.d.
                          Useful when running dracut from a git checkout.
   -H, --hostonly        Host-Only mode: Install only what is needed for
-                         booting the local host instead of a generic host.
+                        booting the local host instead of a generic host.
   -N, --no-hostonly     Disables Host-Only mode
+  --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 to determine the root device.
   --add-fstab [FILE]    Add file to the initramfs fstab
   --mount "[DEV] [MP] [FSTYPE] [FSOPTS]"
@@ -306,9 +313,12 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \
     --long force \
     --long kernel-only \
     --long no-kernel \
+    --long print-cmdline \
     --long kernel-cmdline: \
     --long strip \
     --long nostrip \
+    --long prelink \
+    --long noprelink \
     --long hardlink \
     --long nohardlink \
     --long noprefix \
@@ -326,6 +336,7 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \
     --long host-only \
     --long no-hostonly \
     --long no-host-only \
+    --long persistent-policy: \
     --long fstab \
     --long help \
     --long bzip2 \
@@ -339,6 +350,8 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \
     --long printsize \
     --long regenerate-all \
     --long noimageifnotneeded \
+    --long early-microcode \
+    --long no-early-microcode \
     -- "$@")
 
 if (( $? != 0 )); then
@@ -380,10 +393,13 @@ while :; do
         -f|--force)    force=yes;;
         --kernel-only) kernel_only="yes"; no_kernel="no";;
         --no-kernel)   kernel_only="no"; no_kernel="yes";;
-        --early-microcode) early_microcode="yes";;
-        --no-early-microcode) early_microcode="no";;
+        --print-cmdline) print_cmdline="yes"; hostonly_l="yes"; kernel_only="yes"; no_kernel="yes";;
+        --early-microcode) early_microcode_l="yes";;
+        --no-early-microcode) early_microcode_l="no";;
         --strip)       do_strip_l="yes";;
         --nostrip)     do_strip_l="no";;
+        --prelink)     do_prelink_l="yes";;
+        --noprelink)   do_prelink_l="no";;
         --hardlink)    do_hardlink_l="yes";;
         --nohardlink)  do_hardlink_l="no";;
         --noprefix)    prefix_l="/";;
@@ -405,6 +421,8 @@ while :; do
                        hostonly_l="yes" ;;
         -N|--no-hostonly|--no-host-only)
                        hostonly_l="no" ;;
+        --persistent-policy)
+                       persistent_policy_l="$2"; shift;;
         --fstab)       use_fstab_l="yes" ;;
         -h|--help)     long_usage; exit 1 ;;
         -i|--include)  push include_src "$2"
@@ -478,6 +496,11 @@ if [[ $regenerate_all == "yes" ]]; then
         ((ret+=$?))
     done
     exit $ret
+elif [[ $kernel ]]; then
+    if ! [[ -d /lib/modules/$kernel ]] && [[ $no_kernel != yes ]]; then
+        printf -- "Kernel version $kernel has no modules in /lib/modules/$kernel\n" >&2
+        exit 1
+    fi
 fi
 
 if ! [[ $kernel ]]; then
@@ -634,11 +657,14 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
 [[ $drivers_dir_l ]] && drivers_dir=$drivers_dir_l
 [[ $do_strip_l ]] && do_strip=$do_strip_l
 [[ $do_strip ]] || do_strip=yes
+[[ $do_prelink_l ]] && do_prelink=$do_prelink_l
+[[ $do_prelink ]] || do_prelink=yes
 [[ $do_hardlink_l ]] && do_hardlink=$do_hardlink_l
 [[ $do_hardlink ]] || do_hardlink=yes
 [[ $prefix_l ]] && prefix=$prefix_l
 [[ $prefix = "/" ]] && unset prefix
 [[ $hostonly_l ]] && hostonly=$hostonly_l
+[[ $persistent_policy_l ]] && persistent_policy=$persistent_policy_l
 [[ $use_fstab_l ]] && use_fstab=$use_fstab_l
 [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
 [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
@@ -650,6 +676,8 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
 [[ $show_modules_l ]] && show_modules=$show_modules_l
 [[ $nofscks_l ]] && nofscks="yes"
 [[ $ro_mnt_l ]] && ro_mnt="yes"
+[[ $early_microcode_l ]] && early_microcode=$early_microcode_l
+[[ $early_microcode ]] || early_microcode=no
 # eliminate IFS hackery when messing with fw_dir
 fw_dir=${fw_dir//:/ }
 
@@ -676,9 +704,9 @@ readonly initdir="$(mktemp --tmpdir="$TMPDIR/" -d -t initramfs.XXXXXX)"
 }
 
 if [[ $early_microcode = yes ]]; then
-    readonly microcode_dir="$(mktemp --tmpdir="$TMPDIR/" -d -t early_microcode.XXXXXX)"
-    [ -d "$microcode_dir" ] || {
-        printf "%s\n" "dracut: mktemp --tmpdir=\"$TMPDIR/\" -d -t early_microcode.XXXXXX failed." >&2
+    readonly early_cpio_dir="$(mktemp --tmpdir="$TMPDIR/" -d -t early_cpio.XXXXXX)"
+    [ -d "$early_cpio_dir" ] || {
+        printf "%s\n" "dracut: mktemp --tmpdir=\"$TMPDIR/\" -d -t early_cpio.XXXXXX failed." >&2
         exit 1
     }
 fi
@@ -687,7 +715,7 @@ trap '
     ret=$?;
     [[ $outfile ]] && [[ -f $outfile.$$ ]] && rm -f -- "$outfile.$$";
     [[ $keep ]] && echo "Not removing $initdir." >&2 || { [[ $initdir ]] && rm -rf -- "$initdir"; };
-    [[ $keep ]] && echo "Not removing $microcode_dir." >&2 || { [[ $microcode_dir ]] && rm -Rf -- "$microcode_dir"; };
+    [[ $keep ]] && echo "Not removing $early_cpio_dir." >&2 || { [[ $early_cpio_dir ]] && rm -Rf -- "$early_cpio_dir"; };
     [[ $_dlogdir ]] && rm -Rf -- "$_dlogdir";
     exit $ret;
     ' EXIT
@@ -707,12 +735,14 @@ else
     exit 1
 fi
 
-inst /bin/sh
-if ! $DRACUT_INSTALL ${initdir+-D "$initdir"} -R "$initdir/bin/sh" &>/dev/null; then
-    unset DRACUT_RESOLVE_LAZY
-    export DRACUT_RESOLVE_DEPS=1
+if ! [[ $print_cmdline ]]; then
+    inst /bin/sh
+    if ! $DRACUT_INSTALL ${initdir:+-D "$initdir"} -R "$initdir/bin/sh" &>/dev/null; then
+        unset DRACUT_RESOLVE_LAZY
+        export DRACUT_RESOLVE_DEPS=1
+    fi
+    rm -fr -- ${initdir}/*
 fi
-rm -fr -- ${initdir}/*
 
 if [[ -f $dracutbasedir/dracut-version.sh ]]; then
     . $dracutbasedir/dracut-version.sh
@@ -794,23 +824,25 @@ if [[ -d $srcmods ]]; then
     }
 fi
 
-if [[ -f $outfile && ! $force ]]; then
-    dfatal "Will not override existing initramfs ($outfile) without --force"
-    exit 1
-fi
+if [[ ! $print_cmdline ]]; then
+    if [[ -f $outfile && ! $force ]]; then
+        dfatal "Will not override existing initramfs ($outfile) without --force"
+        exit 1
+    fi
 
-outdir=${outfile%/*}
-[[ $outdir ]] || outdir="/"
+    outdir=${outfile%/*}
+    [[ $outdir ]] || outdir="/"
 
-if [[ ! -d "$outdir" ]]; then
-    dfatal "Can't write to $outdir: Directory $outdir does not exist or is not accessible."
-    exit 1
-elif [[ ! -w "$outdir" ]]; then
-    dfatal "No permission to write to $outdir."
-    exit 1
-elif [[ -f "$outfile" && ! -w "$outfile" ]]; then
-    dfatal "No permission to write $outfile."
-    exit 1
+    if [[ ! -d "$outdir" ]]; then
+        dfatal "Can't write to $outdir: Directory $outdir does not exist or is not accessible."
+        exit 1
+    elif [[ ! -w "$outdir" ]]; then
+        dfatal "No permission to write to $outdir."
+        exit 1
+    elif [[ -f "$outfile" && ! -w "$outfile" ]]; then
+        dfatal "No permission to write $outfile."
+        exit 1
+    fi
 fi
 
 # Need to be able to have non-root users read stuff (rpcbind etc)
@@ -823,10 +855,6 @@ if [[ $hostonly ]]; then
             unset hostonly
         fi
     done
-    if ! [[ -d /run/udev/data ]]; then
-        dwarning "Turning off host-only mode: udev database not found!"
-        unset hostonly
-    fi
 fi
 
 declare -A host_fs_types
@@ -867,11 +895,19 @@ if [[ $hostonly ]]; then
         "/sbin" \
         "/lib" \
         "/lib64" \
+        "/usr" \
+        "/usr/bin" \
+        "/usr/sbin" \
+        "/usr/lib" \
+        "/usr/lib64" \
         "/boot";
     do
         mp=$(readlink -f "$mp")
         mountpoint "$mp" >/dev/null 2>&1 || continue
-        _dev="$(readlink -f "/dev/block/$(find_block_device "$mp")")"
+        _dev=$(find_block_device "$mp")
+        _bdev=$(readlink -f "/dev/block/$_dev")
+        [[ -b $_bdev ]] && _dev=$_bdev
+        push host_devs $_dev
         [[ "$_mp" == "/" ]] && root_dev="$_dev"
         push host_devs "$_dev"
     done
@@ -884,10 +920,10 @@ if [[ $hostonly ]]; then
             while read _d _m _t _o _r; do
                 [[ "$_d" == \#* ]] && continue
                 [[ $_d ]] || continue
-                [[ $_t != "swap" ]] || [[ $_m != "swap" ]] && continue
+                [[ $_t != "swap" ]] && continue
+                [[ $_m != "swap" ]] && [[ $_m != "none" ]] && continue
                 [[ "$_o" == *noauto* ]] && continue
-                [[ "$_d" == UUID\=* ]] && _d="/dev/disk/by-uuid/${_d#UUID=}"
-                [[ "$_d" == LABEL\=* ]] && _d="/dev/disk/by-label/$_d#LABEL=}"
+                _d=$(expand_persistent_dev "$_d")
                 [[ "$_d" -ef "$dev" ]] || continue
 
                 if [[ -f /etc/crypttab ]]; then
@@ -895,7 +931,7 @@ if [[ $hostonly ]]; then
                         [[ $_mapper = \#* ]] && continue
                         [[ "$_d" -ef /dev/mapper/"$_mapper" ]] || continue
                         [[ "$_o" ]] || _o="$_p"
-                # skip mkswap swap
+                        # skip mkswap swap
                         [[ $_o == *swap* ]] && continue 2
                     done < /etc/crypttab
                 fi
@@ -905,8 +941,29 @@ if [[ $hostonly ]]; then
             done < /etc/fstab
         done < /proc/swaps
     fi
+    # record all host modaliases
+    declare -A host_modalias
+    find  /sys/devices/ -name uevent -print > "$initdir/.modalias"
+    while read m; do
+        while read line; do
+            [[ "$line" != MODALIAS\=* ]] && continue
+            modalias="${line##MODALIAS=}" && [[ $modalias ]] && host_modalias["$modalias"]=1
+            break
+        done < "$m"
+    done < "$initdir/.modalias"
+
+    rm -f -- "$initdir/.modalias"
+
+    # check /proc/modules
+    declare -A host_modules
+    while read m rest; do
+        host_modules["$m"]=1
+    done </proc/modules
 fi
 
+unset m
+unset rest
+
 _get_fs_type() {
     [[ $1 ]] || return
     if [[ -b /dev/block/$1 ]] && ID_FS_TYPE=$(get_fs_env "/dev/block/$1"); then
@@ -929,6 +986,22 @@ for dev in ${host_devs[@]}; do
     check_block_and_slaves_all _get_fs_type "$(get_maj_min "$dev")"
 done
 
+for dev in "${!host_fs_types[@]}"; do
+    [[ ${host_fs_types[$dev]} = "reiserfs" ]] || [[ ${host_fs_types[$dev]} = "xfs" ]] || continue
+    rootopts=$(find_dev_fsopts "$dev")
+    if [[ ${host_fs_types[$dev]} = "reiserfs" ]]; then
+        journaldev=$(fs_get_option $rootopts "jdev")
+    elif [[ ${host_fs_types[$dev]} = "xfs" ]]; then
+        journaldev=$(fs_get_option $rootopts "logdev")
+    fi
+    if [[ $journaldev ]]; then
+        dev="$(readlink -f "$dev")"
+        push host_devs "$dev"
+        _get_fs_type "$dev"
+        check_block_and_slaves_all _get_fs_type "$(get_maj_min "$dev")"
+    fi
+done
+
 [[ -d $udevdir ]] \
     || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)"
 if ! [[ -d "$udevdir" ]]; then
@@ -961,7 +1034,28 @@ export initdir dracutbasedir dracutmodules \
     stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
     debug host_fs_types host_devs sshkey add_fstab \
     DRACUT_VERSION udevdir prefix filesystems drivers \
-    systemdutildir systemdsystemunitdir systemdsystemconfdir
+    systemdutildir systemdsystemunitdir systemdsystemconfdir \
+    host_modalias host_modules
+
+mods_to_load=""
+# check all our modules to see if they should be sourced.
+# This builds a list of modules that we will install next.
+for_each_module_dir check_module
+for_each_module_dir check_mount
+
+dracut_module_included "fips" && export DRACUT_FIPS_MODE=1
+
+if [[ $print_cmdline ]]; then
+    modules_loaded=" "
+    # source our modules.
+    for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
+        _d_mod=${moddir##*/}; _d_mod=${_d_mod#[0-9][0-9]}
+        module_cmdline "$_d_mod"
+    done
+    unset moddir
+    printf "\n"
+    exit 0
+fi
 
 # Create some directory structure first
 [[ $prefix ]] && mkdir -m 0755 -p "${initdir}${prefix}"
@@ -1020,14 +1114,6 @@ if [[ $kernel_only != yes ]]; then
     fi
 fi
 
-mods_to_load=""
-# check all our modules to see if they should be sourced.
-# This builds a list of modules that we will install next.
-for_each_module_dir check_module
-for_each_module_dir check_mount
-
-[[ "$mods_to_load " == *01fips\ * ]] && export DRACUT_FIPS_MODE=1
-
 _isize=0 #initramfs size
 modules_loaded=" "
 # source our modules.
@@ -1104,7 +1190,7 @@ if [[ $no_kernel != yes ]]; then
 fi
 
 if [[ $kernel_only != yes ]]; then
-    (( ${#install_items[@]} > 0 )) && dracut_install ${install_items[@]}
+    (( ${#install_items[@]} > 0 )) && inst_multiple ${install_items[@]}
 
     [[ $kernel_cmdline ]] && printf "%s\n" "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf"
 
@@ -1130,7 +1216,7 @@ if [[ $kernel_only != yes ]]; then
         find "$initdir" -type f \
             '(' -perm -0100 -or -perm -0010 -or -perm -0001 ')' \
             -not -path '*.ko' -print0 \
-        | xargs -r -0 $DRACUT_INSTALL ${initdir+-D "$initdir"} -R ${DRACUT_FIPS_MODE+-H} --
+        | xargs -r -0 $DRACUT_INSTALL ${initdir:+-D "$initdir"} -R ${DRACUT_FIPS_MODE:+-H} --
         dinfo "*** Resolving executable dependencies done***"
     fi
 fi
@@ -1175,18 +1261,20 @@ if [[ $kernel_only != yes ]]; then
     fi
 fi
 
-PRELINK_BIN="$(command -v prelink)"
-if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
-    if [[ $DRACUT_FIPS_MODE ]]; then
-        dinfo "*** Installing prelink files ***"
-        dracut_install -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
-    else
-        dinfo "*** Pre-linking files ***"
-        dracut_install -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
-        chroot "$initdir" "$PRELINK_BIN" -a
-        rm -f -- "$initdir/$PRELINK_BIN"
-        rm -fr -- "$initdir"/etc/prelink.*
-        dinfo "*** Pre-linking files done ***"
+if [[ $do_prelink == yes ]]; then
+    PRELINK_BIN="$(command -v prelink)"
+    if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
+        if [[ $DRACUT_FIPS_MODE ]]; then
+            dinfo "*** Installing prelink files ***"
+            inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
+        else
+            dinfo "*** Pre-linking files ***"
+            inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
+            chroot "$initdir" "$PRELINK_BIN" -a
+            rm -f -- "$initdir/$PRELINK_BIN"
+            rm -fr -- "$initdir"/etc/prelink.*
+            dinfo "*** Pre-linking files done ***"
+        fi
     fi
 fi
 
@@ -1206,25 +1294,11 @@ if [[ $do_strip = yes ]] ; then
     done
 fi
 
-if [[ $do_strip = yes ]] ; then
+if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
     dinfo "*** Stripping files ***"
-    if [[ $DRACUT_FIPS_MODE ]]; then
-        find "$initdir" -type f \
-            -executable -not -path '*/lib/modules/*.ko' -print0 \
-            | while read -r -d $'\0' f; do
-            if ! [[ -e "${f%/*}/.${f##*/}.hmac" ]] \
-                && ! [[ -e "/lib/hmaccalc/${f##*/}.hmac" ]] \
-                && ! [[ -e "/lib64/hmaccalc/${f##*/}.hmac" ]] \
-                && ! [[ -e "/lib/fipscheck/${f##*/}.hmac" ]] \
-                && ! [[ -e "/lib64/fipscheck/${f##*/}.hmac" ]]; then
-                printf "%s\000" "$f";
-            fi
-        done | xargs -r -0 strip -g 2>/dev/null
-    else
-        find "$initdir" -type f \
-            -executable -not -path '*/lib/modules/*.ko' -print0 \
-            | xargs -r -0 strip -g 2>/dev/null
-    fi
+    find "$initdir" -type f \
+        -executable -not -path '*/lib/modules/*.ko' -print0 \
+        | xargs -r -0 strip -g 2>/dev/null
 
     # strip kernel modules, but do not touch signed modules
     find "$initdir" -type f -path '*/lib/modules/*.ko' -print0 \
@@ -1239,7 +1313,7 @@ if [[ $early_microcode = yes ]]; then
     dinfo "*** Generating early-microcode cpio image ***"
     ucode_dir=(amd-ucode intel-ucode)
     ucode_dest=(AuthenticAMD.bin GenuineIntel.bin)
-    _dest_dir="$microcode_dir/d/kernel/x86/microcode"
+    _dest_dir="$early_cpio_dir/d/kernel/x86/microcode"
     _dest_idx="0 1"
     mkdir -p $_dest_dir
     if [[ $hostonly ]]; then
@@ -1254,21 +1328,36 @@ if [[ $early_microcode = yes ]]; then
                 dinfo "*** Constructing ${ucode_dest[$idx]} ****"
                 if [[ $hostonly ]]; then
                     _src=$(get_ucode_file)
+                    if ! [[ -r $_fwdir/$_fw/$_src ]];then
+                        break;
+                    fi
                 fi
                 cat $_fwdir/$_fw/$_src > $_dest_dir/${ucode_dest[$idx]}
+                create_early_cpio="yes"
             fi
         done
     done
-    (cd "$microcode_dir/d"; find . | cpio -o -H newc --quiet >../ucode.cpio)
+fi
+
+if [[ $acpi_override = yes ]] && [[ -d $acpi_table_dir ]]; then
+    dinfo "*** Packaging ACPI tables to override BIOS provided ones ***"
+    _dest_dir="$early_cpio_dir/d/kernel/firmware/acpi"
+    mkdir -p $_dest_dir
+    for table in $acpi_table_dir/*.aml; do
+        dinfo "   Adding ACPI table: $table"
+        cp $table $_dest_dir
+        create_early_cpio="yes"
+    done
 fi
 
 rm -f -- "$outfile"
 dinfo "*** Creating image file ***"
-if [[ $early_microcode = yes ]]; then
+if [[ $create_early_cpio = yes ]]; then
     # The microcode blob is _before_ the initramfs blob, not after
-    mv $microcode_dir/ucode.cpio $outfile.$$
+    (cd "$early_cpio_dir/d"; find . -print0 | cpio --null -o -H newc --quiet >../early.cpio)
+    mv $early_cpio_dir/early.cpio $outfile.$$
 fi
-if ! ( umask 077; cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet| \
+if ! ( umask 077; cd "$initdir"; find . -print0 | cpio --null -R 0:0 -H newc -o --quiet| \
     $compress >> "$outfile.$$"; ); then
     dfatal "dracut: creation of $outfile.$$ failed"
     exit 1
@@ -1277,7 +1366,11 @@ mv -- "$outfile.$$" "$outfile"
 dinfo "*** Creating image file done ***"
 
 if (( maxloglvl >= 5 )); then
-    lsinitrd "$outfile"| ddebug
+    if [[ $allowlocal ]]; then
+	"$dracutbasedir/lsinitrd.sh" "$outfile"| ddebug
+    else
+        lsinitrd "$outfile"| ddebug
+    fi
 fi
 
 exit 0

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/
 
@@ -97,16 +97,14 @@ Requires: util-linux >= 2.21
 Requires: systemd >= 199
 Requires: procps-ng
 Conflicts: grubby < 8.23
+Conflicts: initscripts < 8.63-1
+Conflicts: plymouth < 0.8.0-0.2009.29.09.19.1
+Conflicts: bcache-tools < 0-0.14.20130909git
 %else
 Requires: udev > 166
 Requires: util-linux-ng >= 2.21
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} > 6
-Conflicts: initscripts < 8.63-1
-Conflicts: plymouth < 0.8.0-0.2009.29.09.19.1
-%endif
-
 Conflicts: mdadm < 3.2.6-14
 
 %description
@@ -121,6 +119,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}
 
@@ -270,6 +269,10 @@ echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-i
 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
@@ -318,6 +321,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %else
 %{dracutlibdir}/modules.d/00bootchart
 %endif
+%{dracutlibdir}/modules.d/00bash
 %{dracutlibdir}/modules.d/03modsign
 %{dracutlibdir}/modules.d/03rescue
 %{dracutlibdir}/modules.d/04watchdog
@@ -328,7 +332,6 @@ 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
@@ -411,6 +414,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %defattr(-,root,root,0755)
 %{dracutlibdir}/modules.d/01fips
 %{dracutlibdir}/dracut.conf.d/40-fips.conf
+%config(missingok) /etc/system-fips
 %endif
 
 %files fips-aesni

lsinitrd.sh

@@ -109,7 +109,7 @@ case $bin in
         CAT="zcat";;
     BZh*)
         CAT="bzcat";;
-    070701)
+    $'\x71\xc7'*|070701)
         CAT="cat";;
     *)
         CAT="xzcat";
@@ -137,7 +137,7 @@ else
     version=$($CAT -- "$image" | cpio --extract --verbose --quiet --to-stdout -- '*lib/dracut/dracut-*' 2>/dev/null)
     ((ret+=$?))
     echo "$version with dracut modules:"
-    $CAT -- "$image" | cpio --extract --verbose --quiet --to-stdout -- 'usr/lib/dracut/modules.txt' 2>/dev/null
+    $CAT -- "$image" | cpio --extract --verbose --quiet --to-stdout -- '*lib/dracut/modules.txt' 2>/dev/null
     ((ret+=$?))
     echo "========================================================================"
     if [ "$sorted" -eq 1 ]; then

mkinitrd-dracut.sh

@@ -1,6 +1,11 @@
 #!/bin/bash --norc
 kver=$(uname -r)
 
+boot_dir="/boot"
+quiet=0
+host_only=0
+force=0
+
 error() { echo "$@" >&2; }
 
 usage () {
@@ -24,36 +29,105 @@ read_arg() {
     # $1 = arg name
     # $2 = arg value
     # $3 = arg parameter
-    local rematch='^[^=]*=(.*)$'
+    param="$1"
+    local rematch='^[^=]*=(.*)$' result
     if [[ $2 =~ $rematch ]]; then
-        read "$1" <<< "${BASH_REMATCH[1]}"
-    elif [[ $3 != -* ]]; then
-        # Only read next arg if it not an arg itself.
-        read "$1" <<< "$3"
-        # There is no way to shift our callers args, so
-        # return 1 to indicate they should do it instead.
-        return 1
+        read "$param" <<< "${BASH_REMATCH[1]}"
+    else
+	for ((i=3; $i <= $#; i++)); do
+            # Only read next arg if it not an arg itself.
+            if [[ ${@:$i:1} = -* ]];then
+		break
+            fi
+            result="$result ${@:$i:1}"
+            # There is no way to shift our callers args, so
+            # return "no of args" to indicate they should do it instead.
+	done
+	read "$1" <<< "$result"
+        return $(($i - 3))
     fi
 }
 
+# Taken over from SUSE mkinitrd
+default_kernel_images() {
+    local regex kernel_image kernel_version version_version initrd_image
+    local qf='%{NAME}-%{VERSION}-%{RELEASE}\n'
+
+    case "$(uname -m)" in
+        s390|s390x)
+            regex='image'
+            ;;
+        ppc|ppc64)
+            regex='vmlinux'
+            ;;
+        i386|x86_64)
+            regex='vmlinuz'
+            ;;
+        arm*)
+            regex='[uz]Image'
+            ;;
+        aarch64)
+            regex='Image'
+            ;;
+        *)  regex='vmlinu.'
+            ;;
+    esac
+
+    # user mode linux
+    if grep -q UML /proc/cpuinfo; then
+            regex='linux'
+    fi
+
+    kernel_images=""
+    initrd_images=""
+    for kernel_image in $(ls $boot_dir \
+            | sed -ne "\|^$regex\(-[0-9.]\+-[0-9]\+-[a-z0-9]\+$\)\?|p" \
+            | grep -v kdump$ ) ; do
+
+        # Note that we cannot check the RPM database here -- this
+        # script is itself called from within the binary kernel
+        # packages, and rpm does not allow recursive calls.
+
+        [ -L "$boot_dir/$kernel_image" ] && continue
+        [ "${kernel_image%%.gz}" != "$kernel_image" ] && continue
+        kernel_version=$(/usr/bin/get_kernel_version \
+                         $boot_dir/$kernel_image 2> /dev/null)
+        initrd_image=$(echo $kernel_image | sed -e "s|${regex}|initrd|")
+        if [ "$kernel_image" != "$initrd_image" -a \
+             -n "$kernel_version" -a \
+             -d "/lib/modules/$kernel_version" ]; then
+                kernel_images="$kernel_images $boot_dir/$kernel_image"
+                initrd_images="$initrd_images $boot_dir/$initrd_image"
+        fi
+    done
+    for kernel_image in $kernel_images;do
+	kernels="$kernels ${kernel_image#*-}"
+    done
+    for initrd_image in $initrd_images;do
+	targets="$targets $initrd_image"
+    done
+    host_only=1
+    force=1
+}
+
 while (($# > 0)); do
     case ${1%%=*} in
-        --with-usb) read_arg usbmodule "$@" || shift
+        --with-usb) read_arg usbmodule "$@" || shift $?
             basicmodules="$basicmodules ${usbmodule:-usb-storage}"
             unset usbmodule;;
-        --with-avail) read_arg modname "$@" || shift
+        --with-avail) read_arg modname "$@" || shift $?
             basicmodules="$basicmodules $modname";;
-        --with) read_arg modname "$@" || shift
+        --with) read_arg modname "$@" || shift $?
             basicmodules="$basicmodules $modname";;
         --version)
             echo "mkinitrd: dracut compatibility wrapper"
             exit 0;;
         -v|--verbose) dracut_args="${dracut_args} -v";;
-        -f|--force) dracut_args="${dracut_args} -f";;
-        --preload) read_arg modname "$@" || shift
+        -f|--force) force=1;;
+        --preload) read_arg modname "$@" || shift $?
             basicmodules="$basicmodules $modname";;
         --image-version) img_vers=yes;;
-        --rootfs) read_arg rootfs "$@" || shift
+        --rootfs|-d) read_arg rootfs "$@" || shift $?
             dracut_args="${dracut_args} --filesystems $rootfs";;
         --nocompress) dracut_args="$dracut_args --no-compress";;
         --help) usage -n;;
@@ -80,10 +154,31 @@ while (($# > 0)); do
         --looppath*) ;;
         --dsdt*) ;;
         --bootchart) ;;
-        *) if [[ ! $target ]]; then
-            target=$1
-            elif [[ ! $kernel ]]; then
-            kernel=$1
+	-s) ;;
+	--quiet|-q) quiet=1;;
+	-b) read_arg boot_dir "$@" || shift $?
+	    if [ ! -d $boot_dir ];then
+		error "Boot directory $boot_dir does not exist"
+		exit 1
+	    fi
+	    ;;
+	-k) # Would be nice to get a list of images here
+	    read_arg kernel_images "$@" || shift $?
+	    for kernel_image in $kernel_images;do
+		kernels="$kernels ${kernel_image#*-}"
+	    done
+	    host_only=1
+	    force=1
+	    ;;
+	-i) read_arg initrd_images "$@" || shift $?
+	    for initrd_image in $initrd_images;do
+		targets="$targets $boot_dir/$initrd_image"
+	    done
+	    ;;
+        *)  if [[ ! $targets ]]; then
+            targets=$1
+            elif [[ ! $kernels ]]; then
+            kernels=$1
             else
             usage
             fi;;
@@ -91,11 +186,41 @@ while (($# > 0)); do
     shift
 done
 
-[[ $target && $kernel ]] || usage
-[[ $img_vers ]] && target="$target-$kernel"
+[[ $targets && $kernels ]] || default_kernel_images
+[[ $targets && $kernels ]] || (error "No kernel found in $boot_dir" && usage)
 
-if [[ $basicmodules ]]; then
-        dracut $dracut_args --add-drivers "$basicmodules" "$target" "$kernel"
-else
-        dracut $dracut_args "$target" "$kernel"
-fi
+# We can have several targets/kernels, transform the list to an array
+targets=( $targets )
+[[ $kernels ]] && kernels=( $kernels )
+
+[[ $host_only == 1 ]] && dracut_args="${dracut_args} -H"
+[[ $force == 1 ]]     && dracut_args="${dracut_args} -f"
+
+echo "Creating: target|kernel|dracut args|basicmodules "
+for ((i=0 ; $i<${#targets[@]} ; i++)); do
+
+    if [[ $img_vers ]];then
+	target="${targets[$i]}-${kernels[$i]}"
+    else
+	target="${targets[$i]}"
+    fi
+    kernel="${kernels[$i]}"
+
+    # Duplicate code: No way found how to redirect output based on $quiet
+    if [[ $quiet == 1 ]];then
+	echo "$target|$kernel|$dracut_args|$basicmodules"
+	if [[ $basicmodules ]]; then
+            dracut $dracut_args --add-drivers "$basicmodules" "$target" \
+		"$kernel" &>/dev/null
+	else
+            dracut $dracut_args "$target" "$kernel" &>/dev/null
+	fi
+    else
+	if [[ $basicmodules ]]; then
+            dracut $dracut_args --add-drivers "$basicmodules" "$target" \
+		"$kernel"
+	else
+            dracut $dracut_args "$target" "$kernel"
+	fi
+    fi
+done

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() {
+    [ -x /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

@@ -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/00systemd-bootchart/module-setup.sh

@@ -14,5 +14,5 @@ depends() {
 
 install() {
     inst_symlink /init /sbin/init
-    dracut_install $systemdutildir/systemd-bootchart
+    inst_multiple $systemdutildir/systemd-bootchart
 }

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

@@ -34,12 +34,12 @@ 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.10
 
-    dracut_install -o prelink
+    inst_multiple -o prelink
 }
 

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

@@ -12,7 +12,7 @@ depends() {
 }
 
 install() {
-    dracut_install -o ps grep more cat rm strace free showmount \
+    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/10i18n/module-setup.sh

@@ -4,6 +4,11 @@
 
 check() {
     [[ "$mount_needs" ]] && return 1
+
+    for i in setfont loadkeys kbd_mode; do
+        type -P "$i" >/dev/null || return 1
+    done
+
     return 0
 }
 
@@ -21,7 +26,7 @@ install() {
         [[ $FONT ]] || [[ $KEYMAP ]] || return 0
     fi
 
-    dracut_install -o $systemdutildir/systemd-vconsole-setup
+    inst_multiple -o $systemdutildir/systemd-vconsole-setup
     KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
     DEFAULT_FONT="${i18n_default_font:-LatArCyrHeb-16}"
     I18N_CONF="/etc/locale.conf"
@@ -93,7 +98,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
@@ -115,12 +120,12 @@ install() {
         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
     }
 

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

@@ -42,7 +42,7 @@ 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

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

@@ -124,10 +124,10 @@ do_static() {
     [ -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
     else
         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
@@ -333,6 +333,19 @@ 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/setup_net_${netif}.ok ]; then
+    do_dhcp -4
+fi
+
 exit 0

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

@@ -16,7 +16,6 @@ check() {
 }
 
 depends() {
-    [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg
     return 0
 }
 
@@ -70,10 +69,10 @@ installkernel() {
 
 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"

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

@@ -54,27 +54,40 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
     ifup='/sbin/ifup $env{INTERFACE}'
     [ -z "$netroot" ] && ifup="$ifup -m"
 
-    runcmd="RUN+=\"/sbin/initqueue --onetime $ifup\""
+    runcmd="RUN+=\"/sbin/initqueue --name ifup-\$env{INTERFACE} --unique --onetime $ifup\""
 
     # We have some specific interfaces to handle
     if [ -n "$IFACES" ]; then
         echo 'SUBSYSTEM!="net", GOTO="net_end"'
-        echo 'ACTION=="remove", 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\"" ;;
+                    cond="ATTR{address}==\"$iface\""
+                    echo "$cond, $runcmd, GOTO=\"net_end\""
+                    ;;
                 ??-??-??-??-??-??)  # MAC address in BOOTIF form
-                    cond="ATTR{address}==\"$(fix_bootif $iface)\"" ;;
+                    cond="ATTR{address}==\"$(fix_bootif $iface)\""
+                    echo "$cond, $runcmd, GOTO=\"net_end\""
+                    ;;
                 *)                  # an interface name
-                    cond="ENV{INTERFACE}==\"$iface\"" ;;
+                    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
-            echo "$cond, $runcmd, GOTO=\"net_end\""
         done
         echo 'LABEL="net_end"'
 
-        for iface in $MASTER_IFACES; do
+        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/setup_net_${iface}.ok ]" >$hookdir/initqueue/finished/wait-$iface.sh
             fi

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

@@ -172,13 +172,20 @@ 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/net/$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"
 }
@@ -196,25 +203,28 @@ fix_bootif() {
 }
 
 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=""
+
             [ -e ${iface}/mac ] || continue
             mac=$(read a < ${iface}/mac; echo $a)
             [ -z "$mac" ] && continue
             dev=$(set_ifname ibft $mac)
+
+            [ -e /tmp/net.${dev}.has_ibft_config ] && continue
+
             [ -e ${iface}/dhcp ] && dhcp=$(read a < ${iface}/dhcp; echo $a)
-            if [ -e ${iface}/vlan ]; then
-               vlan=$(read a < ${iface}/vlan; echo $a)
-                echo "vlan=$vlan:$dev"
-            fi
 
             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)
                 [ -e ${iface}/subnet-mask ] && mask=$(read a < ${iface}/subnet-mask; echo $a)
                 [ -e ${iface}/hostname ] && hostname=$(read a < ${iface}/hostname; echo $a)
@@ -232,11 +242,23 @@ ibft_to_cmdline() {
                 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 "vlan=$vlan:$dev"
+                           ;;
+                   esac
+               fi
+            fi
+
             echo $mac > /tmp/net.${dev}.has_ibft_config
         done
     ) >> /etc/cmdline.d/40-ibft.conf
-    # reread cmdline
-    unset CMDLINE
 }
 
 parse_iscsi_root()

modules.d/40network/netroot.sh

@@ -51,6 +51,7 @@ if [ -z "$2" ]; then
         netroot=$new_root_path
 
         # FIXME!
+        unset rootok
         for f in $hookdir/cmdline/90*.sh; do
             [ -f "$f" ] && . "$f";
         done

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

@@ -0,0 +1,10 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+command -v getarg >/dev/null          || . /lib/dracut-lib.sh
+command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh
+
+# If ibft is requested, read ibft vals and write ip=XXX cmdline args
+[ "ibft" = "$(getarg ip=)" ] && ibft_to_cmdline
+

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

@@ -15,7 +15,6 @@
 #
 
 command -v getarg >/dev/null          || . /lib/dracut-lib.sh
-command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh
 
 if [ -n "$netroot" ] && [ -z "$(getarg ip=)" ] && [ -z "$(getarg BOOTIF=)" ]; then
     # No ip= argument(s) for netroot provided, defaulting to DHCP
@@ -39,9 +38,6 @@ if [ -n "$NEEDBOOTDEV" ] ; then
     [ -z "$BOOTDEV" ] && warn "Please supply bootdev argument for multiple ip= lines"
 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

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

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

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

@@ -9,6 +9,10 @@ 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/
 
@@ -103,6 +107,9 @@ for netup in /tmp/net.*.did-setup ; do
     # $netif can't be bridge and bond at the same time
         bond=yes
     fi
+    if [ "$netif" = "$vlanname" ]; then
+        vlan=yes
+    fi
     cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
     {
         echo "# Generated by dracut initrd"
@@ -149,7 +156,7 @@ for netup in /tmp/net.*.did-setup ; do
     } > /tmp/ifcfg/ifcfg-$netif
 
     # bridge needs different things written to ifcfg
-    if [ -z "$bridge" ] && [ -z "$bond" ]; then
+    if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ]; then
         # standard interface
         {
             if [ -n "$macaddr" ]; then
@@ -164,6 +171,15 @@ for netup in /tmp/net.*.did-setup ; do
         } >> /tmp/ifcfg/ifcfg-$netif
     fi
 
+    if [ -n "$vlan" ] ; then
+        {
+            echo "TYPE=Vlan"
+            echo "NAME=\"$netif\""
+            echo "VLAN=yes"
+            echo "PHYSDEV=\"$phydevice\""
+        } >> /tmp/ifcfg/ifcfg-$netif
+    fi
+
     if [ -n "$bond" ] ; then
         # bond interface
         {

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

@@ -14,7 +14,7 @@ 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*"

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

@@ -64,7 +64,7 @@ curl_fetch_url() {
     local url="$1" outloc="$2"
     echo "$url" > /proc/self/fd/0
     if [ -n "$outloc" ]; then
-        curl $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 $? )

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

@@ -22,7 +22,7 @@ install() {
 
     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

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

@@ -4,7 +4,7 @@
 PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
 PLYMOUTH_THEME=$(plymouth-set-default-theme)
 
-dracut_install plymouthd plymouth \
+inst_multiple plymouthd plymouth \
     "${PLYMOUTH_LOGO_FILE}" \
     /etc/system-release
 
@@ -13,7 +13,7 @@ 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" \
 
@@ -35,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/80cms/cmsifup.sh

@@ -32,7 +32,6 @@ fi
 	echo "nameserver=$i"
     done
 } > /etc/cmdline.d/80-cms.conf
-unset CMDLINE
 
 [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
 IFACES="$IFACES $DEVICE"

modules.d/80cms/cmssetup.sh

@@ -182,7 +182,19 @@ function dasd_settle_all() {
 
         unset _do_zfcp
         for i in ${!FCP_*}; do
-	    echo "${!i}" >> /etc/zfcp.conf
+	    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

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

@@ -1,30 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-check() {
-    type -P probe-bcache >/dev/null || return 1
-
-    [[ $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() {
-    dracut_install probe-bcache ${udevdir}/bcache-register
-    inst_rules 61-bcache.rules
-}
-

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

@@ -39,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 -o btrfsck btrfs-zero-log
+    inst_multiple -o btrfsck btrfs-zero-log
     inst $(command -v btrfs) /sbin/btrfs
 }
 

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

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

@@ -26,29 +26,30 @@ installkernel() {
     instmods dm_crypt =crypto
 }
 
+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() {
 
-    check_crypt() {
-        local dev=$1 fs=$2
+    cmdline >> "${initdir}/etc/cmdline.d/90crypt.conf"
+    echo >> "${initdir}/etc/cmdline.d/90crypt.conf"
 
-        [[ $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
-    }
-
-    for_each_host_dev_fs check_crypt
-
-    dracut_install cryptsetup rmdir readlink umount
+    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"
@@ -57,7 +58,7 @@ install() {
         inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
     fi
 
-    if [[ $hostonly ]] && [[ -f /etc/cryptab ]]; then
+    if [[ $hostonly ]] && [[ -f /etc/crypttab ]]; then
         # filter /etc/crypttab for the devices we need
         while read _mapper _dev _rest; do
             [[ $_mapper = \#* ]] && continue
@@ -78,8 +79,7 @@ install() {
 
     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,6 +2,8 @@
 # -*- 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
@@ -28,13 +30,15 @@ else
                     printf -- '$env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $tout
                 } >> /etc/udev/rules.d/70-luks.rules.new
             else
-                {
-                    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
+                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

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

@@ -20,8 +20,8 @@ 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*"
 

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

@@ -9,8 +9,17 @@ check() {
     type -P dmraid >/dev/null || return 1
 
     [[ $hostonly ]] || [[ $mount_needs ]] && {
-        for fs in "${host_fs_types[@]}"; do
-            [[ $fs = *_raid_member ]] && return 0
+        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
     }
@@ -23,42 +32,40 @@ 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
 
-    check_dmraid() {
-        local dev=$1 fs=$2 holder DEVPATH DM_NAME
-        [[ "$fs" != *_raid_member ]] && return 1
+    cmdline >> "${initdir}/etc/cmdline.d/90dmraid.conf"
+    echo >> "${initdir}/etc/cmdline.d/90dmraid.conf"
 
-        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
-    }
-
-    for_each_host_dev_fs check_dmraid
-
-    dracut_install dmraid
-    dracut_install -o kpartx
+    inst_multiple dmraid
+    inst_multiple -o kpartx
     inst $(command -v partx) /sbin/partx
 
     inst "$moddir/dmraid.sh" /sbin/dmraid_scan

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

@@ -7,12 +7,16 @@ if ! getargbool 1 rd.dm -d -n rd_NO_DM || getarg "rd.dm=0" -d nodmraid; then
     udevproperty rd_NO_DM=1
 fi
 
-if  ! command -v mdadm >/dev/null || ! getargbool 1 rd.md.imsm -d -n rd_NO_MDIMSM -n noiswmd; then
+if  ! command -v mdadm >/dev/null \
+    || ! getargbool 1 rd.md.imsm -d -n rd_NO_MDIMSM -n noiswmd \
+    || ! getargbool 1 rd.md -d -n rd_NO_MD; then
     info "rd.md.imsm=0: no MD RAID for imsm/isw raids"
     udevproperty rd_NO_MDIMSM=1
 fi
 
-if  ! command -v mdadm >/dev/null || ! getargbool 1 rd.md.ddf -n rd_NO_MDDDF -n noddfmd; then
+if  ! command -v mdadm >/dev/null \
+    || ! getargbool 1 rd.md.ddf -n rd_NO_MDDDF -n noddfmd \
+    || ! getargbool 1 rd.md -d -n rd_NO_MD; then
     info "rd.md.ddf=0: no MD RAID for SNIA ddf raids"
     udevproperty rd_NO_MDDDF=1
 fi

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

@@ -57,7 +57,7 @@ det_img_fs() {
 }
 
 modprobe squashfs
-
+CMDLINE=$(getcmdline)
 for arg in $CMDLINE; do case $arg in ro|rw) liverw=$arg ;; esac; done
 # mount the backing of the live image first
 mkdir -m 0755 -p /run/initramfs/live

modules.d/90dmsquash-live/iso-scan.sh

@@ -10,7 +10,7 @@ isofile=$1
 
 [ -z "$isofile" ] && exit 1
 
-ismounted "/run/initramfs/isoscan" && exit 1
+ismounted "/run/initramfs/isoscan" && exit 0
 
 mkdir -p "/run/initramfs/isoscan"
 

modules.d/90dmsquash-live/module-setup.sh

@@ -20,8 +20,8 @@ installkernel() {
 }
 
 install() {
-    dracut_install umount dmsetup blkid dd losetup grep blockdev
-    dracut_install -o checkisomd5
+    inst_multiple umount dmsetup blkid dd losetup grep blockdev
+    inst_multiple -o checkisomd5
     inst_hook cmdline 30 "$moddir/parse-dmsquash-live.sh"
     inst_hook cmdline 31 "$moddir/parse-iso-scan.sh"
     inst_hook pre-udev 30 "$moddir/dmsquash-live-genrules.sh"

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

@@ -7,8 +7,5 @@
 isofile=$(getarg iso-scan/filename)
 
 if [ -n "$isofile" ]; then
-    {
-        printf 'KERNEL=="loop0", RUN+="/sbin/initqueue --settled --unique /sbin/iso-scan %s"\n' \
-            "'${isofile}'"
-    } >> /etc/udev/rules.d/99-isofile-mount.rules
+    /sbin/initqueue --settled --unique /sbin/iso-scan "$isofile"
 fi

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

@@ -74,8 +74,8 @@ installkernel() {
 }
 
 install() {
-    dracut_install -o /lib/modprobe.d/*.conf
-    [[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf /etc/modprobe.conf
+    inst_multiple -o /lib/modprobe.d/*.conf
+    [[ $hostonly ]] && inst_multiple -o /etc/modprobe.d/*.conf /etc/modprobe.conf
     if ! dracut_module_included "systemd"; then
         inst_hook cmdline 01 "$moddir/parse-kernel.sh"
     fi

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

@@ -11,7 +11,6 @@ if [ -n "$updates" ]; then
     # make sure network comes up even if we're doing a local live device
     if [ -z "$netroot" ]; then
 	echo > /tmp/net.ifaces
-	unset CMDLINE
     fi
     echo "$updates" > /tmp/liveupdates.info
     echo '[ -e /tmp/liveupdates.done ]' > \

modules.d/90lvm/lvm_scan.sh

@@ -108,9 +108,9 @@ if [ -n "$LVS" ] ; then
     info "Scanning devices $lvmdevs for LVM logical volumes $LVS"
     lvm lvscan --ignorelockingfailure 2>&1 | vinfo
     if [ -z "$sysinit" ]; then
-        lvm lvchange -ay --ignorelockingfailure $nopoll --ignoremonitoring $LVS 2>&1 | vinfo
+        lvm lvchange --yes -ay --ignorelockingfailure $nopoll --ignoremonitoring $LVS 2>&1 | vinfo
     else
-        lvm lvchange -ay $sysinit $LVS 2>&1 | vinfo
+        lvm lvchange --yes -ay $sysinit $LVS 2>&1 | vinfo
     fi
 fi
 

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

@@ -22,32 +22,43 @@ depends() {
     return 0
 }
 
-install() {
-    local _i
-    local _needthin
+get_host_lvs() {
     local _activated
+    declare -A _activated
+
+    for dev in "${!host_fs_types[@]}"; do
+        [ -e /sys/block/${dev#/dev/}/dm/name ] || continue
+        [ -e /sys/block/${dev#/dev/}/dm/uuid ] || continue
+        uuid=$(</sys/block/${dev#/dev/}/dm/uuid)
+        [[ "${uuid#LVM-}" == "$uuid" ]] && continue
+        dev=$(</sys/block/${dev#/dev/}/dm/name)
+        eval $(dmsetup splitname --nameprefixes --noheadings --rows "$dev" 2>/dev/null)
+        [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
+        if ! [[ ${_activated[${DM_VG_NAME}/${DM_LV_NAME}]} ]]; then
+            printf "%s\n" "${DM_VG_NAME}/${DM_LV_NAME} "
+            _activated["${DM_VG_NAME}/${DM_LV_NAME}"]=1
+        fi
+    done
+}
+
+cmdline() {
+    get_host_lvs | while read line; do
+        printf " rd.lvm.lv=$line"
+    done
+}
+
+install() {
+    local _i _needthin
+
     inst lvm
 
-    check_lvm() {
-        local DM_VG_NAME DM_LV_NAME DM_UDEV_DISABLE_DISK_RULES_FLAG
-
-        eval $(udevadm info --query=property --name=$1 | egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')
-        [[ "$DM_UDEV_DISABLE_DISK_RULES_FLAG" = "1" ]] && return 1
-        [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
-        if ! [[ " ${_activated[*]} " == *\ ${DM_VG_NAME}/${DM_LV_NAME}\ * ]]; then
-            if ! [[ $kernel_only ]]; then
-                echo " rd.lvm.lv=${DM_VG_NAME}/${DM_LV_NAME} " >> "${initdir}/etc/cmdline.d/90lvm.conf"
-            fi
-            push _activated "${DM_VG_NAME}/${DM_LV_NAME}"
-        fi
+    get_host_lvs | while read line; do
+        printf "%s" " rd.lvm.lv=$line"
         if ! [[ $_needthin ]]; then
-            [[ $(lvs --noheadings -o segtype ${DM_VG_NAME} 2>/dev/null) == *thin* ]] && _needthin=1
+            [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1
         fi
-
-        return 0
-    }
-
-    for_each_host_dev_fs check_lvm
+    done >> "${initdir}/etc/cmdline.d/90lvm.conf"
+    echo >> "${initdir}/etc/cmdline.d/90lvm.conf"
 
     inst_rules "$moddir/64-lvm.rules"
 
@@ -61,7 +72,17 @@ install() {
         fi
     fi
 
-    inst_rules 11-dm-lvm.rules
+    if ! [[ -e ${initdir}/etc/lvm/lvm.conf ]]; then
+        mkdir -p "${initdir}/etc/lvm"
+        {
+            echo 'global {'
+            echo 'locking_type = 4'
+            echo 'use_lvmetad = 0'
+            echo '}'
+        } > "${initdir}/etc/lvm/lvm.conf"
+    fi
+
+    inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules
     # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
     # files, but provides the one below:
     inst_rules 64-device-mapper.rules
@@ -74,7 +95,7 @@ install() {
     inst_libdir_file "libdevmapper-event-lvm*.so"
 
     if [[ $_needthin ]]; then
-        dracut_install -o thin_dump thin_restore thin_check
+        inst_multiple -o thin_dump thin_restore thin_check thin_repair
     fi
 
 }

modules.d/90mdraid/59-persistent-storage-md.rules

@@ -20,4 +20,5 @@ IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
 IMPORT BLKID
 OPTIONS+="link_priority=100"
 OPTIONS+="watch"
+OPTIONS+="db_persist"
 LABEL="md_end"

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

@@ -8,8 +8,17 @@ check() {
     type -P mdadm >/dev/null || return 1
 
     [[ $hostonly ]] || [[ $mount_needs ]] && {
-        for fs in "${host_fs_types[@]}"; do
-            [[ "$fs" == *_raid_member ]] && return 0
+        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/md" ]] && return 0
+                break
+            done
+
         done
         return 255
     }
@@ -26,39 +35,53 @@ installkernel() {
     instmods =drivers/md
 }
 
+cmdline() {
+    local _activated dev line UUID
+    declare -A _activated
+
+    for dev in "${!host_fs_types[@]}"; do
+        [[ "${host_fs_types[$dev]}" != *_raid_member ]] && continue
+
+        UUID=$(
+            /sbin/mdadm --examine --export $dev \
+                | while read line; do
+                [[ ${line#MD_UUID=} = $line ]] && continue
+                printf "%s" "${line#MD_UUID=} "
+            done
+        )
+
+        if ! [[ ${_activated[${UUID}]} ]]; then
+            printf "%s" " rd.md.uuid=${UUID}"
+            _activated["${UUID}"]=1
+        fi
+
+    done
+}
+
 install() {
-    dracut_install cat
-    dracut_install -o mdmon
+    local rule rule_path
+    inst_multiple cat
+    inst_multiple -o mdmon
     inst $(command -v partx) /sbin/partx
     inst $(command -v mdadm) /sbin/mdadm
 
-    check_mdraid() {
-        local dev=$1 fs=$2 holder DEVPATH MD_UUID
-        [[ "$fs" != *_raid_member ]] && return 1
-
-        MD_UUID=$(/sbin/mdadm --examine --export $dev \
-            | while read line; do
-                [[ ${line#MD_UUID} = $line ]] && continue
-                eval "$line"
-                echo $MD_UUID
-                break
-                done)
-
-        [[ ${MD_UUID} ]] || return 1
-        if ! [[ $kernel_only ]]; then
-            echo " rd.md.uuid=${MD_UUID} " >> "${initdir}/etc/cmdline.d/90mdraid.conf"
-        fi
-        return 0
-    }
-
-    for_each_host_dev_fs check_mdraid
+    cmdline  >> "${initdir}/etc/cmdline.d/90mdraid.conf"
+    echo  >> "${initdir}/etc/cmdline.d/90mdraid.conf"
 
+    # <mdadm-3.3 udev rule
     inst_rules 64-md-raid.rules
+    # >=mdadm-3.3 udev rules
+    inst_rules 63-md-raid-arrays.rules 64-md-raid-assembly.rules
     # remove incremental assembly from stock rules, so they don't shadow
     # 65-md-inc*.rules and its fine-grained controls, or cause other problems
     # when we explicitly don't want certain components to be incrementally
     # assembled
-    sed -i -r -e '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode)"/d' "${initdir}${udevdir}/rules.d/64-md-raid.rules"
+    for rule in 64-md-raid.rules 64-md-raid-assembly.rules; do
+        rule_path="${initdir}${udevdir}/rules.d/${rule}"
+        [ -f "${rule_path}" ] && sed -i -r \
+            -e '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode|\$devnode)/d' \
+            "${rule_path}"
+    done
 
     inst_rules "$moddir/65-md-incremental-imsm.rules"
 
@@ -79,6 +102,14 @@ install() {
         else
             [ -f /etc/mdadm/mdadm.conf ] && inst /etc/mdadm/mdadm.conf /etc/mdadm.conf
         fi
+        if [ -d /etc/mdadm.conf.d ]; then
+            local f
+            inst_dir /etc/mdadm.conf.d
+            for f in /etc/mdadm.conf.d/*.conf; do
+                [ -f "$f" ] || continue
+                inst "$f"
+            done
+        fi
     fi
 
     inst_hook pre-udev 30 "$moddir/mdmon-pre-udev.sh"

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

@@ -69,7 +69,7 @@ installkernel() {
 
 install() {
     local _f
-    dracut_install -o  \
+    inst_multiple -o  \
         dmsetup \
         kpartx \
         mpath_wait \
@@ -87,7 +87,7 @@ install() {
     inst_libdir_file "libmultipath*" "multipath/*"
 
     if dracut_module_included "systemd"; then
-        dracut_install \
+        inst_multiple \
             $systemdsystemunitdir/multipathd.service
         mkdir -p "${initdir}${systemdsystemconfdir}/sysinit.target.wants"
         ln -rfs "${initdir}${systemdsystemunitdir}/multipathd.service" "${initdir}${systemdsystemconfdir}/sysinit.target.wants/multipathd.service"
@@ -95,6 +95,9 @@ install() {
         inst_hook pre-trigger 02 "$moddir/multipathd.sh"
         inst_hook cleanup   02 "$moddir/multipathd-stop.sh"
     fi
+
+    inst_hook cleanup   80 "$moddir/multipathd-needshutdown.sh"
+
     inst_rules 40-multipath.rules 62-multipath.rules 65-multipath.rules 66-kpartx.rules
 }
 

modules.d/90multipath/multipathd-needshutdown.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+for i in /dev/mapper/mpath*; do
+    [ -b "$i" ] || continue
+    need_shutdown
+    break
+done

modules.d/91crypt-gpg/module-setup.sh

@@ -14,6 +14,6 @@ depends() {
 }
 
 install() {
-    dracut_install gpg
+    inst_multiple gpg
     inst "$moddir/crypt-gpg-lib.sh" "/lib/dracut-crypt-gpg-lib.sh"
 }

modules.d/91crypt-loop/module-setup.sh

@@ -13,7 +13,7 @@ installkernel() {
 }
 
 install() {
-	dracut_install losetup
+	inst_multiple losetup
 	inst "$moddir/crypt-loop-lib.sh" "/lib/dracut-crypt-loop-lib.sh"
         dracut_need_initqueue
 }

modules.d/95cifs/module-setup.sh

@@ -28,8 +28,8 @@ installkernel() {
 install() {
     local _i
     local _nsslibs
-    dracut_install -o mount.cifs
-    dracut_install /etc/services /etc/nsswitch.conf /etc/protocols
+    inst_multiple -o mount.cifs
+    inst_multiple /etc/services /etc/nsswitch.conf /etc/protocols
 
     inst_libdir_file 'libcap-ng.so*'
 

modules.d/95cifs/parse-cifsroot.sh

@@ -14,22 +14,20 @@
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 . /lib/cifs-lib.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 [ -z "$netroot" ]; then
+    for netroot in $(getargs netroot=); do
+        [ "${netroot%%:*}" = "cifs" ] && break
+    done
+    [ "${netroot%%:*}" = "cifs" ] || unset netroot
+fi
 
 # Root takes precedence over netroot
 if [ "${root%%:*}" = "cifs" ] ; then
-
-    # Don't continue if root is ok
-    [ -n "$rootok" ] && return
-
     if [ -n "$netroot" ] ; then
         warn "root takes precedence over netroot. Ignoring netroot"
-
     fi
     netroot=$root
     unset root

modules.d/95dasd/module-setup.sh

@@ -18,7 +18,7 @@ installkernel() {
 
 install() {
     inst_hook cmdline 30 "$moddir/parse-dasd.sh"
-    dracut_install dasdinfo dasdconf.sh normalize_dasd_arg
+    inst_multiple dasdinfo dasdconf.sh normalize_dasd_arg
     if [[ $hostonly ]]; then
         inst /etc/dasd.conf
     fi

modules.d/95dasd_mod/module-setup.sh

@@ -19,6 +19,6 @@ installkernel() {
 
 install() {
     inst_hook cmdline 31 "$moddir/parse-dasd-mod.sh"
-    dracut_install dasd_cio_free grep sed seq
+    inst_multiple dasd_cio_free grep sed seq
 }
 

modules.d/95debug/module-setup.sh

@@ -12,7 +12,7 @@ depends() {
 }
 
 install() {
-    dracut_install -o ps grep more cat rm strace free showmount \
+    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/95fcoe/module-setup.sh

@@ -25,13 +25,14 @@ installkernel() {
 }
 
 install() {
-    dracut_install ip dcbtool fipvlan lldpad readlink
+    inst_multiple ip dcbtool fipvlan lldpad readlink
 
     mkdir -m 0755 -p "$initdir/var/lib/lldpad"
 
     inst "$moddir/fcoe-up.sh" "/sbin/fcoe-up"
     inst "$moddir/fcoe-edd.sh" "/sbin/fcoe-edd"
     inst "$moddir/fcoe-genrules.sh" "/sbin/fcoe-genrules.sh"
+    inst_hook cmdline 20 "$moddir/parse-uefifcoe.sh"
     inst_hook cmdline 99 "$moddir/parse-fcoe.sh"
     dracut_need_initqueue
 }

modules.d/95fcoe/parse-uefifcoe.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+# -*- 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 get_fcoe_boot_mac >/dev/null || . /lib/uefi-lib.sh
+command -v set_ifname >/dev/null || . /lib/net-lib.sh
+
+print_fcoe_uefi_conf()
+{
+    local mac dev vlan
+    mac=$(get_fcoe_boot_mac)
+    [ -z "$mac" ] && continue
+    dev=$(set_ifname fcoe $mac)
+    vlan=$(get_fcoe_boot_vlan)
+    if [ "$vlan" -ne "0" ]; then
+        case "$vlan" in
+            [0-9]*)
+                printf "%s\n" "vlan=$dev.$vlan:$dev"
+                dev="$dev.$vlan"
+                ;;
+            *)
+                printf "%s\n" "vlan=$vlan:$dev"
+                dev="$vlan"
+                ;;
+        esac
+    fi
+    # fcoe=eth0:nodcb
+    printf "%s\n" "$dev:nodcb"
+}
+
+
+if [ -e /sys/firmware/efi/vars/FcoeBootDevice-a0ebca23-5f9c-447a-a268-22b6c158c2ac/data ]; then
+    print_fcoe_uefi_conf > /etc/cmdline.d/40-fcoe-uefi.conf
+fi

modules.d/95iscsi/iscsiroot.sh

@@ -96,7 +96,7 @@ handle_netroot()
 # XXX is this needed?
     getarg ro && iscsirw=ro
     getarg rw && iscsirw=rw
-    fsopts=${fsopts+$fsopts,}${iscsirw}
+    fsopts=${fsopts:+$fsopts,}${iscsirw}
 
     if [ -z $iscsi_initiator ]; then
     # XXX Where are these from?
@@ -155,12 +155,12 @@ handle_netroot()
     iscsistart -i $iscsi_initiator -t $iscsi_target_name        \
         -g $iscsi_target_group -a $iscsi_target_ip      \
         -p $iscsi_target_port \
-        ${iscsi_username+-u $iscsi_username} \
-        ${iscsi_password+-w $iscsi_password} \
-        ${iscsi_in_username+-U $iscsi_in_username} \
-        ${iscsi_in_password+-W $iscsi_in_password} \
-	${iscsi_iface_name+--param iface.iscsi_ifacename=$iscsi_iface_name} \
-	${iscsi_netdev_name+--param iface.net_ifacename=$iscsi_netdev_name} \
+        ${iscsi_username:+-u $iscsi_username} \
+        ${iscsi_password:+-w $iscsi_password} \
+        ${iscsi_in_username:+-U $iscsi_in_username} \
+        ${iscsi_in_password:+-W $iscsi_in_password} \
+	${iscsi_iface_name:+--param iface.iscsi_ifacename=$iscsi_iface_name} \
+	${iscsi_netdev_name:+--param iface.net_ifacename=$iscsi_netdev_name} \
         ${iscsi_param} \
 	|| :
 

modules.d/95iscsi/module-setup.sh

@@ -36,7 +36,8 @@ depends() {
 installkernel() {
     local _arch=$(uname -m)
 
-    instmods iscsi_tcp iscsi_ibft crc32c bnx2i iscsi_boot_sysfs qla4xxx cxgb3i cxgb4i be2iscsi
+    instmods bnx2i qla4xxx cxgb3i cxgb4i be2iscsi
+    hostonly="" instmods iscsi_tcp iscsi_ibft crc32c iscsi_boot_sysfs
     iscsi_module_filter() {
         local _funcs='iscsi_register_transport'
         # subfunctions inherit following FDs
@@ -75,8 +76,8 @@ installkernel() {
 }
 
 install() {
-    dracut_install umount iscsistart hostname iscsi-iname
-    dracut_install -o iscsiuio
+    inst_multiple umount iscsistart hostname iscsi-iname
+    inst_multiple -o iscsiuio
     inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
     inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
     inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"

modules.d/95iscsi/parse-iscsiroot.sh

@@ -13,12 +13,14 @@
 # root= takes precedence over netroot= if root=iscsi[...]
 #
 
-# 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 [ -z "$netroot" ]; then
+    for netroot in $(getargs netroot=); do
+        [ "${netroot%%:*}" = "iscsi" ] && break
+    done
+    [ "${netroot%%:*}" = "iscsi" ] || unset netroot
+fi
 [ -z "$iscsiroot" ] && iscsiroot=$(getarg iscsiroot=)
 [ -z "$iscsi_firmware" ] && getargbool 0 rd.iscsi.firmware -y iscsi_firmware && iscsi_firmware="1"
 

modules.d/95nbd/nbdroot.sh

@@ -76,12 +76,12 @@ while [ -n "$nbdflags" ]; do
         nbdrw=$f
         continue
     fi
-    fsopts=${fsopts+$fsopts,}$f
+    fsopts=${fsopts:+$fsopts,}$f
 done
 
 getarg ro && nbdrw=ro
 getarg rw && nbdrw=rw
-fsopts=${fsopts+$fsopts,}${nbdrw}
+fsopts=${fsopts:+$fsopts,}${nbdrw}
 
 # XXX better way to wait for the device to be made?
 i=0

modules.d/95nbd/parse-nbdroot.sh

@@ -26,14 +26,16 @@ netroot_to_var() {
 
 # 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 [ -z "$netroot" ]; then
+    for netroot in $(getargs netroot=); do
+        [ "${netroot%%:*}" = "nbd" ] && break
+    done
+    [ "${netroot%%:*}" = "nbd" ] || unset netroot
+fi
 
 # Root takes precedence over netroot
 if [ "${root%%:*}" = "nbd" ] ; then
-
-    # Don't continue if root is ok
-    [ -n "$rootok" ] && return
-
     if [ -n "$netroot" ] ; then
         warn "root takes precedence over netroot. Ignoring netroot"
 

modules.d/95nfs/module-setup.sh

@@ -31,12 +31,12 @@ installkernel() {
 install() {
     local _i
     local _nsslibs
-    dracut_install -o portmap rpcbind rpc.statd mount.nfs \
+    inst_multiple -o portmap rpcbind rpc.statd mount.nfs \
         mount.nfs4 umount rpc.idmapd sed /etc/netconfig
-    dracut_install /etc/services /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/idmapd.conf
+    inst_multiple /etc/services /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/idmapd.conf
 
     if [ -f /lib/modprobe.d/nfs.conf ]; then
-        dracut_install /lib/modprobe.d/nfs.conf
+        inst_multiple /lib/modprobe.d/nfs.conf
     else
         [ -d $initdir/etc/modprobe.d/ ] || mkdir $initdir/etc/modprobe.d
         echo "alias nfs4 nfs" > $initdir/etc/modprobe.d/nfs.conf

modules.d/95nfs/nfs-lib.sh

@@ -128,7 +128,7 @@ mount_nfs() {
     nfs_to_var $nfsroot $netif
     munge_nfs_options
     if [ "$nfs" = "nfs4" ]; then
-        options=$options${nfslock+,$nfslock}
+        options=$options${nfslock:+,$nfslock}
     else
         # NFSv{2,3} doesn't support using locks as it requires a helper to
         # transfer the rpcbind state to the new root

modules.d/95nfs/nfsroot-cleanup.sh

@@ -24,9 +24,9 @@ if incol2 /proc/mounts /var/lib/nfs/rpc_pipefs; then
     if [ -d $NEWROOT/$rpcpipefspath ]; then
         # mount --move does not seem to work???
         mount --bind /var/lib/nfs/rpc_pipefs $NEWROOT/$rpcpipefspath
-        umount /var/lib/nfs/rpc_pipefs
+        umount /var/lib/nfs/rpc_pipefs 2>/dev/null
     else
-        umount /var/lib/nfs/rpc_pipefs
+        umount /var/lib/nfs/rpc_pipefs 2>/dev/null
     fi
 fi
 

modules.d/95nfs/parse-nfsroot.sh

@@ -27,18 +27,19 @@
 
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.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=)
 [ -z "$nfsroot" ] && nfsroot=$(getarg nfsroot=)
 
+[ -n "$netroot" ] && oldnetroot="$netroot"
+
 # netroot= cmdline argument must be ignored, but must be used if
 # we're inside netroot to parse dhcp root-path
 if [ -n "$netroot" ] ; then
-    if [ "$netroot" = "$(getarg netroot=)" ] ; then
+    for n in $(getargs netroot=); do
+        [ "$n" = "$netroot" ] && break
+    done
+    if [ "$n" = "$netroot" ]; then
         warn "Ignoring netroot argument for NFS"
         netroot=$root
     fi
@@ -67,7 +68,14 @@ esac
 # Continue if nfs
 case "${netroot%%:*}" in
     nfs|nfs4|/dev/nfs);;
-    *) unset netroot; return;;
+    *)
+        if [ -n "$oldnetroot" ]; then
+            netroot="$oldnetroot"
+        else
+            unset netroot
+        fi
+        return
+        ;;
 esac
 
 # Check required arguments

modules.d/95resume/module-setup.sh

@@ -17,7 +17,7 @@ check() {
 install() {
     local _bin
     # Optional uswsusp support
-    for _bin in /usr/sbin/resume /usr/lib/suspend/resume
+    for _bin in /usr/sbin/resume /usr/lib/suspend/resume /usr/lib/uswsusp/resume
     do
         [[ -x "${_bin}" ]] && {
             inst "${_bin}" /usr/sbin/resume

modules.d/95rootfs-block/module-setup.sh

@@ -3,25 +3,6 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
-        rootopts="defaults"
-        while read dev mp fs opts dump fsck; do
-            # skip comments
-            [ "${dev%%#*}" != "$dev" ] && continue
-
-            if [ "$mp" = "/" ]; then
-                # sanity - determine/fix fstype
-                rootfs=$(find_mp_fstype /)
-                rootfs=${rootfs:-$fs}
-                rootopts=$opts
-                break
-            fi
-        done < /etc/fstab
-
-        [ "$rootfs" = "reiserfs" ] && journaldev=$(fs_get_option $rootopts "jdev")
-        [ "$rootfs" = "xfs" ] && journaldev=$(fs_get_option $rootopts "logdev")
-        if [ -n "$journaldev" ]; then
-            echo "root.journaldev=$journaldev" >> "${initdir}/etc/cmdline.d/95root-jurnaldev.conf"
-        fi
     return 0
 }
 
@@ -29,13 +10,40 @@ depends() {
     echo fs-lib
 }
 
+cmdline() {
+    local dev=/dev/block/$(find_root_block_device)
+    if [ -e $dev ]; then
+        printf " root=%s" "$(shorten_persistent_dev "$(get_persistent_dev "$dev")")"
+        printf " rootflags=%s" "$(find_mp_fsopts /)"
+        printf " rootfstype=%s" "$(find_mp_fstype /)"
+    fi
+}
+
 install() {
-    dracut_install umount
-    dracut_install tr
+
+    if [[ $hostonly ]]; then
+        for dev in "${!host_fs_types[@]}"; do
+            [[ ${host_fs_types[$dev]} = "reiserfs" ]] || [[ ${host_fs_types[$dev]} = "xfs" ]] || continue
+            rootopts=$(find_dev_fsopts "$dev")
+            if [[ ${host_fs_types[$dev]} = "reiserfs" ]]; then
+                journaldev=$(fs_get_option $rootopts "jdev")
+            elif [[ ${host_fs_types[$dev]} = "xfs" ]]; then
+                journaldev=$(fs_get_option $rootopts "logdev")
+            fi
+
+            if [ -n "$journaldev" ]; then
+                printf "%s\n" "root.journaldev=$journaldev" >> "${initdir}/etc/cmdline.d/95root-journaldev.conf"
+            fi
+        done
+    fi
+
+    inst_multiple umount
+    inst_multiple tr
     if ! dracut_module_included "systemd"; then
         inst_hook cmdline 95 "$moddir/parse-block.sh"
         inst_hook pre-udev 30 "$moddir/block-genrules.sh"
         inst_hook mount 99 "$moddir/mount-root.sh"
     fi
-}
 
+    inst_hook initqueue/timeout 99 "$moddir/rootfallback.sh"
+}

modules.d/95rootfs-block/rootfallback.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+for root in $(getargs rootfallback=); do
+    case "$root" in
+        block:LABEL=*|LABEL=*)
+            root="${root#block:}"
+            root="$(echo $root | sed 's,/,\\x2f,g')"
+            root="/dev/disk/by-label/${root#LABEL=}"
+            ;;
+        block:UUID=*|UUID=*)
+            root="${root#block:}"
+            root="${root#UUID=}"
+            root="$(echo $root | tr "[:upper:]" "[:lower:]")"
+            root="/dev/disk/by-uuid/${root#UUID=}"
+            ;;
+        block:PARTUUID=*|PARTUUID=*)
+            root="${root#block:}"
+            root="${root#PARTUUID=}"
+            root="$(echo $root | tr "[:upper:]" "[:lower:]")"
+            root="/dev/disk/by-partuuid/${root}"
+            ;;
+        block:PARTLABEL=*|PARTLABEL=*)
+            root="${root#block:}"
+            root="/dev/disk/by-partlabel/${root#PARTLABEL=}"
+            ;;
+    esac
+
+    if ! [ -b "$root" ]; then
+        warn "Could not find rootfallback $root"
+        continue
+    fi
+
+    if mount "$root" /sysroot; then
+        info "Mounted rootfallback $root"
+        exit 0
+    else
+        warn "Failed to mount rootfallback $root"
+        exit 1
+    fi
+done
+
+[ -e "$job" ] && rm -f "$job"

modules.d/95ssh-client/module-setup.sh

@@ -47,7 +47,7 @@ inst_sshenv()
 }
 
 install() {
-    dracut_install ssh scp
+    inst_multiple ssh scp
     inst_sshenv
 }
 

modules.d/95terminfo/module-setup.sh

@@ -10,7 +10,7 @@ install() {
     done
 
     if [ -d ${_terminfodir} ]; then
-        for i in "l/linux" "v/vt100" "v/vt220"; do
+        for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do
             inst_dir "$_terminfodir/${i%/*}"
             cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
         done

modules.d/95udev-rules/module-setup.sh

@@ -8,7 +8,7 @@ install() {
     # Fixme: would be nice if we didn't have to know which rules to grab....
     # ultimately, /lib/initramfs/rules.d or somesuch which includes links/copies
     # of the rules we want so that we just copy those in would be best
-    dracut_install udevadm cat uname blkid \
+    inst_multiple udevadm cat uname blkid \
         /etc/udev/udev.conf
 
     [ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir
@@ -54,7 +54,7 @@ install() {
         done
     } >> "$initdir/etc/group"
 
-    dracut_install -o \
+    inst_multiple -o \
         ${udevdir}/ata_id \
         ${udevdir}/cdrom_id \
         ${udevdir}/create_floppy_devices \
@@ -72,7 +72,7 @@ install() {
         ${udevdir}/pcmcia-socket-startup \
         ${udevdir}/pcmcia-check-broken-cis
 
-    dracut_install -o /etc/pcmcia/config.opts
+    inst_multiple -o /etc/pcmcia/config.opts
 
     [ -f /etc/arch-release ] && \
         inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh

modules.d/95zfcp/module-setup.sh

@@ -22,7 +22,7 @@ installkernel() {
 
 install() {
     inst_hook cmdline 30 "$moddir/parse-zfcp.sh"
-    dracut_install zfcp_cio_free grep sed seq
+    inst_multiple zfcp_cio_free grep sed seq
 
     inst_script /sbin/zfcpconf.sh
     inst_rules 56-zfcp.rules

modules.d/95znet/module-setup.sh

@@ -20,6 +20,6 @@ installkernel() {
 install() {
     inst_hook cmdline 30 "$moddir/parse-ccw.sh"
     inst_rules 81-ccw.rules
-    dracut_install znet_cio_free grep sed seq readlink /lib/udev/ccw_init
+    inst_multiple znet_cio_free grep sed seq readlink /lib/udev/ccw_init
 }
 

modules.d/97biosdevname/module-setup.sh

@@ -13,7 +13,7 @@ depends() {
 }
 
 install() {
-    dracut_install biosdevname
+    inst_multiple biosdevname
     inst_rules 71-biosdevname.rules
 }
 

modules.d/97masterkey/module-setup.sh

@@ -19,6 +19,6 @@ installkernel() {
 }
 
 install() {
-    dracut_install keyctl uname
+    inst_multiple keyctl uname
     inst_hook pre-pivot 60 "$moddir/masterkey.sh"
 }

modules.d/98selinux/module-setup.sh

@@ -12,6 +12,6 @@ depends() {
 
 install() {
     inst_hook pre-pivot 50 "$moddir/selinux-loadpolicy.sh"
-    dracut_install setenforce
+    inst_multiple setenforce
 }
 

modules.d/98syslog/module-setup.sh

@@ -26,7 +26,7 @@ install() {
             "is selected to be installed. Please check."
     fi
     if [ -n "$_installs" ]; then
-        dracut_install cat $_installs
+        inst_multiple cat $_installs
         inst_hook cmdline  90 "$moddir/parse-syslog-opts.sh"
         inst_hook pre-udev 61 "$moddir/syslog-genrules.sh"
         inst_hook cleanup 99 "$moddir/syslog-cleanup.sh"

modules.d/98systemd/dracut-emergency.service

@@ -13,7 +13,7 @@ DefaultDependencies=no
 After=systemd-vconsole-setup.service
 Wants=systemd-vconsole-setup.service
 Conflicts=emergency.service emergency.target
-ConditionKernelCommandLine=!action_on_fail=continue
+ConditionPathExists=!/lib/dracut/no-emergency-shell
 
 [Service]
 Environment=HOME=/

modules.d/98systemd/dracut-initqueue.sh

@@ -62,7 +62,14 @@ while :; do
     fi
 
     main_loop=$(($main_loop+1))
-    [ $main_loop -gt $RDRETRY ] && action_on_fail "Could not boot." && break
+    if [ $main_loop -gt $RDRETRY ]; then
+        if ! [ -d /sysroot/etc/fstab ] || ! [ -e /sysroot/sbin/init ] ; then
+            action_on_fail "Could not boot." && break
+        fi
+        warn "Not all disks have been found."
+        warn "You might want to regenerate your initramfs."
+        break
+    fi
 done
 
 unset job

modules.d/98systemd/dracut-pre-pivot.service

@@ -10,7 +10,7 @@
 [Unit]
 Description=dracut pre-pivot and cleanup hook
 Documentation=man:dracut-pre-pivot.service(8)
-After=initrd.target initrd-parse-etc.service
+After=initrd.target initrd-parse-etc.service sysroot.mount
 After=dracut-initqueue.service dracut-pre-mount.service dracut-mount.service
 Before=initrd-cleanup.service
 ConditionPathExists=/etc/initrd-release

modules.d/98systemd/emergency.service

@@ -12,7 +12,7 @@ Description=Emergency Shell
 DefaultDependencies=no
 After=systemd-vconsole-setup.service
 Wants=systemd-vconsole-setup.service
-ConditionKernelCommandLine=!action_on_fail=continue
+ConditionPathExists=!/lib/dracut/no-emergency-shell
 
 [Service]
 Environment=HOME=/

modules.d/98systemd/module-setup.sh

@@ -25,7 +25,7 @@ install() {
         exit 1
     fi
 
-    dracut_install -o \
+    inst_multiple -o \
         $systemdutildir/systemd \
         $systemdutildir/systemd-cgroups-agent \
         $systemdutildir/systemd-shutdown \
@@ -111,7 +111,7 @@ install() {
         \
         journalctl systemctl echo swapoff systemd-cgls systemd-tmpfiles
 
-    dracut_install -o \
+    inst_multiple -o \
         /usr/lib/modules-load.d/*.conf \
         /usr/lib/sysctl.d/*.conf
 
@@ -136,7 +136,7 @@ install() {
     [[ $_mods ]] && instmods $_mods
 
     if [[ $hostonly ]]; then
-        dracut_install -o \
+        inst_multiple -o \
             /etc/systemd/journald.conf \
             /etc/systemd/system.conf \
             /etc/hostname \
@@ -156,7 +156,7 @@ install() {
     fi
 
     # install adm user/group for journald
-    dracut_install nologin
+    inst_multiple nologin
     egrep '^systemd-journal:' "$initdir/etc/passwd" 2>/dev/null >> "$initdir/etc/passwd"
     egrep '^systemd-journal:' /etc/group >> "$initdir/etc/group"